From 589111493e4f5d442b6b4b32eba0f79909d76c8e Mon Sep 17 00:00:00 2001 From: "Jason E. Hale" Date: Sat, 12 Apr 2025 02:27:41 -0400 Subject: [PATCH] Qt6: Update to 6.9.0 April 02, 2025 by Volker Hilsheimer (upstream) Qt 6.9 is now available, with new features and improvements for application developers and device creators! As some of the highlights, upgrading to Qt 6.9 brings emoji rendering in existing applications up to the latest standards, order independent transparency for Qt Quick 3D, significant enhancements to address modern OAuth2 requirements, and multiple new performance features across all platforms and devices. Otherwise, API additions and new features across the board bring increased flexibility and productivity. Annoucement: https://www.qt.io/blog/qt-6.9-released Release Note: https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.9.0/release-note.md From the kde@ team: Along with this release, the PySide6 and PyQt6 Python bindings have been updated to 6.9.0 to be compatible with changes in the Qt codebase. PR: XXXXXX Exp-run by: antoine --- Mk/Uses/pyqt.mk | 28 +- Mk/Uses/qt.mk | 4 +- accessibility/qt6-speech/distinfo | 6 +- accessibility/qt6-speech/pkg-plist | 8 + comms/qt6-connectivity/distinfo | 6 +- comms/qt6-connectivity/pkg-plist | 31 ++ comms/qt6-sensors/distinfo | 6 +- comms/qt6-sensors/pkg-plist | 16 + comms/qt6-serialbus/distinfo | 6 +- comms/qt6-serialbus/pkg-plist | 8 + comms/qt6-serialport/distinfo | 6 +- comms/qt6-serialport/pkg-plist | 8 + databases/qt6-base_sqldriver/distinfo | 6 +- devel/py-qt6-pyqt/Makefile | 1 - devel/py-qt6-pyqt/distinfo | 6 +- devel/py-qt6-pyqt/pkg-plist | 4 + devel/py-qt6/Makefile | 2 +- devel/py-qtbuilder/distinfo | 6 +- devel/pyside6-tools/distinfo | 6 +- devel/pyside6-tools/pkg-plist | 9 + devel/pyside6/distinfo | 6 +- devel/pyside6/pkg-plist | 8 + devel/qt6-5compat/distinfo | 6 +- devel/qt6-5compat/pkg-plist | 8 + devel/qt6-base/Makefile | 1 - devel/qt6-base/distinfo | 6 +- .../patch-cmake_QtPkgConfigHelpers.cmake | 4 +- .../files/patch-src_corelib_CMakeLists.txt | 4 +- ...patch-src_corelib_global_qcomparehelpers.h | 14 +- ...ch-src_corelib_global_qcompilerdetection.h | 4 +- ...vicediscovery_qdevicediscovery__static.cpp | 15 +- ...evkeyboard_qevdevkeyboard__defaultmap__p.h | 13 +- ...ut_evdevkeyboard_qevdevkeyboardhandler.cpp | 13 +- ..._input_evdevtablet_qevdevtablethandler.cpp | 15 +- ...rt_input_evdevtouch_qevdevtouchhandler.cpp | 15 +- ...ugins_tls_openssl_qsslcontext__openssl.cpp | 4 +- ...s_openssl_qsslsocket__openssl__symbols.cpp | 22 +- devel/qt6-base/pkg-plist | 149 +++++- devel/qt6-grpc/distinfo | 6 +- devel/qt6-grpc/pkg-plist | 61 ++- devel/qt6-languageserver/distinfo | 6 +- devel/qt6-location/distinfo | 6 +- devel/qt6-location/pkg-plist | 8 + devel/qt6-positioning/distinfo | 6 +- devel/qt6-positioning/pkg-plist | 16 + devel/qt6-remoteobjects/distinfo | 6 +- devel/qt6-remoteobjects/pkg-plist | 29 ++ devel/qt6-scxml/distinfo | 6 +- devel/qt6-scxml/pkg-plist | 52 +- devel/qt6-tools/distinfo | 6 +- devel/qt6-tools/files/patch-configure.cmake | 22 +- devel/qt6-tools/pkg-plist | 26 + devel/qt6-translations/distinfo | 6 +- devel/qt6-translations/pkg-plist | 2 - devel/qt6/Makefile | 7 + devel/shiboken6/distinfo | 6 +- devel/shiboken6/pkg-plist | 1 + graphics/py-qt6-3d/distinfo | 6 +- graphics/qt6-3d/distinfo | 6 +- graphics/qt6-3d/pkg-plist | 104 ++++ graphics/qt6-imageformats/distinfo | 6 +- graphics/qt6-lottie/distinfo | 6 +- graphics/qt6-lottie/pkg-plist | 1 + graphics/qt6-quickeffectmaker/distinfo | 6 +- graphics/qt6-quickeffectmaker/pkg-plist | 1 + graphics/qt6-svg/distinfo | 6 +- graphics/qt6-svg/pkg-plist | 23 + graphics/qt6-wayland/distinfo | 6 +- graphics/qt6-wayland/pkg-plist | 59 ++- misc/qt6-doc/distinfo | 6 +- misc/qt6-doc/pkg-plist | 24 +- misc/qt6-examples/distinfo | 6 +- misc/qt6-examples/pkg-plist | 136 +++++- multimedia/qt6-multimedia/distinfo | 6 +- .../files/patch-src_CMakeLists.txt | 4 +- .../files/patch-src_multimedia_CMakeLists.txt | 4 +- ...plugins_multimedia_ffmpeg_qv4l2camera__p.h | 4 +- multimedia/qt6-multimedia/pkg-plist | 24 + net/py-qt6-networkauth/distinfo | 6 +- net/py-qt6-networkauth/pkg-plist | 1 + net/qt6-coap/distinfo | 6 +- net/qt6-coap/pkg-plist | 8 + net/qt6-mqtt/distinfo | 6 +- net/qt6-mqtt/pkg-plist | 9 + net/qt6-networkauth/distinfo | 6 +- net/qt6-networkauth/pkg-plist | 11 + print/qt6-pdf/pkg-plist | 25 + science/qt6-quick3dphysics/distinfo | 6 +- science/qt6-quick3dphysics/pkg-plist | 16 + www/py-qt6-webengine/distinfo | 6 +- www/py-qt6-webengine/pkg-plist | 1 + www/qt6-httpserver/distinfo | 6 +- www/qt6-httpserver/pkg-plist | 11 + www/qt6-webchannel/distinfo | 6 +- www/qt6-webchannel/pkg-plist | 16 + www/qt6-webengine/Makefile | 12 +- www/qt6-webengine/distinfo | 6 +- .../files/extra-patch-32bit-compress_files_js | 14 - .../files/patch-cmake_Functions.cmake | 38 +- .../patch-cmake_QtConfigureHelpers.cmake | 20 + www/qt6-webengine/files/patch-configure.cmake | 111 ++--- .../patch-src_3rdparty_chromium_BUILD.gn | 62 +-- .../patch-src_3rdparty_chromium_base_BUILD.gn | 62 +-- ...y_chromium_base_allocator_dispatcher_tls.h | 8 +- ..._partition__allocator_partition__alloc.gni | 22 +- ...n__allocator_src_partition__alloc_BUILD.gn | 6 +- ...ion__alloc_address__space__randomization.h | 14 +- ...tor_src_partition__alloc_page__allocator.h | 8 +- ...tition__alloc_page__allocator__constants.h | 39 +- ...alloc_page__allocator__internals__posix.cc | 11 + ..._alloc_page__allocator__internals__posix.h | 10 +- ...tition__alloc_partition__address__space.cc | 11 - ...on__alloc__base_debug_proc__maps__linux.cc | 11 + ...__alloc__base_debug_stack__trace__posix.cc | 20 +- ...artition__alloc__base_rand__util__posix.cc | 4 +- ...__alloc__base_threading_platform__thread.h | 8 +- ...eading_platform__thread__internal__posix.h | 6 +- ..._base_threading_platform__thread__posix.cc | 6 +- ...artition__alloc_partition__alloc__config.h | 26 +- ...ition__alloc_partition__alloc__constants.h | 34 +- ...rtition__alloc_partition__alloc__forward.h | 2 +- ...tition__alloc_partition__page__constants.h | 11 - ...or_src_partition__alloc_partition__root.cc | 33 +- ...or_src_partition__alloc_spinning__mutex.cc | 6 +- ...cator_src_partition__alloc_stack_stack.cc} | 14 +- ...partition__alloc_thread__isolation_pkey.cc | 6 +- ...dparty_chromium_base_base__paths__posix.cc | 14 +- ...c_3rdparty_chromium_base_base__switches.cc | 11 - ...rc_3rdparty_chromium_base_base__switches.h | 11 - ...rdparty_chromium_base_compiler__specific.h | 13 +- ...rty_chromium_base_debug_debugger__posix.cc | 9 +- ...rdparty_chromium_base_debug_elf__reader.cc | 27 +- ...y_chromium_base_debug_proc__maps__linux.cc | 4 +- ...dparty_chromium_base_debug_stack__trace.cc | 34 +- ...chromium_base_debug_stack__trace__posix.cc | 22 +- ...y_chromium_base_files_dir__reader__linux.h | 8 +- ...y_chromium_base_files_file__util__posix.cc | 28 +- ...dparty_chromium_base_files_scoped__file.cc | 4 +- ...omium_base_functional_unretained__traits.h | 4 +- ...c_3rdparty_chromium_base_i18n_icu__util.cc | 6 +- ...-src_3rdparty_chromium_base_linux__util.cc | 12 +- ...hromium_base_memory_discardable__memory.cc | 8 +- ...ase_memory_discardable__memory__internal.h | 4 +- ..._madv__free__discardable__memory__posix.cc | 6 +- ..._memory_platform__shared__memory__region.h | 12 +- ...y_chromium_base_memory_protected__memory.h | 44 ++ ...um_base_memory_protected__memory__posix.cc | 20 + ...base_message__loop_message__pump__epoll.cc | 11 + ..._base_message__loop_message__pump__epoll.h | 14 + ...ty_chromium_base_native__library__posix.cc | 4 +- ...ium_base_posix_file__descriptor__shuffle.h | 11 + ...src_3rdparty_chromium_base_posix_sysctl.cc | 10 + ...hromium_base_posix_unix__domain__socket.cc | 28 +- ...ty_chromium_base_process_internal__linux.h | 20 + ...-src_3rdparty_chromium_base_process_kill.h | 4 +- ...rc_3rdparty_chromium_base_process_launch.h | 4 +- ...rty_chromium_base_process_launch__posix.cc | 4 +- ...rty_chromium_base_process_memory__linux.cc | 8 +- ...m_base_process_process__handle__freebsd.cc | 4 +- ...m_base_process_process__handle__openbsd.cc | 98 ++-- ..._chromium_base_process_process__metrics.cc | 13 +- ...y_chromium_base_process_process__metrics.h | 37 +- ..._base_process_process__metrics__freebsd.cc | 53 ++- ..._base_process_process__metrics__openbsd.cc | 70 +-- ...ty_chromium_base_process_process__posix.cc | 10 +- ...ty_chromium_base_profiler_module__cache.cc | 4 +- ...filer_sampling__profiler__thread__token.cc | 4 +- ...ofiler_sampling__profiler__thread__token.h | 6 +- ...se_profiler_stack__base__address__posix.cc | 13 +- ...r_stack__sampling__profiler__test__util.cc | 4 +- ...m_base_profiler_thread__delegate__posix.cc | 10 +- ...ch-src_3rdparty_chromium_base_rand__util.h | 4 +- ...rdparty_chromium_base_rand__util__posix.cc | 18 +- ...chromium_base_synchronization_lock__impl.h | 6 +- ..._3rdparty_chromium_base_syslog__logging.cc | 6 +- ...3rdparty_chromium_base_system_sys__info.cc | 4 +- ..._3rdparty_chromium_base_system_sys__info.h | 6 +- ...chromium_base_system_sys__info__freebsd.cc | 13 +- ...chromium_base_system_sys__info__openbsd.cc | 23 +- ...y_chromium_base_system_sys__info__posix.cc | 6 +- ...omium_base_test_test__file__util__posix.cc | 4 +- ...y_chromium_base_threading_hang__watcher.cc | 4 +- ...chromium_base_threading_platform__thread.h | 11 + ...um_base_threading_platform__thread__bsd.cc | 6 +- ...ading_platform__thread__internal__posix.cc | 2 +- ..._base_threading_platform__thread__posix.cc | 26 +- ...ase_trace__event_malloc__dump__provider.cc | 12 +- ...base_trace__event_memory__dump__manager.cc | 4 +- ...base_trace__event_process__memory__dump.cc | 16 +- ...rc_3rdparty_chromium_build_config_BUILD.gn | 4 +- ...party_chromium_build_config_BUILDCONFIG.gn | 8 +- ...party_chromium_build_config_clang_BUILD.gn | 16 + ...ty_chromium_build_config_compiler_BUILD.gn | 62 +-- ..._chromium_build_config_linux_pkg-config.py | 2 +- ...c_3rdparty_chromium_build_config_ozone.gni | 2 +- ...rc_3rdparty_chromium_build_config_rust.gni | 13 + ...party_chromium_build_linux_unbundle_icu.gn | 11 +- ...arty_chromium_build_rust_rust__bindgen.gni | 19 + ..._3rdparty_chromium_build_rust_std_BUILD.gn | 10 + ...hromium_build_toolchain_gcc__toolchain.gni | 8 +- ...rty_chromium_build_toolchain_toolchain.gni | 4 +- .../patch-src_3rdparty_chromium_cc_BUILD.gn | 19 - ...-src_3rdparty_chromium_cc_base_features.cc | 4 +- ..._3rdparty_chromium_chrome_browser_BUILD.gn | 4 +- ...rome_browser_accessibility_page__colors.cc | 20 + ...wser_accessibility_pdf__ocr__controller.cc | 11 - ...__protocol__handler__registry__delegate.cc | 2 +- ...hromium_chrome_browser_extensions_BUILD.gn | 10 +- ...ser__context__keyed__service__factories.cc | 8 +- ...ate_enterprise__reporting__private__api.cc | 10 +- ...ement_chrome__management__api__delegate.cc | 11 + ...s_api_messaging_launch__context__posix.cc} | 8 +- ...vate_passwords__private__delegate__impl.cc | 4 +- ..._runtime_chrome__runtime__api__delegate.cc | 8 +- ...sions_api_settings__private_prefs__util.cc | 19 +- ...e_browser_extensions_api_tabs_tabs__api.cc | 8 +- ...__private_webrtc__logging__private__api.cc | 2 +- ...ebstore__private_webstore__private__api.cc | 10 +- ...wser_gcm_gcm__profile__service__factory.cc | 4 +- ...instance__id__profile__service__factory.cc | 4 +- ...me_browser_media_router_discovery_BUILD.gn | 4 +- ...ser_media_webrtc_capture__policy__utils.cc | 20 - ...brtc_desktop__media__picker__controller.cc | 10 +- ...wser_media_webrtc_webrtc__log__uploader.cc | 6 +- ...edia_webrtc_webrtc__logging__controller.cc | 4 +- ...media_webrtc_webrtc__logging__controller.h | 2 +- ..._net_profile__network__context__service.cc | 29 ++ ...r_net_system__network__context__manager.cc | 61 +-- ...er_net_system__network__context__manager.h | 19 +- ...ium_chrome_browser_prefs_browser__prefs.cc | 56 +-- ...efs_pref__service__incognito__allowlist.cc | 4 +- ...inting_print__backend__service__manager.cc | 8 +- ..._chrome_browser_printing_printer__query.cc | 2 +- ...chrome_browser_ui_webui_about_about__ui.cc | 29 ++ ..._chrome_browser_ui_webui_about_about__ui.h | 11 + ...ebui_app__home_app__home__page__handler.cc | 25 +- ...webui_app__home_app__home__page__handler.h | 11 + ...__manager_certificate__manager__handler.cc | 11 + ...tificate__manager_client__cert__sources.cc | 29 ++ ...rtificate__manager_client__cert__sources.h | 11 + ...owser_ui_webui_chrome__web__ui__configs.cc | 33 ++ ...ui_chrome__web__ui__controller__factory.cc | 48 +- ...nectors__internals_device__trust__utils.cc | 10 +- ...ucation__internals__page__handler__impl.cc | 29 ++ ...ui_webui_interstitials_interstitial__ui.cc | 29 ++ ...wser_ui_webui_management_management__ui.cc | 6 +- ...ui_management_management__ui__constants.cc | 17 + ...bui_management_management__ui__constants.h | 19 + ...ebui_management_management__ui__handler.cc | 40 +- ...webui_management_management__ui__handler.h | 25 +- ...ser_ui_webui_ntp_app__launcher__handler.cc | 11 - ...password__manager_promo__cards__handler.cc | 4 +- ...er_promo__cards_relaunch__chrome__promo.cc | 20 + ..._ui_webui_searchbox_searchbox__handler.cc} | 18 +- ...i_settings_accessibility__main__handler.cc | 46 -- ...ui_settings_accessibility__main__handler.h | 47 -- ...r_ui_webui_settings_appearance__handler.cc | 4 +- ..._settings__localized__strings__provider.cc | 37 +- ...i_webui_signin_profile__picker__handler.cc | 20 + ...rty_chromium_chrome_common_channel__info.h | 20 +- ...mium_chrome_common_channel__info__posix.cc | 8 +- ...chromium_chrome_common_chrome__features.cc | 54 +-- ..._chromium_chrome_common_chrome__features.h | 30 +- ...ty_chromium_chrome_common_chrome__paths.cc | 14 +- ...chromium_chrome_common_chrome__switches.cc | 8 +- ..._chromium_chrome_common_chrome__switches.h | 8 +- ...arty_chromium_chrome_common_crash__keys.cc | 28 ++ ...ions_chrome__permission__message__rules.cc | 2 +- ...m_chrome_common_media_cdm__registration.cc | 52 +- ...um_chrome_common_media_cdm__registration.h | 11 + ...ponent__widevine__cdm__hint__file__linux.h | 6 +- ...party_chromium_chrome_common_pref__names.h | 43 +- ...ty_chromium_chrome_common_url__constants.h | 10 +- ...ium_chrome_common_webui__url__constants.cc | 67 +-- ...mium_chrome_common_webui__url__constants.h | 55 ++- ...enderer_chrome__render__frame__observer.cc | 11 - ...src_3rdparty_chromium_chrome_test_BUILD.gn | 11 - ...e_browser_autofill__optimization__guide.cc | 11 + ...ll_core_browser_payments__data__manager.cc | 11 + ...ll_core_browser_personal__data__manager.cc | 12 - ...ore_common_autofill__payments__features.cc | 15 +- ...core_common_autofill__payments__features.h | 11 + ...ts_autofill_core_common_autofill__prefs.cc | 11 + ...nts_autofill_core_common_autofill__prefs.h | 11 + ...nts_autofill_core_common_autofill__util.cc | 11 - ...s_commerce_core_commerce__feature__list.cc | 15 +- ...ined__window_constrained__window__views.cc | 11 + ...hromium_components_crash_core_app_BUILD.gn | 28 +- ...browser_user__permission__service__impl.cc | 4 +- ..._browser_user__permission__service__impl.h | 4 +- ...ce_discardable__shared__memory__manager.cc | 2 +- ...nents_enterprise_watermarking_watermark.cc | 20 + ...ponents_eye__dropper_eye__dropper__view.cc | 11 + ...gagement_public_feature__configurations.cc | 18 +- ...e__engagement_public_feature__constants.cc | 33 +- ...re__engagement_public_feature__constants.h | 27 +- ...eature__engagement_public_feature__list.cc | 29 +- ...feature__engagement_public_feature__list.h | 52 +- ...omium_components_flags__ui_flags__state.cc | 4 +- ...m_components_gwp__asan_client_gwp__asan.cc | 4 +- ...ts_gwp__asan_client_gwp__asan__features.cc | 11 + ...wp__asan_crash__handler_crash__analyzer.cc | 6 +- ..._components_live__caption_caption__util.cc | 13 +- ...m_components_live__caption_caption__util.h | 4 +- ...ents_media__router_common_media__source.cc | 12 +- ...ommon_providers_cast_channel_enum__table.h | 15 + ...hromium_components_metrics_metrics__log.cc | 10 +- ...amed__mojo__ipc__server_connection__info.h | 10 +- ..._named__mojo__ipc__server__client__util.cc | 4 +- ...mium_components_named__system__lock_lock.h | 11 + ..._browser_network__session__configurator.cc | 4 +- ...n__guide_core_optimization__guide__util.cc | 4 +- ...c_browser_secret__portal__key__provider.cc | 12 + ...onents_os__crypt_async_common_encryptor.cc | 11 + ...s_os__crypt_sync_libsecret__util__linux.cc | 8 +- ...mium_components_os__crypt_sync_os__crypt.h | 10 +- ..._preview_browser_paint__preview__client.cc | 4 +- ...iew_player_player__compositor__delegate.cc | 4 +- ...ore_browser_features_password__features.cc | 16 +- ...core_browser_features_password__features.h | 10 +- ...er_core_browser_password__form__manager.cc | 10 +- ..._manager_core_browser_password__manager.cc | 15 +- ...r_core_browser_password__manager__client.h | 20 + ...ore_browser_password__manager__switches.cc | 11 + ...core_browser_password__manager__switches.h | 11 + ...rowser_password__manual__fallback__flow.cc | 29 ++ ...browser_password__manual__fallback__flow.h | 20 + ..._browser_password__store__factory__util.cc | 11 + ...browser_password__store_login__database.cc | 20 + ...d__store_login__database__async__helper.cc | 11 + ...browser_stub__password__manager__client.cc | 11 + ..._browser_stub__password__manager__client.h | 11 + ...ore_browser_sync_password__sync__bridge.cc | 11 - ...core_common_password__manager__features.cc | 11 - ..._core_common_password__manager__features.h | 11 - ...re_common_password__manager__pref__names.h | 13 +- ...nts_performance__manager_public_features.h | 4 +- ...ore_browser_policy__pref__mapping__test.cc | 4 +- ...core_common_cloud_cloud__policy__client.cc | 4 +- ...cloud_cloud__policy__refresh__scheduler.cc | 20 + ...y_core_common_cloud_cloud__policy__util.cc | 8 +- ...onents_policy_core_common_policy__utils.cc | 8 +- ...s_policy_tools_generate__policy__source.py | 4 +- ...components_qr__code__generator_features.cc | 13 - ..._components_qr__code__generator_features.h | 14 - ...qr__code__generator_qr__code__generator.cc | 47 -- ...ontent_resources_gen__file__type__proto.py | 12 +- ..._browser_db_v4__protocol__manager__util.cc | 4 +- ...ser_realtime_url__lookup__service__base.cc | 6 +- ...nts_safe__browsing_core_common_features.cc | 12 +- ..._choice_search__engine__choice__service.cc | 11 + ..._search__engines_template__url__service.cc | 8 +- ...ervices_screen__ai_public_cpp_utilities.cc | 20 - ...andbox_screen__ai__sandbox__hook__linux.cc | 18 - ...sandbox_screen__ai__sandbox__hook__linux.h | 16 - ...nts_signin_public_base_signin__switches.cc | 11 - ...ents_signin_public_base_signin__switches.h | 11 - ...rty_chromium_components_soda_soda__util.cc | 29 ++ ...ic__utils_common_startup__metric__utils.cc | 8 +- ...omium_components_storage__monitor_BUILD.gn | 6 +- ...wser_supervised__user__metrics__service.cc | 11 + ...e_browser_supervised__user__preferences.cc | 11 + ..._core_browser_supervised__user__service.cc | 10 +- ...s_supervised__user_core_common_features.cc | 75 ++- ...ts_supervised__user_core_common_features.h | 31 +- ...supervised__user_core_common_pref__names.h | 11 + ..._device__info_local__device__info__util.cc | 8 +- ...omium_components_system__cpu_cpu__probe.cc | 12 + ..._vault_trusted__vault__connection__impl.cc | 11 + ...ts_update__client_update__query__params.cc | 4 +- ...ser__education_views_help__bubble__view.cc | 6 +- ..._variations_service_variations__service.cc | 4 +- ...d__url__ranking_public_url__visit__util.cc | 11 + ...mponents_viz_host_host__display__client.cc | 4 +- ...y__embedder_skia__output__surface__impl.cc | 10 +- ...lay__embedder_software__output__surface.cc | 10 +- ...play__embedder_software__output__surface.h | 10 +- ...ents_viz_service_display_skia__renderer.cc | 4 +- ...nks_root__compositor__frame__sink__impl.cc | 10 +- ...inks_root__compositor__frame__sink__impl.h | 8 +- ...src_3rdparty_chromium_content_app_BUILD.gn | 15 + ...arty_chromium_content_app_content__main.cc | 15 +- ...content_app_content__main__runner__impl.cc | 45 +- ...3rdparty_chromium_content_browser_BUILD.gn | 31 +- ...um_content_browser_audio_audio__service.cc | 6 +- ...ser_browser__child__process__host__impl.cc | 18 +- ...wser_browser__child__process__host__impl.h | 6 +- ...ium_content_browser_browser__main__loop.cc | 8 +- ...browser_child__process__launcher__helper.h | 8 +- ...child__process__launcher__helper__linux.cc | 29 +- ...er_child__thread__type__switcher__linux.cc | 4 +- ...ositor_viz__process__transport__factory.cc | 4 +- ...devtools_devtools__frontend__host__impl.cc | 10 +- ..._devtools_devtools__frontend__host__impl.h | 4 +- ...devtools_protocol_system__info__handler.cc | 4 +- ..._file__path__watcher_file__path__watcher.h | 11 + ..._path__watcher_file__path__watcher__bsd.cc | 58 +++ ...ath__watcher_file__path__watcher__kqueue.h | 10 + ...e__system__access__local__path__watcher.cc | 18 +- ...um_content_browser_gpu_compositor__util.cc | 26 +- ...nt_browser_gpu_gpu__data__manager__impl.cc | 4 +- ...ent_browser_gpu_gpu__data__manager__impl.h | 4 +- ...r_gpu_gpu__data__manager__impl__private.cc | 4 +- ...er_gpu_gpu__data__manager__impl__private.h | 6 +- ...gpu__memory__buffer__manager__singleton.cc | 12 +- ..._content_browser_gpu_gpu__process__host.cc | 20 +- ...media_frameless__media__interface__proxy.h | 4 +- ...ia_media__keys__listener__manager__impl.cc | 10 +- ...rowser_network__service__instance__impl.cc | 8 +- ...r_renderer__host_delegated__frame__host.cc | 4 +- ...rvice__video__capture__device__launcher.cc | 4 +- ...derer__host_render__process__host__impl.cc | 47 +- ...nderer__host_render__process__host__impl.h | 22 +- ...process__host__impl__receiver__bindings.cc | 20 + ...renderer__host_render__view__host__impl.cc | 4 +- ...__host_render__widget__host__view__aura.cc | 18 +- ...r__host_render__widget__host__view__aura.h | 4 +- ...der__widget__host__view__event__handler.cc | 6 +- ...uler_responsiveness_jank__monitor__impl.cc | 2 +- ..._content_browser_utility__process__host.cc | 23 +- ...m_content_browser_utility__process__host.h | 12 +- ...lity__process__host__receiver__bindings.cc | 8 +- ...tent_browser_utility__sandbox__delegate.cc | 6 +- ...ium_content_browser_v8__snapshot__files.cc | 6 +- ...web__contents_web__contents__view__aura.cc | 4 +- ...er_webui_web__ui__main__frame__observer.cc | 4 +- ...ser_webui_web__ui__main__frame__observer.h | 4 +- ..._zygote__host_zygote__host__impl__linux.cc | 27 +- ...c_3rdparty_chromium_content_child_BUILD.gn | 4 +- ...y_chromium_content_child_child__process.cc | 25 +- ...ty_chromium_content_child_child__process.h | 11 + ..._3rdparty_chromium_content_common_BUILD.gn | 17 +- ...dparty_chromium_content_common_features.cc | 8 +- ...rdparty_chromium_content_common_features.h | 10 +- ...ent_common_gpu__pre__sandbox__hook__bsd.cc | 5 +- ...nt_common_gpu__pre__sandbox__hook__linux.h | 16 + ...ent_common_mojo__core__library__support.cc | 11 - ...t_common_zygote_sandbox__support__linux.cc | 14 - ...chromium_content_gpu_gpu__child__thread.cc | 2 +- ...3rdparty_chromium_content_gpu_gpu__main.cc | 31 +- ...api__plugin_ppapi__blink__platform__impl.h | 4 +- ...ntent_ppapi__plugin_ppapi__plugin__main.cc | 6 +- ...public_browser_content__browser__client.cc | 4 +- ...t_public_browser_service__process__host.cc | 11 + ...content_public_common_content__features.cc | 47 +- ...content_public_common_content__switches.cc | 8 +- ..._content_public_common_content__switches.h | 8 +- ..._content_renderer_render__process__impl.cc | 11 - ...m_content_renderer_render__thread__impl.cc | 10 +- ...enderer_renderer__blink__platform__impl.cc | 10 +- ...renderer_renderer__blink__platform__impl.h | 4 +- ...c_3rdparty_chromium_content_shell_BUILD.gn | 4 +- ...content_shell_app_shell__main__delegate.cc | 4 +- ...nderer_shell__content__renderer__client.cc | 11 + ...rc_3rdparty_chromium_content_test_BUILD.gn | 20 - ...party_chromium_content_utility_services.cc | 35 +- ...eech__recognition__sandbox__hook__linux.cc | 8 +- ..._chromium_content_utility_utility__main.cc | 57 ++- ...m_content_utility_utility__thread__impl.cc | 6 +- ...y_chromium_content_zygote_zygote__linux.cc | 8 +- ...mium_content_zygote_zygote__main__linux.cc | 2 +- ...ium_device_bluetooth_bluetooth__adapter.cc | 4 +- ...romium_device_gamepad_gamepad__provider.cc | 4 +- ...ser__context__keyed__service__factories.cc | 6 +- ..._browser_api_management_management__api.cc | 4 +- ..._browser_api_messaging_message__service.cc | 6 +- ...arty_chromium_extensions_common_command.cc | 6 +- ...ns_renderer_bindings_api__binding__util.cc | 4 +- ...ensions_shell_app_shell__main__delegate.cc | 6 +- ...i_runtime_shell__runtime__api__delegate.cc | 4 +- ..._browser_shell__extensions__api__client.cc | 4 +- ...l_browser_shell__extensions__api__client.h | 6 +- ...fer_common_gpu__memory__buffer__support.cc | 20 - ..._buffer_service_dawn__context__provider.cc | 4 +- ...and__buffer_service_gles2__cmd__decoder.cc | 4 +- ...__buffer_service_shared__context__state.cc | 29 ++ ...d__buffer_service_shared__context__state.h | 20 + ..._angle__vulkan__image__backing__factory.cc | 6 +- ...red__image_external__vk__image__backing.cc | 6 +- ...e_external__vk__image__backing__factory.cc | 10 +- ...ce_shared__image_shared__image__factory.cc | 22 +- ...ce_shared__image_shared__image__manager.cc | 4 +- ...ared__image_wrapped__sk__image__backing.cc | 4 +- ...d__buffer_service_webgpu__decoder__impl.cc | 6 +- ..._chromium_gpu_config_gpu__control__list.cc | 6 +- ...hromium_gpu_config_gpu__finch__features.cc | 25 +- ...hromium_gpu_config_gpu__info__collector.cc | 4 +- ...ipc_common_gpu__memory__buffer__support.cc | 4 +- ...arty_chromium_gpu_ipc_service_gpu__init.cc | 18 +- ...pc_service_gpu__memory__buffer__factory.cc | 12 +- ..._chromium_gpu_vulkan_generate__bindings.py | 4 +- ...romium_gpu_vulkan_vulkan__device__queue.cc | 6 +- ...hromium_gpu_vulkan_vulkan__device__queue.h | 6 +- ...m_gpu_vulkan_vulkan__function__pointers.cc | 6 +- ...um_gpu_vulkan_vulkan__function__pointers.h | 8 +- ...dparty_chromium_gpu_vulkan_vulkan__util.cc | 4 +- ...wser_headless__content__browser__client.cc | 20 + ...ser_headless__request__context__manager.cc | 11 - ...b_browser_headless__web__contents__impl.cc | 4 +- ...s_lib_headless__content__main__delegate.cc | 4 +- ...h-src_3rdparty_chromium_ipc_ipc__channel.h | 4 +- ...dparty_chromium_ipc_ipc__message__utils.cc | 4 +- ...patch-src_3rdparty_chromium_media_BUILD.gn | 10 +- ...src_3rdparty_chromium_media_audio_BUILD.gn | 11 +- ...m_media_audio_alsa_audio__manager__alsa.cc | 18 +- ...romium_media_audio_audio__input__device.cc | 4 +- ..._chromium_media_audio_pulse_pulse__util.cc | 14 + ...media_audio_sndio_audio__manager__sndio.cc | 68 ++- ...chromium_media_audio_sndio_sndio__input.cc | 10 +- ...hromium_media_audio_sndio_sndio__output.cc | 12 +- ...arty_chromium_media_base_audio__latency.cc | 4 +- ...mium_media_base_libaom__thread__wrapper.cc | 24 + ...rty_chromium_media_base_media__switches.cc | 89 ++-- ...arty_chromium_media_base_media__switches.h | 35 +- ...dparty_chromium_media_base_video__frame.cc | 55 +-- ...rdparty_chromium_media_base_video__frame.h | 22 +- ...o_fake__video__capture__device__factory.cc | 4 +- ...ia_capture_video_linux_fake__v4l2__impl.cc | 4 +- ...ure_video_linux_v4l2__capture__delegate.cc | 30 +- ...x_video__capture__device__factory__v4l2.cc | 40 +- ...re_video_video__capture__device__client.cc | 4 +- ...mium_media_ffmpeg_scripts_build__ffmpeg.py | 66 +++ ...m_media_ffmpeg_scripts_robo__lib_config.py | 56 +++ ..._chromeos_gl__image__processor__backend.cc | 13 + ...omeos_libyuv__image__processor__backend.cc | 18 +- ...romeos_mailbox__video__frame__converter.cc | 6 +- ...hromeos_native__pixmap__frame__resource.cc | 11 + ..._chromeos_platform__video__frame__utils.cc | 13 +- ...a_gpu_chromeos_video__decoder__pipeline.cc | 15 +- ...pu__video__encode__accelerator__factory.cc | 4 +- ...__video__decoding__sandbox__hook__linux.cc | 18 +- ...__video__encoding__sandbox__hook__linux.cc | 8 +- ...m_media_gpu_vaapi_vaapi__video__decoder.cc | 6 +- ...chromium_media_gpu_vaapi_vaapi__wrapper.cc | 4 +- ...3rdparty_chromium_media_media__options.gni | 13 +- ...e__video__decoder__types__mojom__traits.cc | 6 +- ...le__video__decoder__types__mojom__traits.h | 4 +- ..._mojo_mojom_video__frame__mojom__traits.cc | 4 +- ...m_media_video_fake__gpu__memory__buffer.cc | 14 +- ...gpu__memory__buffer__video__frame__pool.cc | 32 +- ...deo_video__encode__accelerator__adapter.cc | 6 +- ...deo__encode__accelerator__adapter__test.cc | 4 +- ..._chromium_media_webrtc_audio__processor.cc | 4 +- ..._3rdparty_chromium_media_webrtc_helpers.cc | 18 +- ...h-src_3rdparty_chromium_mojo_core_BUILD.gn | 18 +- ...src_3rdparty_chromium_mojo_core_channel.cc | 8 +- ...ty_chromium_mojo_public_c_system_thunks.cc | 38 -- ...omium_mojo_public_tools_bindings_mojom.gni | 6 +- .../patch-src_3rdparty_chromium_net_BUILD.gn | 31 +- ...src_3rdparty_chromium_net_base_features.cc | 21 +- ...mium_net_base_network__change__notifier.cc | 4 +- ...chromium_net_base_sockaddr__util__posix.cc | 4 +- ...rty_chromium_net_cert_cert__verify__proc.h | 4 +- ...isk__cache_simple_simple__file__tracker.cc | 4 +- ...tch-src_3rdparty_chromium_net_dns_BUILD.gn | 12 +- ...3rdparty_chromium_net_dns_address__info.cc | 4 +- ...chromium_net_dns_address__sorter__posix.cc | 6 +- ...ium_net_dns_dns__config__service__posix.cc | 6 +- ..._3rdparty_chromium_net_dns_public_BUILD.gn | 4 +- ...mium_net_http_http__auth__gssapi__posix.cc | 4 +- ...net_http_http__auth__handler__negotiate.cc | 4 +- ...hromium_net_http_http__network__session.cc | 6 +- ...esolution_proxy__config__service__linux.cc | 12 +- ...omium_net_socket_socks5__client__socket.cc | 4 +- ..._chromium_net_socket_tcp__socket__posix.cc | 2 +- ..._chromium_net_socket_udp__socket__posix.cc | 10 +- ...y__tool_cert__verify__comparision__tool.cc | 29 -- ...s_cert__verify__tool_cert__verify__tool.cc | 8 +- ...ium_net_tools_net__watcher_net__watcher.cc | 4 +- ..._annotation_network__traffic__annotation.h | 8 +- ..._net_url__request_url__request__context.cc | 6 +- ...m_net_url__request_url__request__context.h | 6 +- ..._request_url__request__context__builder.cc | 4 +- ...arty_chromium_pdf_pdfium_pdfium__engine.cc | 6 +- ...mium_printing_backend_cups__ipp__helper.cc | 4 +- ...m_printing_backend_print__backend__cups.cc | 29 ++ ...dparty_chromium_printing_print__settings.h | 8 +- ...um_printing_print__settings__conversion.cc | 4 +- ...ty_chromium_printing_printing__features.cc | 17 + ...rty_chromium_printing_printing__features.h | 11 + ...ox_print__backend__sandbox__hook__linux.cc | 6 +- ...andbox_linux_services_libc__interceptor.cc | 6 +- ..._3rdparty_chromium_sandbox_policy_BUILD.gn | 6 +- ...dparty_chromium_sandbox_policy_features.cc | 6 +- ...rdparty_chromium_sandbox_policy_features.h | 6 +- ...hromium_sandbox_policy_mojom_sandbox.mojom | 4 +- ...sandbox_policy_openbsd_sandbox__openbsd.cc | 12 +- ...rdparty_chromium_sandbox_policy_sandbox.cc | 4 +- ...y_chromium_sandbox_policy_sandbox__type.cc | 47 +- ...dparty_chromium_sandbox_policy_switches.cc | 6 +- ...rdparty_chromium_sandbox_policy_switches.h | 6 +- ...vices_audio_audio__sandbox__hook__linux.cc | 10 +- ...3rdparty_chromium_services_device_BUILD.gn | 4 +- ...ces_device_compute__pressure_cpu__probe.cc | 10 - ...device_geolocation_location__arbitrator.cc | 11 - ...geolocation_location__provider__manager.cc | 11 + ...rvices_device_hid_hid__connection__fido.cc | 8 +- ...ces_device_hid_hid__connection__freebsd.cc | 18 +- ...mium_services_device_public_mojom_BUILD.gn | 4 +- ...evice_serial_serial__device__enumerator.cc | 6 +- ...evice_serial_serial__io__handler__posix.cc | 4 +- ...one__monitor_time__zone__monitor__linux.cc | 4 +- ...arty_chromium_services_device_usb_BUILD.gn | 30 +- ...romium_services_device_usb_usb__service.cc | 16 +- ...rdparty_chromium_services_network_BUILD.gn | 4 +- ...omium_services_network_network__context.cc | 6 +- ...romium_services_network_network__context.h | 4 +- ...s_network_network__sandbox__hook__linux.cc | 12 +- ...omium_services_network_network__service.cc | 8 +- ...romium_services_network_network__service.h | 12 +- ...omium_services_network_public_cpp_BUILD.gn | 4 +- ...um_services_network_public_cpp_features.cc | 4 +- ...ium_services_network_public_mojom_BUILD.gn | 10 +- ...device__model_on__device__model__service.h | 22 + ...es_on__device__model_pre__sandbox__init.cc | 38 ++ ..._cpp_memory__instrumentation_os__metrics.h | 6 +- ...ervices_screen__ai_public_cpp_utilities.cc | 29 ++ ...andbox_screen__ai__sandbox__hook__linux.cc | 18 + ...sandbox_screen__ai__sandbox__hook__linux.h | 16 + ...hromium_services_service__manager_BUILD.gn | 4 +- ...ck__sampling_tracing__sampler__profiler.cc | 2 +- ...__capture_video__capture__service__impl.cc | 10 +- ...o__capture_video__capture__service__impl.h | 8 +- ...romium_skia_ext_SkMemory__new__handler.cpp | 13 +- ...ty_chromium_skia_ext_skcolorspace__trfn.cc | 8 +- ...third__party_abseil-cpp_absl_base_config.h | 6 +- ...y_abseil-cpp_absl_base_internal_sysinfo.cc | 14 +- ..._absl_debugging_internal_elf__mem__image.h | 4 +- ...party_chromium_third__party_angle_BUILD.gn | 8 +- ...hird__party_angle_src_libANGLE_Display.cpp | 12 +- ...es_renderer__preferences__mojom__traits.cc | 4 +- ...derer__preferences_renderer__preferences.h | 4 +- ...ces_renderer__preferences__mojom__traits.h | 4 +- ...rd__party_blink_public_platform_platform.h | 4 +- ..._party_blink_public_platform_web__vector.h | 4 +- ...indings_scripts_bind__gen_style__format.py | 6 +- ..._renderer_controller_blink__initializer.cc | 8 +- ...ontroller_memory__usage__monitor__posix.cc | 4 +- ...renderer_core_editing_editing__behavior.cc | 4 +- ..._renderer_core_exported_web__view__impl.cc | 6 +- ...nk_renderer_core_frame_web__frame__test.cc | 6 +- ...tml_canvas_canvas__async__blob__creator.cc | 4 +- ...blink_renderer_core_layout_layout__view.cc | 8 +- ..._blink_renderer_core_paint_paint__layer.cc | 2 +- ...erer_core_scroll_scrollbar__theme__aura.cc | 8 +- ...o_audio__renderer__mixer__manager__test.cc | 4 +- ...ink_renderer_modules_ml_webnn_features.gni | 11 - ...rer_modules_ml_webnn_ml__graph__xnnpack.cc | 11 - ...dules_peerconnection_rtc__data__channel.cc | 10 + ...onnection_webrtc__audio__renderer__test.cc | 4 +- ...s_webaudio_audio__worklet__thread__test.cc | 4 +- ...s_webgl_webgl__rendering__context__base.cc | 4 +- ...link_renderer_modules_webgpu_gpu__queue.cc | 4 +- ...rd__party_blink_renderer_platform_BUILD.gn | 4 +- ...ink_renderer_platform_fonts_font__cache.cc | 6 +- ...link_renderer_platform_fonts_font__cache.h | 14 +- ...nderer_platform_fonts_font__description.cc | 6 +- ...rer_platform_fonts_font__platform__data.cc | 6 +- ...r_platform_fonts_skia_font__cache__skia.cc | 4 +- ...tform_graphics_gpu_image__layer__bridge.cc | 11 + ...atform_graphics_video__frame__submitter.cc | 10 +- ...artition__alloc__memory__dump__provider.cc | 16 +- ...connection_rtc__video__encoder__factory.cc | 4 +- ..._platform_runtime__enabled__features.json5 | 61 ++- ...nderer_platform_scheduler_common_thread.cc | 8 +- ...orm_video__capture_video__capture__impl.cc | 11 - ...blink_renderer_platform_wtf_stack__util.cc | 8 +- ...erer_platform_wtf_text_text__codec__icu.cc | 18 + ...ringssl_src_util_generate__build__files.py | 34 -- ..._chromium_third__party_cpuinfo_cpuinfo.gni | 6 +- ..._party_crashpad_crashpad_util_misc_uuid.cc | 4 +- ...d_util_posix_symbolic__constants__posix.cc | 6 +- ...y_dawn_include_dawn_native_VulkanBackend.h | 6 +- ...ntend_src_scripts_build_compress__files.js | 33 ++ ...arty_chromium_third__party_ffmpeg_BUILD.gn | 4 +- ...y_ffmpeg_chromium_scripts_build__ffmpeg.py | 121 ----- ...fmpeg_chromium_scripts_robo__lib_config.py | 53 --- ...rty_chromium_third__party_ffmpeg_configure | 21 +- ...ird__party_ffmpeg_libavutil_x86_x86inc.asm | 6 +- ...m_third__party_fontconfig_include_config.h | 66 +-- ...hird__party_leveldatabase_env__chromium.cc | 4 +- ...rce_libaom_aom__ports_aarch64__cpudetect.c | 44 +- ...rce_libvpx_vpx__ports_aarch64__cpudetect.c | 4 +- ...rty_chromium_third__party_maldoca_BUILD.gn | 13 - ...oca_src_maldoca_base_get__runfiles__dir.cc | 32 -- ...ca_service_common_process__doc__wrapper.cc | 29 -- ...color__utilities_src_cpp_palettes_tones.cc | 2 +- ...dparty_chromium_third__party_nasm_BUILD.gn | 16 + ...um_third__party_nasm_config_config-linux.h | 11 +- ...rdparty_chromium_third__party_node_node.py | 6 +- ...party_pdfium_core_fxge_cfx__fontmapper.cpp | 2 +- ...pdfium_core_fxge_linux_fx__linux__impl.cpp | 14 +- ...d__party_pdfium_fxjs_fx__date__helpers.cpp | 6 +- ...arty_perfetto_include_perfetto_base_time.h | 8 +- ...um_third__party_perfetto_src_base_utils.cc | 26 + ...ce_processor_db_column_numeric__storage.cc | 15 - ...etto_src_tracing_core_clock__snapshots.cc} | 10 +- ...third__party_perfetto_src_tracing_track.cc | 4 +- ...rotobuf_src_google_protobuf_arenastring.cc | 12 - ...c_google_protobuf_stubs_platform__macros.h | 6 +- ...party_skia_src_ports_SkMemory__malloc.cpp} | 12 +- ...ty_speech-dispatcher_libspeechd__version.h | 4 +- ...__party_speech-dispatcher_speechd__types.h | 142 ++++++ ...d__party_sqlite_src_amalgamation_sqlite3.c | 8 +- ...onts_fontconfig_fontconfig__util__linux.cc | 4 +- ..._chromium_third__party_tflite_features.gni | 15 +- ...m_third__party_vulkan-loader_src_BUILD.gn} | 6 +- ...-loader_src_loader_vk__loader__platform.h} | 4 +- ..._src_layers_external_vma_vk__mem__alloc.h} | 4 +- ...rty_chromium_third__party_wayland_BUILD.gn | 22 +- ...arty_chromium_third__party_webrtc_BUILD.gn | 4 +- ...arty_webrtc_modules_audio__device_BUILD.gn | 4 +- ...ture_linux_x11_x__server__pixel__buffer.cc | 2 +- ..._video__capture_linux_pipewire__session.cc | 20 + ..._coding_codecs_av1_libaom__av1__encoder.cc | 23 + ...ird__party_webrtc_rtc__base_ip__address.cc | 10 +- ...m_third__party_webrtc_rtc__base_network.cc | 4 +- ...brtc_rtc__base_physical__socket__server.cc | 65 ++- ...rd__party_webrtc_system__wrappers_BUILD.gn | 4 +- ...dparty_chromium_third__party_zlib_BUILD.gn | 4 +- ...chromium_third__party_zlib_cpu__features.c | 31 +- ...schema__compiler_cpp__bundle__generator.py | 4 +- ...son__schema__compiler_feature__compiler.py | 4 +- ...dparty_chromium_tools_licenses_licenses.py | 4 +- ...ols_perf_chrome__telemetry__build_BUILD.gn | 4 +- ...m_tools_protoc__wrapper_protoc__wrapper.py | 4 +- ...3rdparty_chromium_ui_aura_screen__ozone.cc | 4 +- ..._3rdparty_chromium_ui_aura_screen__ozone.h | 6 +- ...i_base_clipboard_clipboard__non__backed.cc | 4 +- ...chromium_ui_base_cursor_cursor__factory.cc | 4 +- ...p_os__exchange__data__provider__factory.cc | 2 +- ...__exchange__data__provider__non__backed.cc | 8 +- ..._ui_base_ime_dummy__text__input__client.cc | 4 +- ...m_ui_base_ime_dummy__text__input__client.h | 4 +- ...m_ui_base_ime_fake__text__input__client.cc | 6 +- ...um_ui_base_ime_fake__text__input__client.h | 4 +- ...ase_ime_init_input__method__initializer.cc | 2 +- ...chromium_ui_base_ime_text__input__client.h | 4 +- ...omium_ui_base_resource_resource__bundle.cc | 4 +- ...rty_chromium_ui_base_ui__base__features.cc | 15 +- ...arty_chromium_ui_base_ui__base__features.h | 11 + ...rty_chromium_ui_base_ui__base__switches.cc | 4 +- ...arty_chromium_ui_base_ui__base__switches.h | 4 +- ...ty_chromium_ui_base_webui_web__ui__util.cc | 8 +- ..._chromium_ui_base_x_x11__cursor__loader.cc | 10 +- ...hromium_ui_base_x_x11__display__manager.cc | 6 +- ...y_chromium_ui_base_x_x11__display__util.cc | 364 -------------- ...hromium_ui_base_x_x11__shm__image__pool.cc | 28 +- ...c_3rdparty_chromium_ui_base_x_x11__util.cc | 23 - ...rc_3rdparty_chromium_ui_base_x_x11__util.h | 13 - ...src_3rdparty_chromium_ui_color_color__id.h | 10 +- ...hromium_ui_color_color__provider__utils.cc | 4 +- ...party_chromium_ui_compositor_compositor.cc | 4 +- ...dparty_chromium_ui_compositor_compositor.h | 4 +- ...omium_ui_compositor_compositor__observer.h | 4 +- ...src_3rdparty_chromium_ui_display_screen.cc | 4 +- ...-src_3rdparty_chromium_ui_display_screen.h | 6 +- ..._devices_x11_device__data__manager__x11.cc | 4 +- ...h-src_3rdparty_chromium_ui_events_event.cc | 8 +- ..._events_keycodes_dom_keycode__converter.cc | 10 +- ...i_events_keycodes_dom_keycode__converter.h | 4 +- ...ayout_xkb_xkb__keyboard__layout__engine.cc | 6 +- ...atch-src_3rdparty_chromium_ui_gfx_BUILD.gn | 2 +- ...dparty_chromium_ui_gfx_codec_png__codec.cc | 11 - ...y_chromium_ui_gfx_font__fallback__linux.cc | 4 +- ...rty_chromium_ui_gfx_font__render__params.h | 6 +- ...mium_ui_gfx_font__render__params__linux.cc | 6 +- ...src_3rdparty_chromium_ui_gfx_font__util.cc | 8 +- ...rty_chromium_ui_gfx_gpu__memory__buffer.cc | 4 +- ...arty_chromium_ui_gfx_gpu__memory__buffer.h | 4 +- ...party_chromium_ui_gfx_linux_dmabuf__uapi.h | 2 +- ...arty_chromium_ui_gfx_linux_gbm__wrapper.cc | 6 +- ...jom_native__handle__types__mojom__traits.h | 10 +- ..._chromium_ui_gfx_native__pixmap__handle.cc | 2 +- ...ty_chromium_ui_gfx_native__widget__types.h | 8 +- ...ty_chromium_ui_gfx_platform__font__skia.cc | 8 +- ...ty_chromium_ui_gfx_render__text__fuzzer.cc | 8 +- ...h-src_3rdparty_chromium_ui_gfx_switches.cc | 4 +- ...ch-src_3rdparty_chromium_ui_gfx_switches.h | 6 +- ...rdparty_chromium_ui_gfx_x_xlib__support.cc | 2 +- ...patch-src_3rdparty_chromium_ui_gl_BUILD.gn | 19 +- ...src_3rdparty_chromium_ui_gl_gl__context.cc | 4 +- ...h-src_3rdparty_chromium_ui_gl_gl__fence.cc | 8 +- ...party_chromium_ui_gl_gl__implementation.cc | 6 +- ...rc_3rdparty_chromium_ui_gl_gl__switches.cc | 6 +- ...um_ui_gl_sync__control__vsync__provider.cc | 10 +- ...mium_ui_gtk_printing_print__dialog__gtk.cc | 10 +- ...sage__center_views_message__popup__view.cc | 6 +- ..._chromium_ui_native__theme_native__theme.h | 6 +- ...um_ui_native__theme_native__theme__base.cc | 6 +- ...party_chromium_ui_ozone_common_features.cc | 11 +- ...orm_headless_headless__surface__factory.cc | 4 +- ...form_headless_ozone__platform__headless.cc | 4 +- ...adless_vulkan__implementation__headless.cc | 8 +- ...e_platform_wayland_common_wayland__util.cc | 15 +- ...wayland_emulate_wayland__input__emulate.cc | 6 +- ..._wayland_emulate_wayland__input__emulate.h | 8 +- ...atform_wayland_host_wayland__connection.cc | 11 + ...nd_host_wayland__input__method__context.cc | 11 + ...ne_platform_wayland_host_wayland__popup.cc | 11 + ...e_platform_wayland_host_wayland__screen.cc | 29 ++ ...ne_platform_wayland_host_wayland__screen.h | 38 ++ ..._wayland_host_wayland__toplevel__window.cc | 4 +- ...m_wayland_host_wayland__toplevel__window.h | 4 +- ...e_platform_wayland_host_wayland__window.cc | 14 +- ...ne_platform_wayland_host_wayland__window.h | 12 +- ...yland_host_xdg__toplevel__wrapper__impl.cc | 4 +- ...land_host_zwp__text__input__wrapper__v1.cc | 6 +- ...atform_wayland_ozone__platform__wayland.cc | 13 +- ...latform_x11_vulkan__implementation__x11.cc | 4 +- ...i_ozone_platform_x11_x11__screen__ozone.cc | 13 +- ...ui_ozone_platform_x11_x11__screen__ozone.h | 31 +- ...omium_ui_ozone_platform_x11_x11__window.cc | 6 +- ...ne_test_mock__platform__window__delegate.h | 4 +- ...form__window_platform__window__delegate.cc | 8 +- ...tform__window_platform__window__delegate.h | 4 +- ...indow_platform__window__init__properties.h | 6 +- ...mium_ui_views_controls_prefix__selector.cc | 4 +- ...omium_ui_views_controls_prefix__selector.h | 4 +- ...m_ui_views_controls_textfield_textfield.cc | 14 +- ...um_ui_views_controls_textfield_textfield.h | 8 +- ..._chromium_ui_views_corewm_tooltip__aura.cc | 6 +- ...omium_ui_views_examples_widget__example.cc | 4 +- ..._chromium_ui_views_focus_focus__manager.cc | 10 +- ...chromium_ui_views_style_platform__style.cc | 12 +- ...controls__factory__desktop__aura__ozone.cc | 4 +- ...aura_desktop__drag__drop__client__ozone.cc | 6 +- ..._aura_desktop__drag__drop__client__ozone.h | 6 +- ...a_desktop__window__tree__host__platform.cc | 17 +- ...st__platform__impl__interactive__uitest.cc | 4 +- ...rty_chromium_ui_views_widget_root__view.cc | 10 +- ...rdparty_chromium_ui_views_widget_widget.cc | 6 +- ...3rdparty_chromium_ui_views_widget_widget.h | 11 - ...ium_ui_views_window_custom__frame__view.cc | 6 +- ...romium_ui_views_window_dialog__delegate.cc | 4 +- .../patch-src_3rdparty_chromium_v8_BUILD.gn | 45 +- ...3rdparty_chromium_v8_include_v8-internal.h | 4 +- ...rc_3rdparty_chromium_v8_include_v8config.h | 30 +- ...ch-src_3rdparty_chromium_v8_src_api_api.cc | 6 +- ...rty_chromium_v8_src_base_platform_memory.h | 22 +- ...m_v8_src_base_platform_platform-freebsd.cc | 4 +- ...m_v8_src_base_platform_platform-openbsd.cc | 4 +- ...ium_v8_src_base_platform_platform-posix.cc | 23 +- ..._3rdparty_chromium_v8_src_base_sys-info.cc | 4 +- ...romium_v8_src_builtins_x64_builtins-x64.cc | 14 + ...rty_chromium_v8_src_codegen_arm_cpu-arm.cc | 24 - ...party_chromium_v8_src_execution_isolate.cc | 12 +- ...rc_3rdparty_chromium_v8_src_flags_flags.cc | 20 +- ...rdparty_chromium_v8_src_sandbox_sandbox.cc | 4 +- ...dded_platform-embedded-file-writer-base.cc | 8 +- ...edded_platform-embedded-file-writer-base.h | 6 +- ...8_src_trap-handler_handler-inside-posix.cc | 4 +- ...baseline_ia32_liftoff-assembler-ia32-inl.h | 128 +++++ ...atch-src_3rdparty_chromium_v8_tools_run.py | 18 +- ...party_gn_build_build__linux.ninja.template | 6 +- .../files/patch-src_3rdparty_gn_build_gen.py | 6 +- ..._3rdparty_gn_src_base_files_file__posix.cc | 4 +- .../files/patch-src_core_CMakeLists.txt | 51 +- .../files/patch-src_core_api_configure.cmake | 10 +- ...r_native__skia__output__device__opengl.cpp | 4 +- .../files/patch-src_pdf_CMakeLists.txt | 16 +- www/qt6-webengine/pkg-plist | 39 +- www/qt6-websockets/distinfo | 6 +- www/qt6-websockets/pkg-plist | 8 + www/qt6-webview/distinfo | 6 +- www/qt6-webview/pkg-plist | 16 + x11-toolkits/py-qt6-charts/distinfo | 6 +- x11-toolkits/py-qt6-datavis3d/distinfo | 6 +- x11-toolkits/py-qt6-graphs/Makefile | 1 - x11-toolkits/py-qt6-graphs/distinfo | 6 +- x11-toolkits/py-qt6-graphs/pkg-plist | 1 + x11-toolkits/qt6-charts/distinfo | 6 +- x11-toolkits/qt6-charts/pkg-plist | 16 + x11-toolkits/qt6-datavis3d/distinfo | 6 +- x11-toolkits/qt6-datavis3d/pkg-plist | 16 + x11-toolkits/qt6-declarative/distinfo | 6 +- x11-toolkits/qt6-declarative/pkg-plist | 443 ++++++++++++++++-- x11-toolkits/qt6-graphs/distinfo | 6 +- x11-toolkits/qt6-graphs/pkg-plist | 24 +- x11-toolkits/qt6-quick3d/distinfo | 6 +- x11-toolkits/qt6-quick3d/pkg-plist | 96 ++++ x11-toolkits/qt6-quicktimeline/distinfo | 6 +- x11-toolkits/qt6-quicktimeline/pkg-plist | 16 + x11-toolkits/qt6-shadertools/distinfo | 6 +- x11-toolkits/qt6-shadertools/pkg-plist | 8 + x11-toolkits/qt6-virtualkeyboard/distinfo | 6 +- x11-toolkits/qt6-virtualkeyboard/pkg-plist | 68 ++- 887 files changed, 7671 insertions(+), 5088 deletions(-) delete mode 100644 www/qt6-webengine/files/extra-patch-32bit-compress_files_js create mode 100644 www/qt6-webengine/files/patch-cmake_QtConfigureHelpers.cmake create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_page__allocator__internals__posix.cc delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_partition__address__space.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_debug_proc__maps__linux.cc delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_partition__page__constants.h rename www/qt6-webengine/files/{patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_starscan_stack_stack.cc => patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_stack_stack.cc} (78%) delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_base_base__switches.cc delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_base_base__switches.h create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_base_memory_protected__memory.h create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_base_memory_protected__memory__posix.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_base_message__loop_message__pump__epoll.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_base_message__loop_message__pump__epoll.h create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_base_posix_file__descriptor__shuffle.h create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_base_posix_sysctl.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_internal__linux.h create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_base_threading_platform__thread.h create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_clang_BUILD.gn create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_rust.gni create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_build_rust_rust__bindgen.gni create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_build_rust_std_BUILD.gn delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_cc_BUILD.gn create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_accessibility_page__colors.cc delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_accessibility_pdf__ocr__controller.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_management_chrome__management__api__delegate.cc rename www/qt6-webengine/files/{patch-src_3rdparty_chromium_chrome_browser_extensions_api_messaging_native__process__launcher__posix.cc => patch-src_3rdparty_chromium_chrome_browser_extensions_api_messaging_launch__context__posix.cc} (62%) delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_webrtc_capture__policy__utils.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_net_profile__network__context__service.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_about_about__ui.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_about_about__ui.h create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_app__home_app__home__page__handler.h create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_certificate__manager_certificate__manager__handler.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_certificate__manager_client__cert__sources.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_certificate__manager_client__cert__sources.h create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_chrome__web__ui__configs.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_internals_user__education_user__education__internals__page__handler__impl.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_interstitials_interstitial__ui.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_management_management__ui__constants.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_management_management__ui__constants.h delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_ntp_app__launcher__handler.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_password__manager_promo__cards_relaunch__chrome__promo.cc rename www/qt6-webengine/files/{patch-src_3rdparty_chromium_chrome_browser_ui_webui_realbox_realbox__handler.cc => patch-src_3rdparty_chromium_chrome_browser_ui_webui_searchbox_searchbox__handler.cc} (51%) delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_settings_accessibility__main__handler.cc delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_settings_accessibility__main__handler.h create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_signin_profile__picker__handler.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_crash__keys.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_media_cdm__registration.h delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_renderer_chrome__render__frame__observer.cc delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_test_BUILD.gn create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_components_autofill_core_browser_autofill__optimization__guide.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_components_autofill_core_browser_payments__data__manager.cc delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_components_autofill_core_browser_personal__data__manager.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_components_autofill_core_common_autofill__payments__features.h create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_components_autofill_core_common_autofill__prefs.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_components_autofill_core_common_autofill__prefs.h delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_components_autofill_core_common_autofill__util.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_components_constrained__window_constrained__window__views.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_components_enterprise_watermarking_watermark.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_components_eye__dropper_eye__dropper__view.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_components_gwp__asan_client_gwp__asan__features.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_components_media__router_common_providers_cast_channel_enum__table.h create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_components_named__system__lock_lock.h create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_components_os__crypt_async_browser_secret__portal__key__provider.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_components_os__crypt_async_common_encryptor.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_browser_password__manager__client.h create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_browser_password__manager__switches.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_browser_password__manager__switches.h create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_browser_password__manual__fallback__flow.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_browser_password__manual__fallback__flow.h create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_browser_password__store__factory__util.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_browser_password__store_login__database.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_browser_password__store_login__database__async__helper.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_browser_stub__password__manager__client.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_browser_stub__password__manager__client.h delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_browser_sync_password__sync__bridge.cc delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_common_password__manager__features.cc delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_common_password__manager__features.h create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_components_policy_core_common_cloud_cloud__policy__refresh__scheduler.cc delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_components_qr__code__generator_features.cc delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_components_qr__code__generator_features.h delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_components_qr__code__generator_qr__code__generator.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_components_search__engines_search__engine__choice_search__engine__choice__service.cc delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_components_services_screen__ai_public_cpp_utilities.cc delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_components_services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.cc delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_components_services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.h delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_components_signin_public_base_signin__switches.cc delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_components_signin_public_base_signin__switches.h create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_components_soda_soda__util.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_components_supervised__user_core_browser_supervised__user__metrics__service.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_components_supervised__user_core_browser_supervised__user__preferences.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_components_supervised__user_core_common_pref__names.h create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_components_system__cpu_cpu__probe.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_components_trusted__vault_trusted__vault__connection__impl.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_components_visited__url__ranking_public_url__visit__util.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_content_app_BUILD.gn create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_file__system__access_file__path__watcher_file__path__watcher.h create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_file__system__access_file__path__watcher_file__path__watcher__bsd.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_file__system__access_file__path__watcher_file__path__watcher__kqueue.h create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__process__host__impl__receiver__bindings.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_content_child_child__process.h create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_content_common_gpu__pre__sandbox__hook__linux.h delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_content_common_mojo__core__library__support.cc delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_content_common_zygote_sandbox__support__linux.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_browser_service__process__host.cc delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_content_renderer_render__process__impl.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_content_shell_renderer_shell__content__renderer__client.cc delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_content_test_BUILD.gn delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_common_gpu__memory__buffer__support.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__context__state.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__context__state.h create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_headless_lib_browser_headless__content__browser__client.cc delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_headless_lib_browser_headless__request__context__manager.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_pulse_pulse__util.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_libaom__thread__wrapper.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_media_ffmpeg_scripts_build__ffmpeg.py create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_media_ffmpeg_scripts_robo__lib_config.py create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_chromeos_gl__image__processor__backend.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_chromeos_native__pixmap__frame__resource.cc delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_mojo_public_c_system_thunks.cc delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_net_tools_cert__verify__tool_cert__verify__comparision__tool.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_backend_print__backend__cups.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_printing__features.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_printing__features.h delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_compute__pressure_cpu__probe.cc delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_geolocation_location__arbitrator.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_geolocation_location__provider__manager.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_services_on__device__model_on__device__model__service.h create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_services_on__device__model_pre__sandbox__init.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_services_screen__ai_public_cpp_utilities.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.h delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_ml_webnn_features.gni delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_ml_webnn_ml__graph__xnnpack.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_peerconnection_rtc__data__channel.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_graphics_gpu_image__layer__bridge.cc delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_video__capture_video__capture__impl.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_wtf_text_text__codec__icu.cc delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_util_generate__build__files.py create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_devtools-frontend_src_scripts_build_compress__files.js delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_ffmpeg_chromium_scripts_build__ffmpeg.py delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_ffmpeg_chromium_scripts_robo__lib_config.py delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_maldoca_BUILD.gn delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_maldoca_src_maldoca_base_get__runfiles__dir.cc delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_maldoca_src_maldoca_service_common_process__doc__wrapper.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_nasm_BUILD.gn create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_src_base_utils.cc delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_src_trace_processor_db_column_numeric__storage.cc rename www/qt6-webengine/files/{patch-src_3rdparty_chromium_third__party_perfetto_src_tracing_core_tracing__service__impl.cc => patch-src_3rdparty_chromium_third__party_perfetto_src_tracing_core_clock__snapshots.cc} (63%) delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_protobuf_src_google_protobuf_arenastring.cc rename www/qt6-webengine/files/{patch-src_3rdparty_chromium_third__party_skia_src_base_SkContainers.cpp => patch-src_3rdparty_chromium_third__party_skia_src_ports_SkMemory__malloc.cpp} (62%) create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_speech-dispatcher_speechd__types.h rename www/qt6-webengine/files/{patch-src_3rdparty_chromium_third__party_vulkan-deps_vulkan-loader_src_BUILD.gn => patch-src_3rdparty_chromium_third__party_vulkan-loader_src_BUILD.gn} (54%) rename www/qt6-webengine/files/{patch-src_3rdparty_chromium_third__party_vulkan-deps_vulkan-loader_src_loader_vk__loader__platform.h => patch-src_3rdparty_chromium_third__party_vulkan-loader_src_loader_vk__loader__platform.h} (72%) rename www/qt6-webengine/files/{patch-src_3rdparty_chromium_third__party_vulkan-deps_vulkan-validation-layers_src_layers_external_vma_vk__mem__alloc.h => patch-src_3rdparty_chromium_third__party_vulkan-validation-layers_src_layers_external_vma_vk__mem__alloc.h} (65%) create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_modules_video__capture_linux_pipewire__session.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_modules_video__coding_codecs_av1_libaom__av1__encoder.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ui__base__features.h delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_x_x11__display__util.cc delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_x_x11__util.cc delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_x_x11__util.h delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_codec_png__codec.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_host_wayland__connection.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_host_wayland__input__method__context.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_host_wayland__popup.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_host_wayland__screen.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_host_wayland__screen.h delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_widget.h create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_builtins_x64_builtins-x64.cc delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_codegen_arm_cpu-arm.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_wasm_baseline_ia32_liftoff-assembler-ia32-inl.h diff --git a/Mk/Uses/pyqt.mk b/Mk/Uses/pyqt.mk index 5cfa88989130..347220ca361a 100644 --- a/Mk/Uses/pyqt.mk +++ b/Mk/Uses/pyqt.mk @@ -108,7 +108,7 @@ MASTER_SITES_PYQTWEBENGINE= ${MASTER_SITES_PYQT${_PYQT_VERSION}WEBENGINE} # below, should have a suitable epoch appended to the version. # Qt version-agnostic components -PYQTBUILDER_VERSION= 1.18.0 +PYQTBUILDER_VERSION= 1.18.1 QSCI2_VERSION= 2.14.1 SIP_VERSION= 6.10.0 # ,1 @@ -123,13 +123,13 @@ PYQT5WEBENGINE_VERSION= 5.15.7 # Qt 6 components PYQT6SIP_VERSION= 13.10.0 -PYQT6_VERSION= 6.8.1 -PYQT63D_VERSION= 6.8.0 -PYQT6CHARTS_VERSION= 6.8.0 -PYQT6DATAVIS3D_VERSION= 6.8.0 -PYQT6GRAPHS_VERSION= 6.8.0 -PYQT6NETWORKAUTH_VERSION= 6.8.0 -PYQT6WEBENGINE_VERSION= 6.8.0 +PYQT6_VERSION= 6.9.0 +PYQT63D_VERSION= 6.9.0 +PYQT6CHARTS_VERSION= 6.9.0 +PYQT6DATAVIS3D_VERSION= 6.9.0 +PYQT6GRAPHS_VERSION= 6.9.0 +PYQT6NETWORKAUTH_VERSION= 6.9.0 +PYQT6WEBENGINE_VERSION= 6.9.0 # Qt version-agnostic components PYQTBUILDER_DISTNAME= pyqt_builder-${PYQTBUILDER_VERSION} @@ -147,12 +147,12 @@ PYQT5WEBENGINE_DISTNAME= PyQtWebEngine-${PYQT5WEBENGINE_VERSION} # Qt 6 components PYQT6SIP_DISTNAME= pyqt6_sip-${PYQT6SIP_VERSION} PYQT6_DISTNAME= pyqt6-${PYQT6_VERSION} -PYQT63D_DISTNAME= PyQt6_3D-${PYQT63D_VERSION} -PYQT6CHARTS_DISTNAME= PyQt6_Charts-${PYQT6CHARTS_VERSION} -PYQT6DATAVIS3D_DISTNAME= PyQt6_DataVisualization-${PYQT6DATAVIS3D_VERSION} -PYQT6GRAPHS_DISTNAME= PyQt6_Graphs-${PYQT6GRAPHS_VERSION} -PYQT6NETWORKAUTH_DISTNAME= PyQt6_NetworkAuth-${PYQT6NETWORKAUTH_VERSION} -PYQT6WEBENGINE_DISTNAME= PyQt6_WebEngine-${PYQT6WEBENGINE_VERSION} +PYQT63D_DISTNAME= pyqt6_3d-${PYQT63D_VERSION} +PYQT6CHARTS_DISTNAME= pyqt6_charts-${PYQT6CHARTS_VERSION} +PYQT6DATAVIS3D_DISTNAME= pyqt6_datavisualization-${PYQT6DATAVIS3D_VERSION} +PYQT6GRAPHS_DISTNAME= pyqt6_graphs-${PYQT6GRAPHS_VERSION} +PYQT6NETWORKAUTH_DISTNAME= pyqt6_networkauth-${PYQT6NETWORKAUTH_VERSION} +PYQT6WEBENGINE_DISTNAME= pyqt6_webengine-${PYQT6WEBENGINE_VERSION} PYQT5_DISTINFO_FILE= ${.CURDIR:H:H}/devel/${PYQT_RELNAME}/distinfo PYQT6_DISTINFO_FILE= ${.CURDIR:H:H}/devel/${PYQT_RELNAME}/distinfo diff --git a/Mk/Uses/qt.mk b/Mk/Uses/qt.mk index 038a82dc4ab6..f97a998cf5e0 100644 --- a/Mk/Uses/qt.mk +++ b/Mk/Uses/qt.mk @@ -23,8 +23,8 @@ _QT_MK_INCLUDED= qt.mk # Qt versions currently supported by the framework. _QT_SUPPORTED?= 5 6 QT5_VERSION?= 5.15.16 -QT6_VERSION?= 6.8.3 -PYSIDE6_VERSION?= 6.8.3 +QT6_VERSION?= 6.9.0 +PYSIDE6_VERSION?= 6.9.0 # Support for intermediate Qt6 releases. This partially defines # _QT6_MASTER_SITE_SUBDIR and would probably be better in qt-dist.mk, diff --git a/accessibility/qt6-speech/distinfo b/accessibility/qt6-speech/distinfo index 5b2926084c1e..120e030bec06 100644 --- a/accessibility/qt6-speech/distinfo +++ b/accessibility/qt6-speech/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1743027793 -SHA256 (KDE/Qt/6.8.3/qtspeech-everywhere-src-6.8.3.tar.xz) = b0dd3e3bf993e15dc03d3486ee1b452c2b92f0460a621eb32d261eecc040504b -SIZE (KDE/Qt/6.8.3/qtspeech-everywhere-src-6.8.3.tar.xz) = 264416 +TIMESTAMP = 1743708017 +SHA256 (KDE/Qt/6.9.0/qtspeech-everywhere-src-6.9.0.tar.xz) = a981b68c71743d77a3ce4437ad118d3851390f05a1ab26a859fb9b8c5938c971 +SIZE (KDE/Qt/6.9.0/qtspeech-everywhere-src-6.9.0.tar.xz) = 262856 diff --git a/accessibility/qt6-speech/pkg-plist b/accessibility/qt6-speech/pkg-plist index a2a38d208116..d5a51e0128a8 100644 --- a/accessibility/qt6-speech/pkg-plist +++ b/accessibility/qt6-speech/pkg-plist @@ -52,6 +52,14 @@ lib/cmake/Qt6TextToSpeech/Qt6TextToSpeechTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6TextToSpeech/Qt6TextToSpeechTargets.cmake lib/cmake/Qt6TextToSpeech/Qt6TextToSpeechVersionlessAliasTargets.cmake lib/cmake/Qt6TextToSpeech/Qt6TextToSpeechVersionlessTargets.cmake +lib/cmake/Qt6TextToSpeechPrivate/Qt6TextToSpeechPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6TextToSpeechPrivate/Qt6TextToSpeechPrivateConfig.cmake +lib/cmake/Qt6TextToSpeechPrivate/Qt6TextToSpeechPrivateConfigVersion.cmake +lib/cmake/Qt6TextToSpeechPrivate/Qt6TextToSpeechPrivateConfigVersionImpl.cmake +lib/cmake/Qt6TextToSpeechPrivate/Qt6TextToSpeechPrivateDependencies.cmake +lib/cmake/Qt6TextToSpeechPrivate/Qt6TextToSpeechPrivateTargets.cmake +lib/cmake/Qt6TextToSpeechPrivate/Qt6TextToSpeechPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6TextToSpeechPrivate/Qt6TextToSpeechPrivateVersionlessTargets.cmake %%QT_LIBDIR%%/libQt6TextToSpeech.prl %%QT_LIBDIR%%/libQt6TextToSpeech.so %%QT_LIBDIR%%/libQt6TextToSpeech.so.6 diff --git a/comms/qt6-connectivity/distinfo b/comms/qt6-connectivity/distinfo index a8ba3ada90f4..fdda07887c8e 100644 --- a/comms/qt6-connectivity/distinfo +++ b/comms/qt6-connectivity/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1743027794 -SHA256 (KDE/Qt/6.8.3/qtconnectivity-everywhere-src-6.8.3.tar.xz) = 477176383308ce77f974a16f118027e833061caed57aeb30eeb4306a583c9b39 -SIZE (KDE/Qt/6.8.3/qtconnectivity-everywhere-src-6.8.3.tar.xz) = 1071152 +TIMESTAMP = 1743708022 +SHA256 (KDE/Qt/6.9.0/qtconnectivity-everywhere-src-6.9.0.tar.xz) = ff402f8dacb2b9f9308afcea67118ae1645ce6466f2d41a8d5c12fd2fa168598 +SIZE (KDE/Qt/6.9.0/qtconnectivity-everywhere-src-6.9.0.tar.xz) = 1071744 diff --git a/comms/qt6-connectivity/pkg-plist b/comms/qt6-connectivity/pkg-plist index bd5dd2a600cb..736528e4f8c1 100644 --- a/comms/qt6-connectivity/pkg-plist +++ b/comms/qt6-connectivity/pkg-plist @@ -64,6 +64,12 @@ %%QT_INCDIR%%/QtBluetooth/qtbluetoothexports.h %%QT_INCDIR%%/QtBluetooth/qtbluetoothglobal.h %%QT_INCDIR%%/QtBluetooth/qtbluetoothversion.h +%%QT_INCDIR%%/QtConnectivity/%%FULLVER%%/QtConnectivity/private/qtconnectivity-config_p.h +%%QT_INCDIR%%/QtConnectivity/QtConnectivity +%%QT_INCDIR%%/QtConnectivity/QtConnectivityDepends +%%QT_INCDIR%%/QtConnectivity/QtConnectivityVersion +%%QT_INCDIR%%/QtConnectivity/qtconnectivity-config.h +%%QT_INCDIR%%/QtConnectivity/qtconnectivityversion.h %%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qapduutils_p.h %%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qndefaccessfsm_p.h %%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qndefnfcsmartposterrecord_p.h @@ -114,7 +120,22 @@ lib/cmake/Qt6Bluetooth/Qt6BluetoothTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6Bluetooth/Qt6BluetoothTargets.cmake lib/cmake/Qt6Bluetooth/Qt6BluetoothVersionlessAliasTargets.cmake lib/cmake/Qt6Bluetooth/Qt6BluetoothVersionlessTargets.cmake +lib/cmake/Qt6BluetoothPrivate/Qt6BluetoothPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6BluetoothPrivate/Qt6BluetoothPrivateConfig.cmake +lib/cmake/Qt6BluetoothPrivate/Qt6BluetoothPrivateConfigVersion.cmake +lib/cmake/Qt6BluetoothPrivate/Qt6BluetoothPrivateConfigVersionImpl.cmake +lib/cmake/Qt6BluetoothPrivate/Qt6BluetoothPrivateDependencies.cmake +lib/cmake/Qt6BluetoothPrivate/Qt6BluetoothPrivateTargets.cmake +lib/cmake/Qt6BluetoothPrivate/Qt6BluetoothPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6BluetoothPrivate/Qt6BluetoothPrivateVersionlessTargets.cmake lib/cmake/Qt6BuildInternals/StandaloneTests/QtConnectivityTestsConfig.cmake +lib/cmake/Qt6Connectivity/Qt6ConnectivityAdditionalTargetInfo.cmake +lib/cmake/Qt6Connectivity/Qt6ConnectivityConfig.cmake +lib/cmake/Qt6Connectivity/Qt6ConnectivityConfigVersion.cmake +lib/cmake/Qt6Connectivity/Qt6ConnectivityConfigVersionImpl.cmake +lib/cmake/Qt6Connectivity/Qt6ConnectivityTargets.cmake +lib/cmake/Qt6Connectivity/Qt6ConnectivityVersionlessAliasTargets.cmake +lib/cmake/Qt6Connectivity/Qt6ConnectivityVersionlessTargets.cmake lib/cmake/Qt6Nfc/Qt6NfcAdditionalTargetInfo.cmake lib/cmake/Qt6Nfc/Qt6NfcConfig.cmake lib/cmake/Qt6Nfc/Qt6NfcConfigVersion.cmake @@ -124,6 +145,14 @@ lib/cmake/Qt6Nfc/Qt6NfcTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6Nfc/Qt6NfcTargets.cmake lib/cmake/Qt6Nfc/Qt6NfcVersionlessAliasTargets.cmake lib/cmake/Qt6Nfc/Qt6NfcVersionlessTargets.cmake +lib/cmake/Qt6NfcPrivate/Qt6NfcPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6NfcPrivate/Qt6NfcPrivateConfig.cmake +lib/cmake/Qt6NfcPrivate/Qt6NfcPrivateConfigVersion.cmake +lib/cmake/Qt6NfcPrivate/Qt6NfcPrivateConfigVersionImpl.cmake +lib/cmake/Qt6NfcPrivate/Qt6NfcPrivateDependencies.cmake +lib/cmake/Qt6NfcPrivate/Qt6NfcPrivateTargets.cmake +lib/cmake/Qt6NfcPrivate/Qt6NfcPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6NfcPrivate/Qt6NfcPrivateVersionlessTargets.cmake %%QT_LIBDIR%%/libQt6Bluetooth.prl %%QT_LIBDIR%%/libQt6Bluetooth.so %%QT_LIBDIR%%/libQt6Bluetooth.so.6 @@ -136,10 +165,12 @@ lib/cmake/Qt6Nfc/Qt6NfcVersionlessTargets.cmake %%QT_LIBDIR%%/metatypes/qt6nfc_%%CMAKE_BUILD_TYPE%%_metatypes.json %%QT_MKSPECDIR%%/modules/qt_lib_bluetooth.pri %%QT_MKSPECDIR%%/modules/qt_lib_bluetooth_private.pri +%%QT_MKSPECDIR%%/modules/qt_lib_connectivity_private.pri %%QT_MKSPECDIR%%/modules/qt_lib_nfc.pri %%QT_MKSPECDIR%%/modules/qt_lib_nfc_private.pri %%QT_SBOMDIR%%/qtconnectivity-%%FULLVER%%.spdx libdata/pkgconfig/Qt6Bluetooth.pc libdata/pkgconfig/Qt6Nfc.pc %%QT_DATADIR%%/modules/Bluetooth.json +%%QT_DATADIR%%/modules/Connectivity.json %%QT_DATADIR%%/modules/Nfc.json diff --git a/comms/qt6-sensors/distinfo b/comms/qt6-sensors/distinfo index 3c7bf0560c81..3df682a962a8 100644 --- a/comms/qt6-sensors/distinfo +++ b/comms/qt6-sensors/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1743027795 -SHA256 (KDE/Qt/6.8.3/qtsensors-everywhere-src-6.8.3.tar.xz) = b871a7501f9fa609f35260ea39a0f198427d6d6b9ee8d1a6ddb987cc26511eae -SIZE (KDE/Qt/6.8.3/qtsensors-everywhere-src-6.8.3.tar.xz) = 1500140 +TIMESTAMP = 1743708026 +SHA256 (KDE/Qt/6.9.0/qtsensors-everywhere-src-6.9.0.tar.xz) = a46137c1f4a768d00397a2f83de7018318b0ca35d39c848da62d1783b368e467 +SIZE (KDE/Qt/6.9.0/qtsensors-everywhere-src-6.9.0.tar.xz) = 1500292 diff --git a/comms/qt6-sensors/pkg-plist b/comms/qt6-sensors/pkg-plist index b48fd5a657f4..3812e134be21 100644 --- a/comms/qt6-sensors/pkg-plist +++ b/comms/qt6-sensors/pkg-plist @@ -149,6 +149,14 @@ lib/cmake/Qt6Sensors/Qt6genericSensorPluginConfigVersion.cmake lib/cmake/Qt6Sensors/Qt6genericSensorPluginConfigVersionImpl.cmake lib/cmake/Qt6Sensors/Qt6genericSensorPluginTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6Sensors/Qt6genericSensorPluginTargets.cmake +lib/cmake/Qt6SensorsPrivate/Qt6SensorsPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6SensorsPrivate/Qt6SensorsPrivateConfig.cmake +lib/cmake/Qt6SensorsPrivate/Qt6SensorsPrivateConfigVersion.cmake +lib/cmake/Qt6SensorsPrivate/Qt6SensorsPrivateConfigVersionImpl.cmake +lib/cmake/Qt6SensorsPrivate/Qt6SensorsPrivateDependencies.cmake +lib/cmake/Qt6SensorsPrivate/Qt6SensorsPrivateTargets.cmake +lib/cmake/Qt6SensorsPrivate/Qt6SensorsPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6SensorsPrivate/Qt6SensorsPrivateVersionlessTargets.cmake lib/cmake/Qt6SensorsQuick/Qt6SensorsQuickAdditionalTargetInfo.cmake lib/cmake/Qt6SensorsQuick/Qt6SensorsQuickConfig.cmake lib/cmake/Qt6SensorsQuick/Qt6SensorsQuickConfigVersion.cmake @@ -158,6 +166,14 @@ lib/cmake/Qt6SensorsQuick/Qt6SensorsQuickTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6SensorsQuick/Qt6SensorsQuickTargets.cmake lib/cmake/Qt6SensorsQuick/Qt6SensorsQuickVersionlessAliasTargets.cmake lib/cmake/Qt6SensorsQuick/Qt6SensorsQuickVersionlessTargets.cmake +lib/cmake/Qt6SensorsQuickPrivate/Qt6SensorsQuickPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6SensorsQuickPrivate/Qt6SensorsQuickPrivateConfig.cmake +lib/cmake/Qt6SensorsQuickPrivate/Qt6SensorsQuickPrivateConfigVersion.cmake +lib/cmake/Qt6SensorsQuickPrivate/Qt6SensorsQuickPrivateConfigVersionImpl.cmake +lib/cmake/Qt6SensorsQuickPrivate/Qt6SensorsQuickPrivateDependencies.cmake +lib/cmake/Qt6SensorsQuickPrivate/Qt6SensorsQuickPrivateTargets.cmake +lib/cmake/Qt6SensorsQuickPrivate/Qt6SensorsQuickPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6SensorsQuickPrivate/Qt6SensorsQuickPrivateVersionlessTargets.cmake %%QT_LIBDIR%%/libQt6Sensors.prl %%QT_LIBDIR%%/libQt6Sensors.so %%QT_LIBDIR%%/libQt6Sensors.so.6 diff --git a/comms/qt6-serialbus/distinfo b/comms/qt6-serialbus/distinfo index 88070682f45f..f908e267f362 100644 --- a/comms/qt6-serialbus/distinfo +++ b/comms/qt6-serialbus/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1743027796 -SHA256 (KDE/Qt/6.8.3/qtserialbus-everywhere-src-6.8.3.tar.xz) = 43480eeb7172757d2af2c5717cfed84a9254bef775cd715fd27258a81c7b7e9e -SIZE (KDE/Qt/6.8.3/qtserialbus-everywhere-src-6.8.3.tar.xz) = 550256 +TIMESTAMP = 1743708029 +SHA256 (KDE/Qt/6.9.0/qtserialbus-everywhere-src-6.9.0.tar.xz) = 0d46093411f2256e2c27d7a2d56fccb51b52753f14eb92a1a93e0da04585593f +SIZE (KDE/Qt/6.9.0/qtserialbus-everywhere-src-6.9.0.tar.xz) = 550632 diff --git a/comms/qt6-serialbus/pkg-plist b/comms/qt6-serialbus/pkg-plist index 3e25770c0e29..ae7db81fd404 100644 --- a/comms/qt6-serialbus/pkg-plist +++ b/comms/qt6-serialbus/pkg-plist @@ -108,6 +108,14 @@ lib/cmake/Qt6SerialBus/Qt6VirtualCanBusPluginConfigVersion.cmake lib/cmake/Qt6SerialBus/Qt6VirtualCanBusPluginConfigVersionImpl.cmake lib/cmake/Qt6SerialBus/Qt6VirtualCanBusPluginTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6SerialBus/Qt6VirtualCanBusPluginTargets.cmake +lib/cmake/Qt6SerialBusPrivate/Qt6SerialBusPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6SerialBusPrivate/Qt6SerialBusPrivateConfig.cmake +lib/cmake/Qt6SerialBusPrivate/Qt6SerialBusPrivateConfigVersion.cmake +lib/cmake/Qt6SerialBusPrivate/Qt6SerialBusPrivateConfigVersionImpl.cmake +lib/cmake/Qt6SerialBusPrivate/Qt6SerialBusPrivateDependencies.cmake +lib/cmake/Qt6SerialBusPrivate/Qt6SerialBusPrivateTargets.cmake +lib/cmake/Qt6SerialBusPrivate/Qt6SerialBusPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6SerialBusPrivate/Qt6SerialBusPrivateVersionlessTargets.cmake %%QT_BINDIR%%/canbusutil %%QT_LIBDIR%%/libQt6SerialBus.prl %%QT_LIBDIR%%/libQt6SerialBus.so diff --git a/comms/qt6-serialport/distinfo b/comms/qt6-serialport/distinfo index 1fe21234e056..64ab410136f3 100644 --- a/comms/qt6-serialport/distinfo +++ b/comms/qt6-serialport/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1743027797 -SHA256 (KDE/Qt/6.8.3/qtserialport-everywhere-src-6.8.3.tar.xz) = c164a0392dc7cab3d072fa8fdcacc8fc4f3e685234b021b3128020719cdf5fa5 -SIZE (KDE/Qt/6.8.3/qtserialport-everywhere-src-6.8.3.tar.xz) = 276532 +TIMESTAMP = 1743708032 +SHA256 (KDE/Qt/6.9.0/qtserialport-everywhere-src-6.9.0.tar.xz) = fbe762f5ca6b3e58fbbf51604928b50cf14628b670eaeab57751e07a4086b954 +SIZE (KDE/Qt/6.9.0/qtserialport-everywhere-src-6.9.0.tar.xz) = 278176 diff --git a/comms/qt6-serialport/pkg-plist b/comms/qt6-serialport/pkg-plist index dccd385cbb17..f5550272e9ef 100644 --- a/comms/qt6-serialport/pkg-plist +++ b/comms/qt6-serialport/pkg-plist @@ -22,6 +22,14 @@ lib/cmake/Qt6SerialPort/Qt6SerialPortTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6SerialPort/Qt6SerialPortTargets.cmake lib/cmake/Qt6SerialPort/Qt6SerialPortVersionlessAliasTargets.cmake lib/cmake/Qt6SerialPort/Qt6SerialPortVersionlessTargets.cmake +lib/cmake/Qt6SerialPortPrivate/Qt6SerialPortPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6SerialPortPrivate/Qt6SerialPortPrivateConfig.cmake +lib/cmake/Qt6SerialPortPrivate/Qt6SerialPortPrivateConfigVersion.cmake +lib/cmake/Qt6SerialPortPrivate/Qt6SerialPortPrivateConfigVersionImpl.cmake +lib/cmake/Qt6SerialPortPrivate/Qt6SerialPortPrivateDependencies.cmake +lib/cmake/Qt6SerialPortPrivate/Qt6SerialPortPrivateTargets.cmake +lib/cmake/Qt6SerialPortPrivate/Qt6SerialPortPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6SerialPortPrivate/Qt6SerialPortPrivateVersionlessTargets.cmake %%QT_LIBDIR%%/libQt6SerialPort.prl %%QT_LIBDIR%%/libQt6SerialPort.so %%QT_LIBDIR%%/libQt6SerialPort.so.6 diff --git a/databases/qt6-base_sqldriver/distinfo b/databases/qt6-base_sqldriver/distinfo index a847da8eb3e7..2e68b038540b 100644 --- a/databases/qt6-base_sqldriver/distinfo +++ b/databases/qt6-base_sqldriver/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1743027799 -SHA256 (KDE/Qt/6.8.3/qtbase-everywhere-src-6.8.3.tar.xz) = 56001b905601bb9023d399f3ba780d7fa940f3e4861e496a7c490331f49e0b80 -SIZE (KDE/Qt/6.8.3/qtbase-everywhere-src-6.8.3.tar.xz) = 48426536 +TIMESTAMP = 1743708057 +SHA256 (KDE/Qt/6.9.0/qtbase-everywhere-src-6.9.0.tar.xz) = c1800c2ea835801af04a05d4a32321d79a93954ee3ae2172bbeacf13d1f0598c +SIZE (KDE/Qt/6.9.0/qtbase-everywhere-src-6.9.0.tar.xz) = 49658320 diff --git a/devel/py-qt6-pyqt/Makefile b/devel/py-qt6-pyqt/Makefile index d86530253615..b1aa11a0004b 100644 --- a/devel/py-qt6-pyqt/Makefile +++ b/devel/py-qt6-pyqt/Makefile @@ -1,6 +1,5 @@ PORTNAME= pyqt DISTVERSION= ${PYQT_VERSION} -PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= ${MASTER_SITES_PYQT} PKGNAMEPREFIX= ${PYQT_PY_RELNAME}- diff --git a/devel/py-qt6-pyqt/distinfo b/devel/py-qt6-pyqt/distinfo index 67bd2fe59402..dacfe71bcda1 100644 --- a/devel/py-qt6-pyqt/distinfo +++ b/devel/py-qt6-pyqt/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1739071690 -SHA256 (pyqt6-6.8.1.tar.gz) = 91d937d6166274fafd70f4dee11a8da6dbfdb0da53de05f5d62361ddf775e256 -SIZE (pyqt6-6.8.1.tar.gz) = 1064723 +TIMESTAMP = 1743732124 +SHA256 (pyqt6-6.9.0.tar.gz) = 6a8ff8e3cd18311bb7d937f7d741e787040ae7ff47ce751c28a94c5cddc1b4e6 +SIZE (pyqt6-6.9.0.tar.gz) = 1066831 diff --git a/devel/py-qt6-pyqt/pkg-plist b/devel/py-qt6-pyqt/pkg-plist index 85c21a7d65af..a2f3cd63861e 100644 --- a/devel/py-qt6-pyqt/pkg-plist +++ b/devel/py-qt6-pyqt/pkg-plist @@ -121,6 +121,7 @@ bin/pyuic6 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtCore/qjsonarray.sip %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtCore/qjsondocument.sip %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtCore/qjsonobject.sip +%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtCore/qjsonparseerror.sip %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtCore/qjsonvalue.sip %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtCore/qlibrary.sip %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtCore/qlibraryinfo.sip @@ -155,6 +156,7 @@ bin/pyuic6 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtCore/qpycore_qlist.sip %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtCore/qpycore_qmap.sip %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtCore/qpycore_qset.sip +%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtCore/qpycore_std_chrono_duration.sip %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtCore/qpycore_std_optional.sip %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtCore/qpycore_std_pair.sip %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtCore/qpycore_virtual_error_handler.sip @@ -275,6 +277,7 @@ bin/pyuic6 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtGui/qfontdatabase.sip %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtGui/qfontinfo.sip %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtGui/qfontmetrics.sip +%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtGui/qfontvariableaxis.sip %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtGui/qgenericmatrix.sip %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtGui/qglyphrun.sip %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtGui/qguiapplication.sip @@ -300,6 +303,7 @@ bin/pyuic6 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtGui/qpaintengine.sip %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtGui/qpainter.sip %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtGui/qpainterpath.sip +%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtGui/qpainterstateguard.sip %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtGui/qpalette.sip %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtGui/qpdfoutputintent.sip %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtGui/qpdfwriter.sip diff --git a/devel/py-qt6/Makefile b/devel/py-qt6/Makefile index 2bf2a31c1a43..7cbbc524efc5 100644 --- a/devel/py-qt6/Makefile +++ b/devel/py-qt6/Makefile @@ -9,6 +9,6 @@ WWW= https://riverbankcomputing.com/software/pyqt USES= metaport python pyqt:6 USE_PYTHON= concurrent flavors py3kplist -USE_PYQT= pyqt6 3d charts datavis3d networkauth +USE_PYQT= pyqt6 3d charts datavis3d graphs networkauth .include diff --git a/devel/py-qtbuilder/distinfo b/devel/py-qtbuilder/distinfo index b828deb3f50f..35c032630bbf 100644 --- a/devel/py-qtbuilder/distinfo +++ b/devel/py-qtbuilder/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1738580901 -SHA256 (pyqt_builder-1.18.0.tar.gz) = ce9930aafc1ce0af928a6944bcc80ecf78c23ffdcad6ac111306c4c71057848e -SIZE (pyqt_builder-1.18.0.tar.gz) = 3671854 +TIMESTAMP = 1743732292 +SHA256 (pyqt_builder-1.18.1.tar.gz) = 3f7a3a2715947a293a97530a76fd59f1309fcb8e57a5830f45c79fe7249b3998 +SIZE (pyqt_builder-1.18.1.tar.gz) = 3671990 diff --git a/devel/pyside6-tools/distinfo b/devel/pyside6-tools/distinfo index 0d52f8ea51c3..06c80c6ad626 100644 --- a/devel/pyside6-tools/distinfo +++ b/devel/pyside6-tools/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1743103551 -SHA256 (KDE/Qt/6.8.3/pyside-setup-everywhere-src-6.8.3.tar.xz) = d2c896f7f1a6a7ea4c9f98cfe317272fd139703ddf612b86999f09e48aeef0e6 -SIZE (KDE/Qt/6.8.3/pyside-setup-everywhere-src-6.8.3.tar.xz) = 16611768 +TIMESTAMP = 1743707798 +SHA256 (KDE/Qt/6.9.0/pyside-setup-everywhere-src-6.9.0.tar.xz) = 315b73bb7570d5b9e6793a8d3fafd1d2dd7f43d35eebb01d2b554ea206aad88e +SIZE (KDE/Qt/6.9.0/pyside-setup-everywhere-src-6.9.0.tar.xz) = 16652756 diff --git a/devel/pyside6-tools/pkg-plist b/devel/pyside6-tools/pkg-plist index 4c06414fa8fa..9b2e6795ba49 100644 --- a/devel/pyside6-tools/pkg-plist +++ b/devel/pyside6-tools/pkg-plist @@ -59,12 +59,21 @@ %%PYSIDE_BINDIR_REL%%/project_lib/__pycache__/newproject%%PYTHON_EXT_SUFFIX%%.pyc %%PYSIDE_BINDIR_REL%%/project_lib/__pycache__/project_data%%PYTHON_EXT_SUFFIX%%.opt-1.pyc %%PYSIDE_BINDIR_REL%%/project_lib/__pycache__/project_data%%PYTHON_EXT_SUFFIX%%.pyc +%%PYSIDE_BINDIR_REL%%/project_lib/__pycache__/pyproject_json%%PYTHON_EXT_SUFFIX%%.opt-1.pyc +%%PYSIDE_BINDIR_REL%%/project_lib/__pycache__/pyproject_json%%PYTHON_EXT_SUFFIX%%.pyc +%%PYSIDE_BINDIR_REL%%/project_lib/__pycache__/pyproject_parse_result%%PYTHON_EXT_SUFFIX%%.opt-1.pyc +%%PYSIDE_BINDIR_REL%%/project_lib/__pycache__/pyproject_parse_result%%PYTHON_EXT_SUFFIX%%.pyc +%%PYSIDE_BINDIR_REL%%/project_lib/__pycache__/pyproject_toml%%PYTHON_EXT_SUFFIX%%.opt-1.pyc +%%PYSIDE_BINDIR_REL%%/project_lib/__pycache__/pyproject_toml%%PYTHON_EXT_SUFFIX%%.pyc %%PYSIDE_BINDIR_REL%%/project_lib/__pycache__/utils%%PYTHON_EXT_SUFFIX%%.opt-1.pyc %%PYSIDE_BINDIR_REL%%/project_lib/__pycache__/utils%%PYTHON_EXT_SUFFIX%%.pyc %%PYSIDE_BINDIR_REL%%/project_lib/__init__.py %%PYSIDE_BINDIR_REL%%/project_lib/design_studio_project.py %%PYSIDE_BINDIR_REL%%/project_lib/newproject.py %%PYSIDE_BINDIR_REL%%/project_lib/project_data.py +%%PYSIDE_BINDIR_REL%%/project_lib/pyproject_json.py +%%PYSIDE_BINDIR_REL%%/project_lib/pyproject_parse_result.py +%%PYSIDE_BINDIR_REL%%/project_lib/pyproject_toml.py %%PYSIDE_BINDIR_REL%%/project_lib/utils.py %%PYSIDE_BINDIR_REL%%/pyside_tool.py %%PYSIDE_BINDIR_REL%%/qml.py diff --git a/devel/pyside6/distinfo b/devel/pyside6/distinfo index 9e69ddeedc96..a8c6daa083ee 100644 --- a/devel/pyside6/distinfo +++ b/devel/pyside6/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1743103521 -SHA256 (KDE/Qt/6.8.3/pyside-setup-everywhere-src-6.8.3.tar.xz) = d2c896f7f1a6a7ea4c9f98cfe317272fd139703ddf612b86999f09e48aeef0e6 -SIZE (KDE/Qt/6.8.3/pyside-setup-everywhere-src-6.8.3.tar.xz) = 16611768 +TIMESTAMP = 1743707776 +SHA256 (KDE/Qt/6.9.0/pyside-setup-everywhere-src-6.9.0.tar.xz) = 315b73bb7570d5b9e6793a8d3fafd1d2dd7f43d35eebb01d2b554ea206aad88e +SIZE (KDE/Qt/6.9.0/pyside-setup-everywhere-src-6.9.0.tar.xz) = 16652756 diff --git a/devel/pyside6/pkg-plist b/devel/pyside6/pkg-plist index 7dd18b4edb8a..4954da8bd166 100644 --- a/devel/pyside6/pkg-plist +++ b/devel/pyside6/pkg-plist @@ -71,10 +71,15 @@ include/PySide6/pyside.h include/PySide6/pyside6_global.h include/PySide6/pyside_numpy.h include/PySide6/pyside_p.h +include/PySide6/pysidecapsulemethod_p.h include/PySide6/pysideclassdecorator_p.h include/PySide6/pysideclassinfo.h include/PySide6/pysideclassinfo_p.h include/PySide6/pysidecleanup.h +include/PySide6/pysidedynamicclass_p.h +include/PySide6/pysidedynamiccommon_p.h +include/PySide6/pysidedynamicenum_p.h +include/PySide6/pysidedynamicpod_p.h include/PySide6/pysideinit.h include/PySide6/pysidelogging_p.h include/PySide6/pysidemacros.h @@ -102,6 +107,7 @@ include/PySide6/pysideqmltypeinfo_p.h include/PySide6/pysideqmluncreatable.h include/PySide6/pysideqobject.h include/PySide6/pysideqslotobject_p.h +include/PySide6/pysiderephandler_p.h include/PySide6/pysidesignal.h include/PySide6/pysidesignal_p.h include/PySide6/pysideslot_p.h @@ -126,6 +132,7 @@ lib/libpyside6.abi%%PYTHON_MAJOR_VER%%.so.%%SHLIB_VERSION%% lib/libpyside6qml.abi%%PYTHON_MAJOR_VER%%.so lib/libpyside6qml.abi%%PYTHON_MAJOR_VER%%.so.%%SHLIB_VER%% lib/libpyside6qml.abi%%PYTHON_MAJOR_VER%%.so.%%SHLIB_VERSION%% +lib/libpyside6remoteobjects.a %%PYTHON_SITELIBDIR%%/PySide6/Qt3DAnimation.abi%%PYTHON_MAJOR_VER%%.so %%PYTHON_SITELIBDIR%%/PySide6/Qt3DAnimation.pyi %%PYTHON_SITELIBDIR%%/PySide6/Qt3DCore.abi%%PYTHON_MAJOR_VER%%.so @@ -294,6 +301,7 @@ share/PySide6/glue/qtqml.cpp share/PySide6/glue/qtquick.cpp share/PySide6/glue/qtquick3d.cpp share/PySide6/glue/qtquicktest.cpp +share/PySide6/glue/qtremoteobjects.cpp share/PySide6/glue/qtserialbus.cpp share/PySide6/glue/qtsql.cpp share/PySide6/glue/qtstatemachine.cpp diff --git a/devel/qt6-5compat/distinfo b/devel/qt6-5compat/distinfo index 83a0e10853a4..601cad790c0e 100644 --- a/devel/qt6-5compat/distinfo +++ b/devel/qt6-5compat/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1743027800 -SHA256 (KDE/Qt/6.8.3/qt5compat-everywhere-src-6.8.3.tar.xz) = 54b9c84bff34b423dd8c472862ce1009753ff505e418b4ef33907416da16b82e -SIZE (KDE/Qt/6.8.3/qt5compat-everywhere-src-6.8.3.tar.xz) = 14634168 +TIMESTAMP = 1743708068 +SHA256 (KDE/Qt/6.9.0/qt5compat-everywhere-src-6.9.0.tar.xz) = 55be0539d3a12071fbe0cd57af17d6dc3fc52578b1649824975e26301f710763 +SIZE (KDE/Qt/6.9.0/qt5compat-everywhere-src-6.9.0.tar.xz) = 14633480 diff --git a/devel/qt6-5compat/pkg-plist b/devel/qt6-5compat/pkg-plist index 5e786214d546..80c9f4a6a17c 100644 --- a/devel/qt6-5compat/pkg-plist +++ b/devel/qt6-5compat/pkg-plist @@ -60,6 +60,14 @@ lib/cmake/Qt6Core5Compat/Qt6Core5CompatTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6Core5Compat/Qt6Core5CompatTargets.cmake lib/cmake/Qt6Core5Compat/Qt6Core5CompatVersionlessAliasTargets.cmake lib/cmake/Qt6Core5Compat/Qt6Core5CompatVersionlessTargets.cmake +lib/cmake/Qt6Core5CompatPrivate/Qt6Core5CompatPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6Core5CompatPrivate/Qt6Core5CompatPrivateConfig.cmake +lib/cmake/Qt6Core5CompatPrivate/Qt6Core5CompatPrivateConfigVersion.cmake +lib/cmake/Qt6Core5CompatPrivate/Qt6Core5CompatPrivateConfigVersionImpl.cmake +lib/cmake/Qt6Core5CompatPrivate/Qt6Core5CompatPrivateDependencies.cmake +lib/cmake/Qt6Core5CompatPrivate/Qt6Core5CompatPrivateTargets.cmake +lib/cmake/Qt6Core5CompatPrivate/Qt6Core5CompatPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6Core5CompatPrivate/Qt6Core5CompatPrivateVersionlessTargets.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6qtgraphicaleffectspluginAdditionalTargetInfo.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6qtgraphicaleffectspluginConfig.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6qtgraphicaleffectspluginConfigVersion.cmake diff --git a/devel/qt6-base/Makefile b/devel/qt6-base/Makefile index e3ec93bddc7c..35177a19e371 100644 --- a/devel/qt6-base/Makefile +++ b/devel/qt6-base/Makefile @@ -1,6 +1,5 @@ PORTNAME= base DISTVERSION= ${QT6_VERSION} -PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt6- diff --git a/devel/qt6-base/distinfo b/devel/qt6-base/distinfo index e2f47ad60ff8..d84b41d310af 100644 --- a/devel/qt6-base/distinfo +++ b/devel/qt6-base/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1743028326 -SHA256 (KDE/Qt/6.8.3/qtbase-everywhere-src-6.8.3.tar.xz) = 56001b905601bb9023d399f3ba780d7fa940f3e4861e496a7c490331f49e0b80 -SIZE (KDE/Qt/6.8.3/qtbase-everywhere-src-6.8.3.tar.xz) = 48426536 +TIMESTAMP = 1743708069 +SHA256 (KDE/Qt/6.9.0/qtbase-everywhere-src-6.9.0.tar.xz) = c1800c2ea835801af04a05d4a32321d79a93954ee3ae2172bbeacf13d1f0598c +SIZE (KDE/Qt/6.9.0/qtbase-everywhere-src-6.9.0.tar.xz) = 49658320 diff --git a/devel/qt6-base/files/patch-cmake_QtPkgConfigHelpers.cmake b/devel/qt6-base/files/patch-cmake_QtPkgConfigHelpers.cmake index aaf8eb7bcb2d..d28657a45f25 100644 --- a/devel/qt6-base/files/patch-cmake_QtPkgConfigHelpers.cmake +++ b/devel/qt6-base/files/patch-cmake_QtPkgConfigHelpers.cmake @@ -1,6 +1,6 @@ ---- cmake/QtPkgConfigHelpers.cmake.orig 2023-09-21 19:24:26 UTC +--- cmake/QtPkgConfigHelpers.cmake.orig 2025-02-19 13:05:34 UTC +++ cmake/QtPkgConfigHelpers.cmake -@@ -159,6 +159,6 @@ function(qt_internal_generate_pkg_config_file module) +@@ -174,6 +174,6 @@ function(qt_internal_generate_pkg_config_file module) # This is inspired by https://gitlab.kitware.com/cmake/cmake/-/issues/20842 target_sources(${module} PRIVATE "${final_pc_path}") diff --git a/devel/qt6-base/files/patch-src_corelib_CMakeLists.txt b/devel/qt6-base/files/patch-src_corelib_CMakeLists.txt index febbf2386c27..32dfb0e5e986 100644 --- a/devel/qt6-base/files/patch-src_corelib_CMakeLists.txt +++ b/devel/qt6-base/files/patch-src_corelib_CMakeLists.txt @@ -1,6 +1,6 @@ ---- src/corelib/CMakeLists.txt.orig 2024-11-14 11:02:40 UTC +--- src/corelib/CMakeLists.txt.orig 2025-02-19 13:05:34 UTC +++ src/corelib/CMakeLists.txt -@@ -397,6 +397,10 @@ endif() +@@ -402,6 +402,10 @@ endif() target_link_libraries(Platform INTERFACE Threads::Threads) endif() diff --git a/devel/qt6-base/files/patch-src_corelib_global_qcomparehelpers.h b/devel/qt6-base/files/patch-src_corelib_global_qcomparehelpers.h index cad98022de4a..5d37ac721415 100644 --- a/devel/qt6-base/files/patch-src_corelib_global_qcomparehelpers.h +++ b/devel/qt6-base/files/patch-src_corelib_global_qcomparehelpers.h @@ -7,21 +7,21 @@ qcompare.h that upstream suppresses for GCC. /usr/local/include/qt6/QtCore/qcomparehelpers.h:211:43: note: expanded from macro 'QT_DECLARE_ORDERING_HELPER_TEMPLATE' 211 | { return compareThreeWay(lhs, rhs) >= 0; } ---- src/corelib/global/qcomparehelpers.h.orig 2024-11-12 10:55:11 UTC +--- src/corelib/global/qcomparehelpers.h.orig 2025-02-19 13:05:34 UTC +++ src/corelib/global/qcomparehelpers.h -@@ -242,6 +242,7 @@ template constexpr auto to_Qt(In in) noe +@@ -316,6 +316,7 @@ orderingFlagsFor(T t) noexcept #define QT_DECLARE_ORDERING_HELPER_TEMPLATE(OrderingType, LeftType, RightType, Constexpr, \ - Noexcept, Attributes) \ + Noexcept, ...) \ + QT_WARNING_DISABLE_CLANG("-Wzero-as-null-pointer-constant") \ - Attributes \ + __VA_ARGS__ \ friend Constexpr bool operator<(LeftType const &lhs, RightType const &rhs) Noexcept \ { \ -@@ -279,6 +280,7 @@ template constexpr auto to_Qt(In in) noe +@@ -357,6 +358,7 @@ orderingFlagsFor(T t) noexcept // Helpers for reversed ordering, using the existing compareThreeWay() function. #define QT_DECLARE_REVERSED_ORDERING_HELPER_TEMPLATE(OrderingType, LeftType, RightType, Constexpr, \ - Noexcept, Attributes) \ + Noexcept, ...) \ + QT_WARNING_DISABLE_CLANG("-Wzero-as-null-pointer-constant") \ - Attributes \ + __VA_ARGS__ \ friend Constexpr bool operator<(RightType const &lhs, LeftType const &rhs) Noexcept \ { return is_gt(compareThreeWay(rhs, lhs)); } \ diff --git a/devel/qt6-base/files/patch-src_corelib_global_qcompilerdetection.h b/devel/qt6-base/files/patch-src_corelib_global_qcompilerdetection.h index fe3f15c482e9..20a49f4a4800 100644 --- a/devel/qt6-base/files/patch-src_corelib_global_qcompilerdetection.h +++ b/devel/qt6-base/files/patch-src_corelib_global_qcompilerdetection.h @@ -5,9 +5,9 @@ error: use of the 'nodiscard' attribute is a C++20 extension https://github.com/llvm/llvm-project/issues/32865 ---- src/corelib/global/qcompilerdetection.h.orig 2024-11-14 11:02:40 UTC +--- src/corelib/global/qcompilerdetection.h.orig 2025-02-19 13:05:34 UTC +++ src/corelib/global/qcompilerdetection.h -@@ -959,7 +959,7 @@ +@@ -961,7 +961,7 @@ # define Q_REQUIRED_RESULT [[nodiscard]] #endif diff --git a/devel/qt6-base/files/patch-src_platformsupport_devicediscovery_qdevicediscovery__static.cpp b/devel/qt6-base/files/patch-src_platformsupport_devicediscovery_qdevicediscovery__static.cpp index 3d9fef9324c9..1ee06b28634b 100644 --- a/devel/qt6-base/files/patch-src_platformsupport_devicediscovery_qdevicediscovery__static.cpp +++ b/devel/qt6-base/files/patch-src_platformsupport_devicediscovery_qdevicediscovery__static.cpp @@ -1,13 +1,14 @@ ---- src/platformsupport/devicediscovery/qdevicediscovery_static.cpp.orig 2024-09-18 16:48:24 UTC +--- src/platformsupport/devicediscovery/qdevicediscovery_static.cpp.orig 2025-02-19 13:05:34 UTC +++ src/platformsupport/devicediscovery/qdevicediscovery_static.cpp -@@ -11,9 +11,7 @@ +@@ -11,11 +11,7 @@ #include #include -#ifdef Q_OS_FREEBSD -#include --#elif defined(Q_OS_VXWORKS) -+#if defined(Q_OS_VXWORKS) - #include - #define ABS_X EV_DEV_PTR_ABS_X - #else +-#else + #include +-#endif + #include + + /* android (and perhaps some other linux-derived stuff) don't define everything diff --git a/devel/qt6-base/files/patch-src_platformsupport_input_evdevkeyboard_qevdevkeyboard__defaultmap__p.h b/devel/qt6-base/files/patch-src_platformsupport_input_evdevkeyboard_qevdevkeyboard__defaultmap__p.h index 9758fa6d2577..54be3f5036af 100644 --- a/devel/qt6-base/files/patch-src_platformsupport_input_evdevkeyboard_qevdevkeyboard__defaultmap__p.h +++ b/devel/qt6-base/files/patch-src_platformsupport_input_evdevkeyboard_qevdevkeyboard__defaultmap__p.h @@ -1,13 +1,14 @@ ---- src/platformsupport/input/evdevkeyboard/qevdevkeyboard_defaultmap_p.h.orig 2024-09-18 16:48:24 UTC +--- src/platformsupport/input/evdevkeyboard/qevdevkeyboard_defaultmap_p.h.orig 2025-02-19 13:05:34 UTC +++ src/platformsupport/input/evdevkeyboard/qevdevkeyboard_defaultmap_p.h -@@ -17,9 +17,7 @@ +@@ -19,11 +19,7 @@ + #include - #include "qnamespace.h" #include "private/qglobal_p.h" -#ifdef Q_OS_FREEBSD -#include --#elif !defined(Q_OS_VXWORKS) -+#if !defined(Q_OS_VXWORKS) +-#else #include "linux/input.h" - #endif +-#endif + + // no QT_BEGIN_NAMESPACE, since we include it internally... diff --git a/devel/qt6-base/files/patch-src_platformsupport_input_evdevkeyboard_qevdevkeyboardhandler.cpp b/devel/qt6-base/files/patch-src_platformsupport_input_evdevkeyboard_qevdevkeyboardhandler.cpp index f6c12d7e0838..f3d5f982e63c 100644 --- a/devel/qt6-base/files/patch-src_platformsupport_input_evdevkeyboard_qevdevkeyboardhandler.cpp +++ b/devel/qt6-base/files/patch-src_platformsupport_input_evdevkeyboard_qevdevkeyboardhandler.cpp @@ -1,13 +1,14 @@ ---- src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp.orig 2024-09-18 16:48:24 UTC +--- src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp.orig 2025-02-19 13:05:34 UTC +++ src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp -@@ -17,9 +17,7 @@ +@@ -17,11 +17,7 @@ #include #include -#ifdef Q_OS_FREEBSD -#include --#elif defined(Q_OS_VXWORKS) -+#if defined(Q_OS_VXWORKS) - #include - #else +-#else #include +-#endif + + #ifndef input_event_sec + #define input_event_sec time.tv_sec diff --git a/devel/qt6-base/files/patch-src_platformsupport_input_evdevtablet_qevdevtablethandler.cpp b/devel/qt6-base/files/patch-src_platformsupport_input_evdevtablet_qevdevtablethandler.cpp index eab2816a23c0..2eac7348aecf 100644 --- a/devel/qt6-base/files/patch-src_platformsupport_input_evdevtablet_qevdevtablethandler.cpp +++ b/devel/qt6-base/files/patch-src_platformsupport_input_evdevtablet_qevdevtablethandler.cpp @@ -1,13 +1,14 @@ ---- src/platformsupport/input/evdevtablet/qevdevtablethandler.cpp.orig 2024-09-18 16:48:24 UTC +--- src/platformsupport/input/evdevtablet/qevdevtablethandler.cpp.orig 2025-02-19 13:05:34 UTC +++ src/platformsupport/input/evdevtablet/qevdevtablethandler.cpp -@@ -10,9 +10,7 @@ +@@ -10,11 +10,7 @@ #include #include #include -#ifdef Q_OS_FREEBSD -#include --#elif defined(Q_OS_VXWORKS) -+#if defined(Q_OS_VXWORKS) - #include - #include - #define SYN_REPORT 0 +-#else + #include +-#endif + + QT_BEGIN_NAMESPACE + diff --git a/devel/qt6-base/files/patch-src_platformsupport_input_evdevtouch_qevdevtouchhandler.cpp b/devel/qt6-base/files/patch-src_platformsupport_input_evdevtouch_qevdevtouchhandler.cpp index 0d76065f028a..9b553ea8f5c8 100644 --- a/devel/qt6-base/files/patch-src_platformsupport_input_evdevtouch_qevdevtouchhandler.cpp +++ b/devel/qt6-base/files/patch-src_platformsupport_input_evdevtouch_qevdevtouchhandler.cpp @@ -1,13 +1,14 @@ ---- src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp.orig 2024-09-18 16:48:24 UTC +--- src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp.orig 2025-02-19 13:05:34 UTC +++ src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp -@@ -19,9 +19,7 @@ +@@ -19,11 +19,7 @@ #include -#ifdef Q_OS_FREEBSD -#include --#elif defined(Q_OS_VXWORKS) -+#if defined(Q_OS_VXWORKS) - #include - #include - #define SYN_REPORT 0 +-#else + #include +-#endif + + #ifndef input_event_sec + #define input_event_sec time.tv_sec diff --git a/devel/qt6-base/files/patch-src_plugins_tls_openssl_qsslcontext__openssl.cpp b/devel/qt6-base/files/patch-src_plugins_tls_openssl_qsslcontext__openssl.cpp index 3f65f6206cf6..02dc9a1f8e2a 100644 --- a/devel/qt6-base/files/patch-src_plugins_tls_openssl_qsslcontext__openssl.cpp +++ b/devel/qt6-base/files/patch-src_plugins_tls_openssl_qsslcontext__openssl.cpp @@ -1,4 +1,4 @@ ---- src/plugins/tls/openssl/qsslcontext_openssl.cpp.orig 2023-09-15 10:20:51 UTC +--- src/plugins/tls/openssl/qsslcontext_openssl.cpp.orig 2025-02-19 13:05:34 UTC +++ src/plugins/tls/openssl/qsslcontext_openssl.cpp @@ -49,9 +49,9 @@ extern "C" int q_verify_cookie_callback(SSL *ssl, cons } @@ -49,7 +49,7 @@ QSharedPointer cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free); if (cctx) { q_SSL_CONF_CTX_set_ssl_ctx(cctx.data(), sslContext->ctx); -@@ -806,7 +809,9 @@ void QSslContext::applyBackendConfig(QSslContext *sslC +@@ -803,7 +806,9 @@ void QSslContext::applyBackendConfig(QSslContext *sslC sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_finish() failed")); sslContext->errorCode = QSslError::UnspecifiedError; } diff --git a/devel/qt6-base/files/patch-src_plugins_tls_openssl_qsslsocket__openssl__symbols.cpp b/devel/qt6-base/files/patch-src_plugins_tls_openssl_qsslsocket__openssl__symbols.cpp index b8f5dfd475da..23d57861e45e 100644 --- a/devel/qt6-base/files/patch-src_plugins_tls_openssl_qsslsocket__openssl__symbols.cpp +++ b/devel/qt6-base/files/patch-src_plugins_tls_openssl_qsslsocket__openssl__symbols.cpp @@ -1,6 +1,6 @@ ---- src/plugins/tls/openssl/qsslsocket_openssl_symbols.cpp.orig 2024-03-19 15:46:43 UTC +--- src/plugins/tls/openssl/qsslsocket_openssl_symbols.cpp.orig 2025-02-19 13:05:34 UTC +++ src/plugins/tls/openssl/qsslsocket_openssl_symbols.cpp -@@ -112,23 +112,36 @@ DEFINEFUNC(int, EVP_PKEY_up_ref, EVP_PKEY *a, a, retur +@@ -113,23 +113,36 @@ DEFINEFUNC(int, EVP_PKEY_up_ref, EVP_PKEY *a, a, retur DEFINEFUNC2(int, BN_is_word, BIGNUM *a, a, BN_ULONG w, w, return 0, return) DEFINEFUNC(int, EVP_CIPHER_CTX_reset, EVP_CIPHER_CTX *c, c, return 0, return) DEFINEFUNC(int, EVP_PKEY_up_ref, EVP_PKEY *a, a, return 0, return) @@ -37,7 +37,7 @@ #ifdef TLS1_3_VERSION DEFINEFUNC2(int, SSL_CTX_set_ciphersuites, SSL_CTX *ctx, ctx, const char *str, str, return 0, return) DEFINEFUNC2(void, SSL_set_psk_use_session_callback, SSL *ssl, ssl, q_SSL_psk_use_session_cb_func_t callback, callback, return, DUMMYARG) -@@ -193,7 +206,9 @@ DEFINEFUNC2(OCSP_RESPONSE *, OCSP_response_create, int +@@ -194,7 +207,9 @@ DEFINEFUNC2(OCSP_RESPONSE *, OCSP_response_create, int ASN1_OCTET_STRING **piKeyHash, piKeyHash, ASN1_INTEGER **pserial, pserial, OCSP_CERTID *cid, cid, return 0, return) DEFINEFUNC2(OCSP_RESPONSE *, OCSP_response_create, int status, status, OCSP_BASICRESP *bs, bs, return nullptr, return) @@ -47,7 +47,7 @@ DEFINEFUNC2(int, OCSP_id_cmp, OCSP_CERTID *a, a, OCSP_CERTID *b, b, return -1, return) DEFINEFUNC7(OCSP_SINGLERESP *, OCSP_basic_add1_status, OCSP_BASICRESP *r, r, OCSP_CERTID *c, c, int s, s, int re, re, ASN1_TIME *rt, rt, ASN1_TIME *t, t, ASN1_TIME *n, n, return nullptr, return) -@@ -214,7 +229,9 @@ DEFINEFUNC2(int, ASN1_STRING_to_UTF8, unsigned char ** +@@ -215,7 +230,9 @@ DEFINEFUNC2(int, ASN1_STRING_to_UTF8, unsigned char ** DEFINEFUNC2(int, ASN1_INTEGER_cmp, const ASN1_INTEGER *a, a, const ASN1_INTEGER *b, b, return 1, return) DEFINEFUNC(int, ASN1_STRING_length, ASN1_STRING *a, a, return 0, return) DEFINEFUNC2(int, ASN1_STRING_to_UTF8, unsigned char **a, a, ASN1_STRING *b, b, return 0, return) @@ -57,7 +57,7 @@ DEFINEFUNC4(long, BIO_ctrl, BIO *a, a, int b, b, long c, c, void *d, d, return -1, return) DEFINEFUNC(int, BIO_free, BIO *a, a, return 0, return) DEFINEFUNC2(BIO *, BIO_new_mem_buf, void *a, a, int b, b, return nullptr, return) -@@ -289,12 +306,14 @@ DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const +@@ -290,12 +307,14 @@ DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a, EVP_PKEY *b, b, return -1, return) DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return) DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return nullptr, return) @@ -72,7 +72,7 @@ DEFINEFUNC(void, SSL_free, SSL *a, a, return, DUMMYARG) DEFINEFUNC(STACK_OF(SSL_CIPHER) *, SSL_get_ciphers, const SSL *a, a, return nullptr, return) DEFINEFUNC(const SSL_CIPHER *, SSL_get_current_cipher, SSL *a, a, return nullptr, return) -@@ -761,8 +780,8 @@ static LoadedOpenSsl loadOpenSsl() +@@ -764,8 +783,8 @@ static LoadedOpenSsl loadOpenSsl() libcrypto->setFileNameAndVersion("crypto"_L1, shlibVersion); #elif defined(SHLIB_VERSION_NUMBER) // first attempt: the canonical name is libssl.so. @@ -83,7 +83,7 @@ #endif // OPENSSL_SHLIB_VERSION if (libcrypto->load() && libssl->load()) { -@@ -795,8 +814,8 @@ static LoadedOpenSsl loadOpenSsl() +@@ -798,8 +817,8 @@ static LoadedOpenSsl loadOpenSsl() libssl->setFileNameAndVersion("ssl"_L1 + suffix, -1); libcrypto->setFileNameAndVersion("crypto"_L1 + suffix, -1); # else @@ -94,7 +94,7 @@ # endif if (libcrypto->load() && libssl->load()) { // libssl.so.0 and libcrypto.so.0 found -@@ -865,21 +884,34 @@ bool q_resolveOpenSslSymbols() +@@ -868,21 +887,34 @@ bool q_resolveOpenSslSymbols() RESOLVEFUNC(EVP_CIPHER_CTX_reset) RESOLVEFUNC(AUTHORITY_INFO_ACCESS_free) RESOLVEFUNC(EVP_PKEY_up_ref) @@ -129,7 +129,7 @@ #ifdef TLS1_3_VERSION RESOLVEFUNC(SSL_CTX_set_ciphersuites) RESOLVEFUNC(SSL_set_psk_use_session_callback) -@@ -961,7 +993,9 @@ bool q_resolveOpenSslSymbols() +@@ -964,7 +996,9 @@ bool q_resolveOpenSslSymbols() RESOLVEFUNC(OCSP_check_validity) RESOLVEFUNC(OCSP_cert_to_id) RESOLVEFUNC(OCSP_id_get0_info) @@ -140,7 +140,7 @@ RESOLVEFUNC(OCSP_basic_sign) RESOLVEFUNC(OCSP_response_create) RESOLVEFUNC(i2d_OCSP_RESPONSE) -@@ -1056,12 +1090,14 @@ bool q_resolveOpenSslSymbols() +@@ -1059,12 +1093,14 @@ bool q_resolveOpenSslSymbols() RESOLVEFUNC(SSL_CTX_use_PrivateKey) RESOLVEFUNC(SSL_CTX_use_PrivateKey_file) RESOLVEFUNC(SSL_CTX_get_cert_store); @@ -155,7 +155,7 @@ RESOLVEFUNC(SSL_accept) RESOLVEFUNC(SSL_clear) RESOLVEFUNC(SSL_connect) -@@ -1121,7 +1157,9 @@ bool q_resolveOpenSslSymbols() +@@ -1124,7 +1160,9 @@ bool q_resolveOpenSslSymbols() RESOLVEFUNC(RSA_free) RESOLVEFUNC(DH_bits) diff --git a/devel/qt6-base/pkg-plist b/devel/qt6-base/pkg-plist index dc65f9357fea..a0e29441f4e7 100644 --- a/devel/qt6-base/pkg-plist +++ b/devel/qt6-base/pkg-plist @@ -77,7 +77,6 @@ bin/qmake6 %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfuturewatcher_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qglobal_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qgregoriancalendar_p.h -%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qhijricalendar_data_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qhijricalendar_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qhooks_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qidentityproxymodel_p.h @@ -86,7 +85,6 @@ bin/qmake6 %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qislamiccivilcalendar_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qitemselectionmodel_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qiterable_p.h -%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qjalalicalendar_data_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qjalalicalendar_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qjson_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qjsonparser_p.h @@ -94,7 +92,6 @@ bin/qmake6 %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qjuliancalendar_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qlibrary_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qlibraryinfo_p.h -%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qlocale_data_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qlocale_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qlocale_tools_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qlocaltime_p.h @@ -137,7 +134,6 @@ bin/qmake6 %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qresource_iterator_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qresource_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qringbuffer_p.h -%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qromancalendar_data_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qromancalendar_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qsavefile_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qsequentialanimationgroup_p.h @@ -147,7 +143,6 @@ bin/qmake6 %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qsimd_x86_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qsingleshottimer_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qsmallbytearray_p.h -%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qspan_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qstorageinfo_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qstringalgorithms_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qstringconverter_p.h @@ -155,6 +150,7 @@ bin/qmake6 %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qsystemerror_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qsystemsemaphore_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qtcore-config_p.h +%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qtcoreglobal_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qtemporaryfile_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qtenvironmentvariables_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qtextstream_p.h @@ -163,7 +159,6 @@ bin/qmake6 %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qtimer_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qtimerinfo_unix_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qtimezonelocale_p.h -%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qtimezoneprivate_data_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qtimezoneprivate_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qtipccommon_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qtools_p.h @@ -175,6 +170,7 @@ bin/qmake6 %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/quniquehandle_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/quniquehandle_types_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qurl_p.h +%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/quuid_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qvariant_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qvariantanimation_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qvolatile_p.h @@ -185,6 +181,7 @@ bin/qmake6 %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qxmlutils_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qzipreader_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qzipwriter_p.h +%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/wcharhelpers_win_p.h %%QT_INCDIR%%/QtCore/QAbstractAnimation %%QT_INCDIR%%/QtCore/QAbstractEventDispatcher %%QT_INCDIR%%/QtCore/QAbstractEventDispatcherV2 @@ -570,6 +567,7 @@ bin/qmake6 %%QT_INCDIR%%/QtCore/QtContainerFwd %%QT_INCDIR%%/QtCore/QtCore %%QT_INCDIR%%/QtCore/QtCoreDepends +%%QT_INCDIR%%/QtCore/QtCoreGlobal %%QT_INCDIR%%/QtCore/QtCoreVersion %%QT_INCDIR%%/QtCore/QtDarwinHelpers %%QT_INCDIR%%/QtCore/QtDebug @@ -599,6 +597,7 @@ bin/qmake6 %%QT_INCDIR%%/QtCore/QtTypes %%QT_INCDIR%%/QtCore/QtVersion %%QT_INCDIR%%/QtCore/QtVersionChecks +%%QT_INCDIR%%/QtCore/q17memory.h %%QT_INCDIR%%/QtCore/q20algorithm.h %%QT_INCDIR%%/QtCore/q20chrono.h %%QT_INCDIR%%/QtCore/q20functional.h @@ -609,6 +608,7 @@ bin/qmake6 %%QT_INCDIR%%/QtCore/q20utility.h %%QT_INCDIR%%/QtCore/q20vector.h %%QT_INCDIR%%/QtCore/q23functional.h +%%QT_INCDIR%%/QtCore/q23type_traits.h %%QT_INCDIR%%/QtCore/q23utility.h %%QT_INCDIR%%/QtCore/q26numeric.h %%QT_INCDIR%%/QtCore/qabstractanimation.h @@ -711,6 +711,7 @@ bin/qmake6 %%QT_INCDIR%%/QtCore/qjsonarray.h %%QT_INCDIR%%/QtCore/qjsondocument.h %%QT_INCDIR%%/QtCore/qjsonobject.h +%%QT_INCDIR%%/QtCore/qjsonparseerror.h %%QT_INCDIR%%/QtCore/qjsonvalue.h %%QT_INCDIR%%/QtCore/qlatin1stringmatcher.h %%QT_INCDIR%%/QtCore/qlatin1stringview.h @@ -815,6 +816,7 @@ bin/qmake6 %%QT_INCDIR%%/QtCore/qtconfigmacros.h %%QT_INCDIR%%/QtCore/qtcore-config.h %%QT_INCDIR%%/QtCore/qtcoreexports.h +%%QT_INCDIR%%/QtCore/qtcoreglobal.h %%QT_INCDIR%%/QtCore/qtcoreversion.h %%QT_INCDIR%%/QtCore/qtdeprecationdefinitions.h %%QT_INCDIR%%/QtCore/qtdeprecationmarkers.h @@ -824,6 +826,7 @@ bin/qmake6 %%QT_INCDIR%%/QtCore/qtestsupport_core.h %%QT_INCDIR%%/QtCore/qtextboundaryfinder.h %%QT_INCDIR%%/QtCore/qtextstream.h +%%QT_INCDIR%%/QtCore/qtformat_impl.h %%QT_INCDIR%%/QtCore/qthread.h %%QT_INCDIR%%/QtCore/qthreadpool.h %%QT_INCDIR%%/QtCore/qthreadstorage.h @@ -832,6 +835,7 @@ bin/qmake6 %%QT_INCDIR%%/QtCore/qtimezone.h %%QT_INCDIR%%/QtCore/qtipccommon.h %%QT_INCDIR%%/QtCore/qtmetamacros.h +%%QT_INCDIR%%/QtCore/qtmocconstants.h %%QT_INCDIR%%/QtCore/qtmochelpers.h %%QT_INCDIR%%/QtCore/qtnoop.h %%QT_INCDIR%%/QtCore/qtpreprocessorsupport.h @@ -991,6 +995,7 @@ bin/qmake6 %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qcolortransform_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qcolortrc_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qcolortrclut_p.h +%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qcolrpaintgraphrenderer_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qcosmeticstroker_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qcssparser_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qcssutil_p.h @@ -1004,11 +1009,14 @@ bin/qmake6 %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qdbusplatformmenu_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qdbustrayicon_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qdbustraytypes_p.h +%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qdesktopunixservices_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qdistancefield_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qdnd_p.h +%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qdrawhelper_loongarch64_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qdrawhelper_neon_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qdrawhelper_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qdrawhelper_x86_p.h +%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qdrawingprimitive_lsx_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qdrawingprimitive_sse2_p.h %%X11%%%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qedidparser_p.h %%X11%%%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qedidvendortable_p.h @@ -1030,12 +1038,12 @@ bin/qmake6 %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qfontengine_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qfontengineglyphcache_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qfontenginemultifontconfig_p.h +%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qfonticonengine_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qfontsubset_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qfragmentmap_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qfreetypefontdatabase_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qgenericunixeventdispatcher_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qgenericunixfontdatabase_p.h -%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qgenericunixservices_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qgenericunixthemes_p.h %%X11%%%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qglxconvenience_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qglyphrun_p.h @@ -1266,6 +1274,7 @@ bin/qmake6 %%QT_INCDIR%%/QtGui/QFontInfo %%QT_INCDIR%%/QtGui/QFontMetrics %%QT_INCDIR%%/QtGui/QFontMetricsF +%%QT_INCDIR%%/QtGui/QFontVariableAxis %%QT_INCDIR%%/QtGui/QGenericMatrix %%QT_INCDIR%%/QtGui/QGenericPlugin %%QT_INCDIR%%/QtGui/QGenericPluginFactory @@ -1328,6 +1337,7 @@ bin/qmake6 %%QT_INCDIR%%/QtGui/QPainter %%QT_INCDIR%%/QtGui/QPainterPath %%QT_INCDIR%%/QtGui/QPainterPathStroker +%%QT_INCDIR%%/QtGui/QPainterStateGuard %%QT_INCDIR%%/QtGui/QPalette %%QT_INCDIR%%/QtGui/QPdfOutputIntent %%QT_INCDIR%%/QtGui/QPdfWriter @@ -1461,6 +1471,7 @@ bin/qmake6 %%QT_INCDIR%%/QtGui/qfontdatabase.h %%QT_INCDIR%%/QtGui/qfontinfo.h %%QT_INCDIR%%/QtGui/qfontmetrics.h +%%QT_INCDIR%%/QtGui/qfontvariableaxis.h %%QT_INCDIR%%/QtGui/qgenericmatrix.h %%QT_INCDIR%%/QtGui/qgenericplugin.h %%QT_INCDIR%%/QtGui/qgenericpluginfactory.h @@ -1496,6 +1507,7 @@ bin/qmake6 %%QT_INCDIR%%/QtGui/qpaintengine.h %%QT_INCDIR%%/QtGui/qpainter.h %%QT_INCDIR%%/QtGui/qpainterpath.h +%%QT_INCDIR%%/QtGui/qpainterstateguard.h %%QT_INCDIR%%/QtGui/qpalette.h %%QT_INCDIR%%/QtGui/qpdfoutputintent.h %%QT_INCDIR%%/QtGui/qpdfwriter.h @@ -1560,15 +1572,18 @@ bin/qmake6 %%QT_INCDIR%%/QtInputSupport/%%FULLVER%%/QtInputSupport/private/qevdevmousemanager_p.h %%QT_INCDIR%%/QtInputSupport/%%FULLVER%%/QtInputSupport/private/qevdevtablethandler_p.h %%QT_INCDIR%%/QtInputSupport/%%FULLVER%%/QtInputSupport/private/qevdevtabletmanager_p.h -%%QT_INCDIR%%/QtInputSupport/%%FULLVER%%/QtInputSupport/private/qevdevtouchfilter_p.h %%QT_INCDIR%%/QtInputSupport/%%FULLVER%%/QtInputSupport/private/qevdevtouchhandler_p.h %%QT_INCDIR%%/QtInputSupport/%%FULLVER%%/QtInputSupport/private/qevdevtouchmanager_p.h %%QT_INCDIR%%/QtInputSupport/%%FULLVER%%/QtInputSupport/private/qevdevutil_p.h +%%QT_INCDIR%%/QtInputSupport/%%FULLVER%%/QtInputSupport/private/qfdcontainer_p.h +%%QT_INCDIR%%/QtInputSupport/%%FULLVER%%/QtInputSupport/private/qkeyboardmap_p.h +%%QT_INCDIR%%/QtInputSupport/%%FULLVER%%/QtInputSupport/private/qkeycodeaction_p.h %%QT_INCDIR%%/QtInputSupport/%%FULLVER%%/QtInputSupport/private/qlibinputhandler_p.h %%QT_INCDIR%%/QtInputSupport/%%FULLVER%%/QtInputSupport/private/qlibinputkeyboard_p.h %%QT_INCDIR%%/QtInputSupport/%%FULLVER%%/QtInputSupport/private/qlibinputpointer_p.h %%QT_INCDIR%%/QtInputSupport/%%FULLVER%%/QtInputSupport/private/qlibinputtouch_p.h %%QT_INCDIR%%/QtInputSupport/%%FULLVER%%/QtInputSupport/private/qoutputmapping_p.h +%%QT_INCDIR%%/QtInputSupport/%%FULLVER%%/QtInputSupport/private/qtouchfilter_p.h %%QT_INCDIR%%/QtInputSupport/QtInputSupport %%QT_INCDIR%%/QtInputSupport/QtInputSupportDepends %%QT_INCDIR%%/QtInputSupport/QtInputSupportVersion @@ -2652,6 +2667,7 @@ lib/cmake/Qt6/QtJavaHelpers.cmake lib/cmake/Qt6/QtLalrHelpers.cmake lib/cmake/Qt6/QtMkspecHelpers.cmake lib/cmake/Qt6/QtModuleConfig.cmake.in +lib/cmake/Qt6/QtModuleConfigPrivate.cmake.in lib/cmake/Qt6/QtModuleDependencies.cmake.in lib/cmake/Qt6/QtModuleHeadersCheck.cmake lib/cmake/Qt6/QtModuleHelpers.cmake @@ -2674,6 +2690,7 @@ lib/cmake/Qt6/QtPriHelpers.cmake lib/cmake/Qt6/QtPrlHelpers.cmake lib/cmake/Qt6/QtProcessConfigureArgs.cmake lib/cmake/Qt6/QtProperties.cmake +lib/cmake/Qt6/QtPublicAndroidHelpers.cmake lib/cmake/Qt6/QtPublicAppleHelpers.cmake lib/cmake/Qt6/QtPublicCMakeHelpers.cmake lib/cmake/Qt6/QtPublicCMakeVersionHelpers.cmake @@ -2683,6 +2700,7 @@ lib/cmake/Qt6/QtPublicFinalizerHelpers.cmake lib/cmake/Qt6/QtPublicFindPackageHelpers.cmake lib/cmake/Qt6/QtPublicGitHelpers.cmake lib/cmake/Qt6/QtPublicPluginHelpers.cmake +lib/cmake/Qt6/QtPublicPluginHelpers_v2.cmake lib/cmake/Qt6/QtPublicSbomAttributionHelpers.cmake lib/cmake/Qt6/QtPublicSbomCpeHelpers.cmake lib/cmake/Qt6/QtPublicSbomDepHelpers.cmake @@ -2700,6 +2718,7 @@ lib/cmake/Qt6/QtPublicTestHelpers.cmake lib/cmake/Qt6/QtPublicToolHelpers.cmake lib/cmake/Qt6/QtPublicWalkLibsHelpers.cmake lib/cmake/Qt6/QtPublicWasmToolchainHelpers.cmake +lib/cmake/Qt6/QtPublicWindowsHelpers.cmake lib/cmake/Qt6/QtQmakeHelpers.cmake lib/cmake/Qt6/QtResourceHelpers.cmake lib/cmake/Qt6/QtRpathHelpers.cmake @@ -2741,6 +2760,8 @@ lib/cmake/Qt6/platforms/FindPlatformGraphics.cmake lib/cmake/Qt6/platforms/FindVxWorksPlatformGraphics.cmake lib/cmake/Qt6/platforms/Platform/Integrity.cmake lib/cmake/Qt6/qbatchedtestrunner.in.cpp +lib/cmake/Qt6/qt-internal-config.redo.bat.in +lib/cmake/Qt6/qt-internal-config.redo.in lib/cmake/Qt6/qt.toolchain.cmake lib/cmake/Qt6BuildInternals/Qt6BuildInternalsConfig.cmake lib/cmake/Qt6BuildInternals/Qt6BuildInternalsConfigVersion.cmake @@ -2758,6 +2779,14 @@ lib/cmake/Qt6Concurrent/Qt6ConcurrentTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6Concurrent/Qt6ConcurrentTargets.cmake lib/cmake/Qt6Concurrent/Qt6ConcurrentVersionlessAliasTargets.cmake lib/cmake/Qt6Concurrent/Qt6ConcurrentVersionlessTargets.cmake +lib/cmake/Qt6ConcurrentPrivate/Qt6ConcurrentPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6ConcurrentPrivate/Qt6ConcurrentPrivateConfig.cmake +lib/cmake/Qt6ConcurrentPrivate/Qt6ConcurrentPrivateConfigVersion.cmake +lib/cmake/Qt6ConcurrentPrivate/Qt6ConcurrentPrivateConfigVersionImpl.cmake +lib/cmake/Qt6ConcurrentPrivate/Qt6ConcurrentPrivateDependencies.cmake +lib/cmake/Qt6ConcurrentPrivate/Qt6ConcurrentPrivateTargets.cmake +lib/cmake/Qt6ConcurrentPrivate/Qt6ConcurrentPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6ConcurrentPrivate/Qt6ConcurrentPrivateVersionlessTargets.cmake lib/cmake/Qt6Core/Qt6CTestMacros.cmake lib/cmake/Qt6Core/Qt6CoreAdditionalTargetInfo.cmake lib/cmake/Qt6Core/Qt6CoreConfig.cmake @@ -2773,6 +2802,14 @@ lib/cmake/Qt6Core/Qt6CoreTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6Core/Qt6CoreTargets.cmake lib/cmake/Qt6Core/Qt6CoreVersionlessAliasTargets.cmake lib/cmake/Qt6Core/Qt6CoreVersionlessTargets.cmake +lib/cmake/Qt6CorePrivate/Qt6CorePrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6CorePrivate/Qt6CorePrivateConfig.cmake +lib/cmake/Qt6CorePrivate/Qt6CorePrivateConfigVersion.cmake +lib/cmake/Qt6CorePrivate/Qt6CorePrivateConfigVersionImpl.cmake +lib/cmake/Qt6CorePrivate/Qt6CorePrivateDependencies.cmake +lib/cmake/Qt6CorePrivate/Qt6CorePrivateTargets.cmake +lib/cmake/Qt6CorePrivate/Qt6CorePrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6CorePrivate/Qt6CorePrivateVersionlessTargets.cmake lib/cmake/Qt6CoreTools/Qt6CoreToolsAdditionalTargetInfo.cmake lib/cmake/Qt6CoreTools/Qt6CoreToolsConfig.cmake lib/cmake/Qt6CoreTools/Qt6CoreToolsConfigVersion.cmake @@ -2791,6 +2828,14 @@ lib/cmake/Qt6DBus/Qt6DBusTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6DBus/Qt6DBusTargets.cmake lib/cmake/Qt6DBus/Qt6DBusVersionlessAliasTargets.cmake lib/cmake/Qt6DBus/Qt6DBusVersionlessTargets.cmake +lib/cmake/Qt6DBusPrivate/Qt6DBusPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6DBusPrivate/Qt6DBusPrivateConfig.cmake +lib/cmake/Qt6DBusPrivate/Qt6DBusPrivateConfigVersion.cmake +lib/cmake/Qt6DBusPrivate/Qt6DBusPrivateConfigVersionImpl.cmake +lib/cmake/Qt6DBusPrivate/Qt6DBusPrivateDependencies.cmake +lib/cmake/Qt6DBusPrivate/Qt6DBusPrivateTargets.cmake +lib/cmake/Qt6DBusPrivate/Qt6DBusPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6DBusPrivate/Qt6DBusPrivateVersionlessTargets.cmake lib/cmake/Qt6DBusTools/Qt6DBusToolsAdditionalTargetInfo.cmake lib/cmake/Qt6DBusTools/Qt6DBusToolsConfig.cmake lib/cmake/Qt6DBusTools/Qt6DBusToolsConfigVersion.cmake @@ -2964,6 +3009,14 @@ lib/cmake/Qt6Gui/Qt6QXdgDesktopPortalThemePluginConfigVersion.cmake lib/cmake/Qt6Gui/Qt6QXdgDesktopPortalThemePluginConfigVersionImpl.cmake lib/cmake/Qt6Gui/Qt6QXdgDesktopPortalThemePluginTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6Gui/Qt6QXdgDesktopPortalThemePluginTargets.cmake +lib/cmake/Qt6GuiPrivate/Qt6GuiPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6GuiPrivate/Qt6GuiPrivateConfig.cmake +lib/cmake/Qt6GuiPrivate/Qt6GuiPrivateConfigVersion.cmake +lib/cmake/Qt6GuiPrivate/Qt6GuiPrivateConfigVersionImpl.cmake +lib/cmake/Qt6GuiPrivate/Qt6GuiPrivateDependencies.cmake +lib/cmake/Qt6GuiPrivate/Qt6GuiPrivateTargets.cmake +lib/cmake/Qt6GuiPrivate/Qt6GuiPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6GuiPrivate/Qt6GuiPrivateVersionlessTargets.cmake lib/cmake/Qt6GuiTools/Qt6GuiToolsAdditionalTargetInfo.cmake lib/cmake/Qt6GuiTools/Qt6GuiToolsConfig.cmake lib/cmake/Qt6GuiTools/Qt6GuiToolsConfigVersion.cmake @@ -3019,6 +3072,14 @@ lib/cmake/Qt6Network/Qt6QTlsBackendOpenSSLPluginConfigVersion.cmake lib/cmake/Qt6Network/Qt6QTlsBackendOpenSSLPluginConfigVersionImpl.cmake lib/cmake/Qt6Network/Qt6QTlsBackendOpenSSLPluginTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6Network/Qt6QTlsBackendOpenSSLPluginTargets.cmake +lib/cmake/Qt6NetworkPrivate/Qt6NetworkPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6NetworkPrivate/Qt6NetworkPrivateConfig.cmake +lib/cmake/Qt6NetworkPrivate/Qt6NetworkPrivateConfigVersion.cmake +lib/cmake/Qt6NetworkPrivate/Qt6NetworkPrivateConfigVersionImpl.cmake +lib/cmake/Qt6NetworkPrivate/Qt6NetworkPrivateDependencies.cmake +lib/cmake/Qt6NetworkPrivate/Qt6NetworkPrivateTargets.cmake +lib/cmake/Qt6NetworkPrivate/Qt6NetworkPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6NetworkPrivate/Qt6NetworkPrivateVersionlessTargets.cmake lib/cmake/Qt6OpenGL/Qt6OpenGLAdditionalTargetInfo.cmake lib/cmake/Qt6OpenGL/Qt6OpenGLConfig.cmake lib/cmake/Qt6OpenGL/Qt6OpenGLConfigVersion.cmake @@ -3028,6 +3089,14 @@ lib/cmake/Qt6OpenGL/Qt6OpenGLTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6OpenGL/Qt6OpenGLTargets.cmake lib/cmake/Qt6OpenGL/Qt6OpenGLVersionlessAliasTargets.cmake lib/cmake/Qt6OpenGL/Qt6OpenGLVersionlessTargets.cmake +lib/cmake/Qt6OpenGLPrivate/Qt6OpenGLPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6OpenGLPrivate/Qt6OpenGLPrivateConfig.cmake +lib/cmake/Qt6OpenGLPrivate/Qt6OpenGLPrivateConfigVersion.cmake +lib/cmake/Qt6OpenGLPrivate/Qt6OpenGLPrivateConfigVersionImpl.cmake +lib/cmake/Qt6OpenGLPrivate/Qt6OpenGLPrivateDependencies.cmake +lib/cmake/Qt6OpenGLPrivate/Qt6OpenGLPrivateTargets.cmake +lib/cmake/Qt6OpenGLPrivate/Qt6OpenGLPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6OpenGLPrivate/Qt6OpenGLPrivateVersionlessTargets.cmake lib/cmake/Qt6OpenGLWidgets/Qt6OpenGLWidgetsAdditionalTargetInfo.cmake lib/cmake/Qt6OpenGLWidgets/Qt6OpenGLWidgetsConfig.cmake lib/cmake/Qt6OpenGLWidgets/Qt6OpenGLWidgetsConfigVersion.cmake @@ -3037,6 +3106,14 @@ lib/cmake/Qt6OpenGLWidgets/Qt6OpenGLWidgetsTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6OpenGLWidgets/Qt6OpenGLWidgetsTargets.cmake lib/cmake/Qt6OpenGLWidgets/Qt6OpenGLWidgetsVersionlessAliasTargets.cmake lib/cmake/Qt6OpenGLWidgets/Qt6OpenGLWidgetsVersionlessTargets.cmake +lib/cmake/Qt6OpenGLWidgetsPrivate/Qt6OpenGLWidgetsPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6OpenGLWidgetsPrivate/Qt6OpenGLWidgetsPrivateConfig.cmake +lib/cmake/Qt6OpenGLWidgetsPrivate/Qt6OpenGLWidgetsPrivateConfigVersion.cmake +lib/cmake/Qt6OpenGLWidgetsPrivate/Qt6OpenGLWidgetsPrivateConfigVersionImpl.cmake +lib/cmake/Qt6OpenGLWidgetsPrivate/Qt6OpenGLWidgetsPrivateDependencies.cmake +lib/cmake/Qt6OpenGLWidgetsPrivate/Qt6OpenGLWidgetsPrivateTargets.cmake +lib/cmake/Qt6OpenGLWidgetsPrivate/Qt6OpenGLWidgetsPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6OpenGLWidgetsPrivate/Qt6OpenGLWidgetsPrivateVersionlessTargets.cmake lib/cmake/Qt6PrintSupport/Qt6PrintSupportAdditionalTargetInfo.cmake lib/cmake/Qt6PrintSupport/Qt6PrintSupportConfig.cmake lib/cmake/Qt6PrintSupport/Qt6PrintSupportConfigVersion.cmake @@ -3053,6 +3130,14 @@ lib/cmake/Qt6PrintSupport/Qt6PrintSupportVersionlessTargets.cmake %%CUPS%%lib/cmake/Qt6PrintSupport/Qt6QCupsPrinterSupportPluginConfigVersionImpl.cmake %%CUPS%%lib/cmake/Qt6PrintSupport/Qt6QCupsPrinterSupportPluginTargets-%%CMAKE_BUILD_TYPE%%.cmake %%CUPS%%lib/cmake/Qt6PrintSupport/Qt6QCupsPrinterSupportPluginTargets.cmake +lib/cmake/Qt6PrintSupportPrivate/Qt6PrintSupportPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6PrintSupportPrivate/Qt6PrintSupportPrivateConfig.cmake +lib/cmake/Qt6PrintSupportPrivate/Qt6PrintSupportPrivateConfigVersion.cmake +lib/cmake/Qt6PrintSupportPrivate/Qt6PrintSupportPrivateConfigVersionImpl.cmake +lib/cmake/Qt6PrintSupportPrivate/Qt6PrintSupportPrivateDependencies.cmake +lib/cmake/Qt6PrintSupportPrivate/Qt6PrintSupportPrivateTargets.cmake +lib/cmake/Qt6PrintSupportPrivate/Qt6PrintSupportPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6PrintSupportPrivate/Qt6PrintSupportPrivateVersionlessTargets.cmake lib/cmake/Qt6Sql/Qt6SqlAdditionalTargetInfo.cmake lib/cmake/Qt6Sql/Qt6SqlConfig.cmake lib/cmake/Qt6Sql/Qt6SqlConfigVersion.cmake @@ -3063,6 +3148,14 @@ lib/cmake/Qt6Sql/Qt6SqlTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6Sql/Qt6SqlTargets.cmake lib/cmake/Qt6Sql/Qt6SqlVersionlessAliasTargets.cmake lib/cmake/Qt6Sql/Qt6SqlVersionlessTargets.cmake +lib/cmake/Qt6SqlPrivate/Qt6SqlPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6SqlPrivate/Qt6SqlPrivateConfig.cmake +lib/cmake/Qt6SqlPrivate/Qt6SqlPrivateConfigVersion.cmake +lib/cmake/Qt6SqlPrivate/Qt6SqlPrivateConfigVersionImpl.cmake +lib/cmake/Qt6SqlPrivate/Qt6SqlPrivateDependencies.cmake +lib/cmake/Qt6SqlPrivate/Qt6SqlPrivateTargets.cmake +lib/cmake/Qt6SqlPrivate/Qt6SqlPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6SqlPrivate/Qt6SqlPrivateVersionlessTargets.cmake lib/cmake/Qt6Test/Qt6TestAdditionalTargetInfo.cmake lib/cmake/Qt6Test/Qt6TestConfig.cmake lib/cmake/Qt6Test/Qt6TestConfigVersion.cmake @@ -3072,6 +3165,7 @@ lib/cmake/Qt6Test/Qt6TestTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6Test/Qt6TestTargets.cmake lib/cmake/Qt6Test/Qt6TestVersionlessAliasTargets.cmake lib/cmake/Qt6Test/Qt6TestVersionlessTargets.cmake +lib/cmake/Qt6Test/QtTestProperties.cmake lib/cmake/Qt6TestInternalsPrivate/3rdparty/cmake/QtRunCMakeTestHelpers.cmake lib/cmake/Qt6TestInternalsPrivate/3rdparty/cmake/RunCMake.cmake lib/cmake/Qt6TestInternalsPrivate/Qt6TestInternalsPrivateConfig.cmake @@ -3080,6 +3174,14 @@ lib/cmake/Qt6TestInternalsPrivate/Qt6TestInternalsPrivateConfigVersionImpl.cmake lib/cmake/Qt6TestInternalsPrivate/Qt6TestInternalsPrivateTargets.cmake lib/cmake/Qt6TestInternalsPrivate/Qt6TestInternalsPrivateVersionlessAliasTargets.cmake lib/cmake/Qt6TestInternalsPrivate/Qt6TestInternalsPrivateVersionlessTargets.cmake +lib/cmake/Qt6TestPrivate/Qt6TestPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6TestPrivate/Qt6TestPrivateConfig.cmake +lib/cmake/Qt6TestPrivate/Qt6TestPrivateConfigVersion.cmake +lib/cmake/Qt6TestPrivate/Qt6TestPrivateConfigVersionImpl.cmake +lib/cmake/Qt6TestPrivate/Qt6TestPrivateDependencies.cmake +lib/cmake/Qt6TestPrivate/Qt6TestPrivateTargets.cmake +lib/cmake/Qt6TestPrivate/Qt6TestPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6TestPrivate/Qt6TestPrivateVersionlessTargets.cmake lib/cmake/Qt6Widgets/Qt6WidgetsAdditionalTargetInfo.cmake lib/cmake/Qt6Widgets/Qt6WidgetsConfig.cmake lib/cmake/Qt6Widgets/Qt6WidgetsConfigVersion.cmake @@ -3091,6 +3193,14 @@ lib/cmake/Qt6Widgets/Qt6WidgetsTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6Widgets/Qt6WidgetsTargets.cmake lib/cmake/Qt6Widgets/Qt6WidgetsVersionlessAliasTargets.cmake lib/cmake/Qt6Widgets/Qt6WidgetsVersionlessTargets.cmake +lib/cmake/Qt6WidgetsPrivate/Qt6WidgetsPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6WidgetsPrivate/Qt6WidgetsPrivateConfig.cmake +lib/cmake/Qt6WidgetsPrivate/Qt6WidgetsPrivateConfigVersion.cmake +lib/cmake/Qt6WidgetsPrivate/Qt6WidgetsPrivateConfigVersionImpl.cmake +lib/cmake/Qt6WidgetsPrivate/Qt6WidgetsPrivateDependencies.cmake +lib/cmake/Qt6WidgetsPrivate/Qt6WidgetsPrivateTargets.cmake +lib/cmake/Qt6WidgetsPrivate/Qt6WidgetsPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6WidgetsPrivate/Qt6WidgetsPrivateVersionlessTargets.cmake lib/cmake/Qt6WidgetsTools/Qt6WidgetsToolsAdditionalTargetInfo.cmake lib/cmake/Qt6WidgetsTools/Qt6WidgetsToolsConfig.cmake lib/cmake/Qt6WidgetsTools/Qt6WidgetsToolsConfigVersion.cmake @@ -3117,6 +3227,14 @@ lib/cmake/Qt6Xml/Qt6XmlTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6Xml/Qt6XmlTargets.cmake lib/cmake/Qt6Xml/Qt6XmlVersionlessAliasTargets.cmake lib/cmake/Qt6Xml/Qt6XmlVersionlessTargets.cmake +lib/cmake/Qt6XmlPrivate/Qt6XmlPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6XmlPrivate/Qt6XmlPrivateConfig.cmake +lib/cmake/Qt6XmlPrivate/Qt6XmlPrivateConfigVersion.cmake +lib/cmake/Qt6XmlPrivate/Qt6XmlPrivateConfigVersionImpl.cmake +lib/cmake/Qt6XmlPrivate/Qt6XmlPrivateDependencies.cmake +lib/cmake/Qt6XmlPrivate/Qt6XmlPrivateTargets.cmake +lib/cmake/Qt6XmlPrivate/Qt6XmlPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6XmlPrivate/Qt6XmlPrivateVersionlessTargets.cmake %%QT_BINDIR%%/androiddeployqt %%QT_BINDIR%%/androiddeployqt6 %%QT_BINDIR%%/androidtestrunner @@ -3874,6 +3992,21 @@ libdata/pkgconfig/Qt6Xml.pc %%QT_DOCDIR%%/global/template/style/online.css %%QT_DOCDIR%%/global/template/style/tech_preview.svg %%QT_DOCDIR%%/global/template/style/theqtcompany.png +%%QT_DOCDIR%%/global/tools-doc-front-page/README.md +%%QT_DOCDIR%%/global/tools-doc-front-page/images/api-reference.png +%%QT_DOCDIR%%/global/tools-doc-front-page/images/app-development.png +%%QT_DOCDIR%%/global/tools-doc-front-page/images/build-32x32.png +%%QT_DOCDIR%%/global/tools-doc-front-page/images/demo-32x32.png +%%QT_DOCDIR%%/global/tools-doc-front-page/images/folder-32x32.png +%%QT_DOCDIR%%/global/tools-doc-front-page/images/getting-started.png +%%QT_DOCDIR%%/global/tools-doc-front-page/images/ide.png +%%QT_DOCDIR%%/global/tools-doc-front-page/images/installation.png +%%QT_DOCDIR%%/global/tools-doc-front-page/images/paste_general-32x32.png +%%QT_DOCDIR%%/global/tools-doc-front-page/images/platform-and-toolchain.png +%%QT_DOCDIR%%/global/tools-doc-front-page/images/settings-32x32.png +%%QT_DOCDIR%%/global/tools-doc-front-page/images/tutorials.png +%%QT_DOCDIR%%/global/tools-doc-front-page/images/web-32x32.png +%%QT_DOCDIR%%/global/tools-doc-front-page/tool-name.qdoc %%QT_DOCDIR%%/global/warninglimit.qdocconf %%QT_DATADIR%%/modules/Concurrent.json %%QT_DATADIR%%/modules/Core.json diff --git a/devel/qt6-grpc/distinfo b/devel/qt6-grpc/distinfo index debaf235940d..6f63b5867343 100644 --- a/devel/qt6-grpc/distinfo +++ b/devel/qt6-grpc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1743027810 -SHA256 (KDE/Qt/6.8.3/qtgrpc-everywhere-src-6.8.3.tar.xz) = 052fa489d1c45b9df27319ee614f1534e49c9103a8b504024ab7e2c9e5b0849b -SIZE (KDE/Qt/6.8.3/qtgrpc-everywhere-src-6.8.3.tar.xz) = 606692 +TIMESTAMP = 1743708072 +SHA256 (KDE/Qt/6.9.0/qtgrpc-everywhere-src-6.9.0.tar.xz) = 3957e076181ac0d9a8f9fca93ec49e1e5e143e39eee1ec3feee10ca13f64b137 +SIZE (KDE/Qt/6.9.0/qtgrpc-everywhere-src-6.9.0.tar.xz) = 608296 diff --git a/devel/qt6-grpc/pkg-plist b/devel/qt6-grpc/pkg-plist index cd4ce204373c..4b3f85dc5cec 100644 --- a/devel/qt6-grpc/pkg-plist +++ b/devel/qt6-grpc/pkg-plist @@ -1,4 +1,5 @@ %%QT_INCDIR%%/QtGrpc/%%FULLVER%%/QtGrpc/private/qabstractgrpcchannel_p.h +%%QT_INCDIR%%/QtGrpc/%%FULLVER%%/QtGrpc/private/qgrpcoperation_p.h %%QT_INCDIR%%/QtGrpc/%%FULLVER%%/QtGrpc/private/qtgrpc-config_p.h %%QT_INCDIR%%/QtGrpc/%%FULLVER%%/QtGrpc/private/qtgrpclogging_p.h %%QT_INCDIR%%/QtGrpc/QAbstractGrpcChannel @@ -39,6 +40,7 @@ %%QT_INCDIR%%/QtGrpcQuick/%%FULLVER%%/QtGrpcQuick/private/qqmlgrpchttp2channel_p.h %%QT_INCDIR%%/QtGrpcQuick/%%FULLVER%%/QtGrpcQuick/private/qqmlgrpcmetadata_p.h %%QT_INCDIR%%/QtGrpcQuick/%%FULLVER%%/QtGrpcQuick/private/qqmlgrpcnamespace_p.h +%%QT_INCDIR%%/QtGrpcQuick/%%FULLVER%%/QtGrpcQuick/private/qtgrpcquicklogging_p.h %%QT_INCDIR%%/QtGrpcQuick/QQmlAbstractGrpcChannel %%QT_INCDIR%%/QtGrpcQuick/QtGrpcQuick %%QT_INCDIR%%/QtGrpcQuick/QtGrpcQuickDepends @@ -148,10 +150,7 @@ %%QT_INCDIR%%/QtProtobufWellKnownTypes/timestamp.qpb.h %%QT_INCDIR%%/QtProtobufWellKnownTypes/type.qpb.h %%QT_INCDIR%%/QtProtobufWellKnownTypes/wrappers.qpb.h -lib/cmake/Qt6/FindWrapProtobuf.cmake lib/cmake/Qt6/FindWrapProtoc.cmake -lib/cmake/Qt6/FindWrapgRPC.cmake -lib/cmake/Qt6/FindWrapgRPCPlugin.cmake lib/cmake/Qt6BuildInternals/StandaloneTests/QtGrpcTestsConfig.cmake lib/cmake/Qt6Grpc/Qt6GrpcAdditionalTargetInfo.cmake lib/cmake/Qt6Grpc/Qt6GrpcConfig.cmake @@ -162,6 +161,14 @@ lib/cmake/Qt6Grpc/Qt6GrpcTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6Grpc/Qt6GrpcTargets.cmake lib/cmake/Qt6Grpc/Qt6GrpcVersionlessAliasTargets.cmake lib/cmake/Qt6Grpc/Qt6GrpcVersionlessTargets.cmake +lib/cmake/Qt6GrpcPrivate/Qt6GrpcPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6GrpcPrivate/Qt6GrpcPrivateConfig.cmake +lib/cmake/Qt6GrpcPrivate/Qt6GrpcPrivateConfigVersion.cmake +lib/cmake/Qt6GrpcPrivate/Qt6GrpcPrivateConfigVersionImpl.cmake +lib/cmake/Qt6GrpcPrivate/Qt6GrpcPrivateDependencies.cmake +lib/cmake/Qt6GrpcPrivate/Qt6GrpcPrivateTargets.cmake +lib/cmake/Qt6GrpcPrivate/Qt6GrpcPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6GrpcPrivate/Qt6GrpcPrivateVersionlessTargets.cmake lib/cmake/Qt6GrpcQuick/Qt6GrpcQuickAdditionalTargetInfo.cmake lib/cmake/Qt6GrpcQuick/Qt6GrpcQuickConfig.cmake lib/cmake/Qt6GrpcQuick/Qt6GrpcQuickConfigVersion.cmake @@ -171,6 +178,14 @@ lib/cmake/Qt6GrpcQuick/Qt6GrpcQuickTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6GrpcQuick/Qt6GrpcQuickTargets.cmake lib/cmake/Qt6GrpcQuick/Qt6GrpcQuickVersionlessAliasTargets.cmake lib/cmake/Qt6GrpcQuick/Qt6GrpcQuickVersionlessTargets.cmake +lib/cmake/Qt6GrpcQuickPrivate/Qt6GrpcQuickPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6GrpcQuickPrivate/Qt6GrpcQuickPrivateConfig.cmake +lib/cmake/Qt6GrpcQuickPrivate/Qt6GrpcQuickPrivateConfigVersion.cmake +lib/cmake/Qt6GrpcQuickPrivate/Qt6GrpcQuickPrivateConfigVersionImpl.cmake +lib/cmake/Qt6GrpcQuickPrivate/Qt6GrpcQuickPrivateDependencies.cmake +lib/cmake/Qt6GrpcQuickPrivate/Qt6GrpcQuickPrivateTargets.cmake +lib/cmake/Qt6GrpcQuickPrivate/Qt6GrpcQuickPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6GrpcQuickPrivate/Qt6GrpcQuickPrivateVersionlessTargets.cmake lib/cmake/Qt6GrpcTools/Qt6GrpcToolsAdditionalTargetInfo.cmake lib/cmake/Qt6GrpcTools/Qt6GrpcToolsConfig.cmake lib/cmake/Qt6GrpcTools/Qt6GrpcToolsConfigVersion.cmake @@ -191,6 +206,14 @@ lib/cmake/Qt6Protobuf/Qt6ProtobufTargets.cmake lib/cmake/Qt6Protobuf/Qt6ProtobufVersionlessAliasTargets.cmake lib/cmake/Qt6Protobuf/Qt6ProtobufVersionlessTargets.cmake lib/cmake/Qt6Protobuf/QtProtobufProperties.cmake.in +lib/cmake/Qt6ProtobufPrivate/Qt6ProtobufPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6ProtobufPrivate/Qt6ProtobufPrivateConfig.cmake +lib/cmake/Qt6ProtobufPrivate/Qt6ProtobufPrivateConfigVersion.cmake +lib/cmake/Qt6ProtobufPrivate/Qt6ProtobufPrivateConfigVersionImpl.cmake +lib/cmake/Qt6ProtobufPrivate/Qt6ProtobufPrivateDependencies.cmake +lib/cmake/Qt6ProtobufPrivate/Qt6ProtobufPrivateTargets.cmake +lib/cmake/Qt6ProtobufPrivate/Qt6ProtobufPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6ProtobufPrivate/Qt6ProtobufPrivateVersionlessTargets.cmake lib/cmake/Qt6ProtobufQtCoreTypes/Qt6ProtobufQtCoreTypesAdditionalTargetInfo.cmake lib/cmake/Qt6ProtobufQtCoreTypes/Qt6ProtobufQtCoreTypesConfig.cmake lib/cmake/Qt6ProtobufQtCoreTypes/Qt6ProtobufQtCoreTypesConfigVersion.cmake @@ -201,6 +224,14 @@ lib/cmake/Qt6ProtobufQtCoreTypes/Qt6ProtobufQtCoreTypesTargets-%%CMAKE_BUILD_TYP lib/cmake/Qt6ProtobufQtCoreTypes/Qt6ProtobufQtCoreTypesTargets.cmake lib/cmake/Qt6ProtobufQtCoreTypes/Qt6ProtobufQtCoreTypesVersionlessAliasTargets.cmake lib/cmake/Qt6ProtobufQtCoreTypes/Qt6ProtobufQtCoreTypesVersionlessTargets.cmake +lib/cmake/Qt6ProtobufQtCoreTypesPrivate/Qt6ProtobufQtCoreTypesPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6ProtobufQtCoreTypesPrivate/Qt6ProtobufQtCoreTypesPrivateConfig.cmake +lib/cmake/Qt6ProtobufQtCoreTypesPrivate/Qt6ProtobufQtCoreTypesPrivateConfigVersion.cmake +lib/cmake/Qt6ProtobufQtCoreTypesPrivate/Qt6ProtobufQtCoreTypesPrivateConfigVersionImpl.cmake +lib/cmake/Qt6ProtobufQtCoreTypesPrivate/Qt6ProtobufQtCoreTypesPrivateDependencies.cmake +lib/cmake/Qt6ProtobufQtCoreTypesPrivate/Qt6ProtobufQtCoreTypesPrivateTargets.cmake +lib/cmake/Qt6ProtobufQtCoreTypesPrivate/Qt6ProtobufQtCoreTypesPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6ProtobufQtCoreTypesPrivate/Qt6ProtobufQtCoreTypesPrivateVersionlessTargets.cmake lib/cmake/Qt6ProtobufQtGuiTypes/Qt6ProtobufQtGuiTypesAdditionalTargetInfo.cmake lib/cmake/Qt6ProtobufQtGuiTypes/Qt6ProtobufQtGuiTypesConfig.cmake lib/cmake/Qt6ProtobufQtGuiTypes/Qt6ProtobufQtGuiTypesConfigVersion.cmake @@ -211,6 +242,14 @@ lib/cmake/Qt6ProtobufQtGuiTypes/Qt6ProtobufQtGuiTypesTargets-%%CMAKE_BUILD_TYPE% lib/cmake/Qt6ProtobufQtGuiTypes/Qt6ProtobufQtGuiTypesTargets.cmake lib/cmake/Qt6ProtobufQtGuiTypes/Qt6ProtobufQtGuiTypesVersionlessAliasTargets.cmake lib/cmake/Qt6ProtobufQtGuiTypes/Qt6ProtobufQtGuiTypesVersionlessTargets.cmake +lib/cmake/Qt6ProtobufQtGuiTypesPrivate/Qt6ProtobufQtGuiTypesPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6ProtobufQtGuiTypesPrivate/Qt6ProtobufQtGuiTypesPrivateConfig.cmake +lib/cmake/Qt6ProtobufQtGuiTypesPrivate/Qt6ProtobufQtGuiTypesPrivateConfigVersion.cmake +lib/cmake/Qt6ProtobufQtGuiTypesPrivate/Qt6ProtobufQtGuiTypesPrivateConfigVersionImpl.cmake +lib/cmake/Qt6ProtobufQtGuiTypesPrivate/Qt6ProtobufQtGuiTypesPrivateDependencies.cmake +lib/cmake/Qt6ProtobufQtGuiTypesPrivate/Qt6ProtobufQtGuiTypesPrivateTargets.cmake +lib/cmake/Qt6ProtobufQtGuiTypesPrivate/Qt6ProtobufQtGuiTypesPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6ProtobufQtGuiTypesPrivate/Qt6ProtobufQtGuiTypesPrivateVersionlessTargets.cmake lib/cmake/Qt6ProtobufQuick/Qt6ProtobufQuickAdditionalTargetInfo.cmake lib/cmake/Qt6ProtobufQuick/Qt6ProtobufQuickConfig.cmake lib/cmake/Qt6ProtobufQuick/Qt6ProtobufQuickConfigVersion.cmake @@ -220,6 +259,14 @@ lib/cmake/Qt6ProtobufQuick/Qt6ProtobufQuickTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6ProtobufQuick/Qt6ProtobufQuickTargets.cmake lib/cmake/Qt6ProtobufQuick/Qt6ProtobufQuickVersionlessAliasTargets.cmake lib/cmake/Qt6ProtobufQuick/Qt6ProtobufQuickVersionlessTargets.cmake +lib/cmake/Qt6ProtobufQuickPrivate/Qt6ProtobufQuickPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6ProtobufQuickPrivate/Qt6ProtobufQuickPrivateConfig.cmake +lib/cmake/Qt6ProtobufQuickPrivate/Qt6ProtobufQuickPrivateConfigVersion.cmake +lib/cmake/Qt6ProtobufQuickPrivate/Qt6ProtobufQuickPrivateConfigVersionImpl.cmake +lib/cmake/Qt6ProtobufQuickPrivate/Qt6ProtobufQuickPrivateDependencies.cmake +lib/cmake/Qt6ProtobufQuickPrivate/Qt6ProtobufQuickPrivateTargets.cmake +lib/cmake/Qt6ProtobufQuickPrivate/Qt6ProtobufQuickPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6ProtobufQuickPrivate/Qt6ProtobufQuickPrivateVersionlessTargets.cmake lib/cmake/Qt6ProtobufTools/Qt6ProtobufToolsAdditionalTargetInfo.cmake lib/cmake/Qt6ProtobufTools/Qt6ProtobufToolsConfig.cmake lib/cmake/Qt6ProtobufTools/Qt6ProtobufToolsConfigVersion.cmake @@ -240,6 +287,14 @@ lib/cmake/Qt6ProtobufWellKnownTypes/Qt6ProtobufWellKnownTypesTargets-%%CMAKE_BUI lib/cmake/Qt6ProtobufWellKnownTypes/Qt6ProtobufWellKnownTypesTargets.cmake lib/cmake/Qt6ProtobufWellKnownTypes/Qt6ProtobufWellKnownTypesVersionlessAliasTargets.cmake lib/cmake/Qt6ProtobufWellKnownTypes/Qt6ProtobufWellKnownTypesVersionlessTargets.cmake +lib/cmake/Qt6ProtobufWellKnownTypesPrivate/Qt6ProtobufWellKnownTypesPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6ProtobufWellKnownTypesPrivate/Qt6ProtobufWellKnownTypesPrivateConfig.cmake +lib/cmake/Qt6ProtobufWellKnownTypesPrivate/Qt6ProtobufWellKnownTypesPrivateConfigVersion.cmake +lib/cmake/Qt6ProtobufWellKnownTypesPrivate/Qt6ProtobufWellKnownTypesPrivateConfigVersionImpl.cmake +lib/cmake/Qt6ProtobufWellKnownTypesPrivate/Qt6ProtobufWellKnownTypesPrivateDependencies.cmake +lib/cmake/Qt6ProtobufWellKnownTypesPrivate/Qt6ProtobufWellKnownTypesPrivateTargets.cmake +lib/cmake/Qt6ProtobufWellKnownTypesPrivate/Qt6ProtobufWellKnownTypesPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6ProtobufWellKnownTypesPrivate/Qt6ProtobufWellKnownTypesPrivateVersionlessTargets.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6grpcquickpluginAdditionalTargetInfo.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6grpcquickpluginConfig.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6grpcquickpluginConfigVersion.cmake diff --git a/devel/qt6-languageserver/distinfo b/devel/qt6-languageserver/distinfo index 4a2344f516f2..d93ec8b25680 100644 --- a/devel/qt6-languageserver/distinfo +++ b/devel/qt6-languageserver/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1743027811 -SHA256 (KDE/Qt/6.8.3/qtlanguageserver-everywhere-src-6.8.3.tar.xz) = e4d320073c55b3a418a784e7866c43bc3e3d52817368be56e7d468866ff8b469 -SIZE (KDE/Qt/6.8.3/qtlanguageserver-everywhere-src-6.8.3.tar.xz) = 152144 +TIMESTAMP = 1743708074 +SHA256 (KDE/Qt/6.9.0/qtlanguageserver-everywhere-src-6.9.0.tar.xz) = eee65e036152eee36b63127013fb8e4f0cbbde66bae5f88864b56b70e357492e +SIZE (KDE/Qt/6.9.0/qtlanguageserver-everywhere-src-6.9.0.tar.xz) = 152360 diff --git a/devel/qt6-location/distinfo b/devel/qt6-location/distinfo index 533a5b1f7a74..c30016e5d4e5 100644 --- a/devel/qt6-location/distinfo +++ b/devel/qt6-location/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1743027812 -SHA256 (KDE/Qt/6.8.3/qtlocation-everywhere-src-6.8.3.tar.xz) = 1d05e95aa5b6bd26bffa004cd8c5c70ae2af649496010a1a70124293bc09fd43 -SIZE (KDE/Qt/6.8.3/qtlocation-everywhere-src-6.8.3.tar.xz) = 3165768 +TIMESTAMP = 1743708078 +SHA256 (KDE/Qt/6.9.0/qtlocation-everywhere-src-6.9.0.tar.xz) = ada25ac4c1aa2b2daec0c21198dbb30004453869911724816c6ce7ecb3826794 +SIZE (KDE/Qt/6.9.0/qtlocation-everywhere-src-6.9.0.tar.xz) = 3166020 diff --git a/devel/qt6-location/pkg-plist b/devel/qt6-location/pkg-plist index b59f3a492945..5cd763101abe 100644 --- a/devel/qt6-location/pkg-plist +++ b/devel/qt6-location/pkg-plist @@ -195,6 +195,14 @@ lib/cmake/Qt6Location/Qt6QGeoServiceProviderFactoryOsmPluginConfigVersion.cmake lib/cmake/Qt6Location/Qt6QGeoServiceProviderFactoryOsmPluginConfigVersionImpl.cmake lib/cmake/Qt6Location/Qt6QGeoServiceProviderFactoryOsmPluginTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6Location/Qt6QGeoServiceProviderFactoryOsmPluginTargets.cmake +lib/cmake/Qt6LocationPrivate/Qt6LocationPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6LocationPrivate/Qt6LocationPrivateConfig.cmake +lib/cmake/Qt6LocationPrivate/Qt6LocationPrivateConfigVersion.cmake +lib/cmake/Qt6LocationPrivate/Qt6LocationPrivateConfigVersionImpl.cmake +lib/cmake/Qt6LocationPrivate/Qt6LocationPrivateDependencies.cmake +lib/cmake/Qt6LocationPrivate/Qt6LocationPrivateTargets.cmake +lib/cmake/Qt6LocationPrivate/Qt6LocationPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6LocationPrivate/Qt6LocationPrivateVersionlessTargets.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6declarative_locationAdditionalTargetInfo.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6declarative_locationConfig.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6declarative_locationConfigVersion.cmake diff --git a/devel/qt6-positioning/distinfo b/devel/qt6-positioning/distinfo index f47b5b933afb..c11d4dd74c6b 100644 --- a/devel/qt6-positioning/distinfo +++ b/devel/qt6-positioning/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1743027813 -SHA256 (KDE/Qt/6.8.3/qtpositioning-everywhere-src-6.8.3.tar.xz) = 6ab69a7e71a7795aab9ca2798eea126e36df55159a771ebd2f37cad3da63e9d3 -SIZE (KDE/Qt/6.8.3/qtpositioning-everywhere-src-6.8.3.tar.xz) = 663612 +TIMESTAMP = 1743708081 +SHA256 (KDE/Qt/6.9.0/qtpositioning-everywhere-src-6.9.0.tar.xz) = c00b4c01d92bf99c5562910aab59f80146b976cdb1dcb7bd2f27833624605ed1 +SIZE (KDE/Qt/6.9.0/qtpositioning-everywhere-src-6.9.0.tar.xz) = 663760 diff --git a/devel/qt6-positioning/pkg-plist b/devel/qt6-positioning/pkg-plist index dc8e5777b4bf..472bada4c288 100644 --- a/devel/qt6-positioning/pkg-plist +++ b/devel/qt6-positioning/pkg-plist @@ -111,6 +111,14 @@ lib/cmake/Qt6Positioning/Qt6QGeoPositionInfoSourceFactoryPollPluginConfigVersion lib/cmake/Qt6Positioning/Qt6QGeoPositionInfoSourceFactoryPollPluginConfigVersionImpl.cmake lib/cmake/Qt6Positioning/Qt6QGeoPositionInfoSourceFactoryPollPluginTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6Positioning/Qt6QGeoPositionInfoSourceFactoryPollPluginTargets.cmake +lib/cmake/Qt6PositioningPrivate/Qt6PositioningPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6PositioningPrivate/Qt6PositioningPrivateConfig.cmake +lib/cmake/Qt6PositioningPrivate/Qt6PositioningPrivateConfigVersion.cmake +lib/cmake/Qt6PositioningPrivate/Qt6PositioningPrivateConfigVersionImpl.cmake +lib/cmake/Qt6PositioningPrivate/Qt6PositioningPrivateDependencies.cmake +lib/cmake/Qt6PositioningPrivate/Qt6PositioningPrivateTargets.cmake +lib/cmake/Qt6PositioningPrivate/Qt6PositioningPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6PositioningPrivate/Qt6PositioningPrivateVersionlessTargets.cmake lib/cmake/Qt6PositioningQuick/Qt6PositioningQuickAdditionalTargetInfo.cmake lib/cmake/Qt6PositioningQuick/Qt6PositioningQuickConfig.cmake lib/cmake/Qt6PositioningQuick/Qt6PositioningQuickConfigVersion.cmake @@ -120,6 +128,14 @@ lib/cmake/Qt6PositioningQuick/Qt6PositioningQuickTargets-%%CMAKE_BUILD_TYPE%%.cm lib/cmake/Qt6PositioningQuick/Qt6PositioningQuickTargets.cmake lib/cmake/Qt6PositioningQuick/Qt6PositioningQuickVersionlessAliasTargets.cmake lib/cmake/Qt6PositioningQuick/Qt6PositioningQuickVersionlessTargets.cmake +lib/cmake/Qt6PositioningQuickPrivate/Qt6PositioningQuickPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6PositioningQuickPrivate/Qt6PositioningQuickPrivateConfig.cmake +lib/cmake/Qt6PositioningQuickPrivate/Qt6PositioningQuickPrivateConfigVersion.cmake +lib/cmake/Qt6PositioningQuickPrivate/Qt6PositioningQuickPrivateConfigVersionImpl.cmake +lib/cmake/Qt6PositioningQuickPrivate/Qt6PositioningQuickPrivateDependencies.cmake +lib/cmake/Qt6PositioningQuickPrivate/Qt6PositioningQuickPrivateTargets.cmake +lib/cmake/Qt6PositioningQuickPrivate/Qt6PositioningQuickPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6PositioningQuickPrivate/Qt6PositioningQuickPrivateVersionlessTargets.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6positioningquickpluginAdditionalTargetInfo.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6positioningquickpluginConfig.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6positioningquickpluginConfigVersion.cmake diff --git a/devel/qt6-remoteobjects/distinfo b/devel/qt6-remoteobjects/distinfo index 28b3436baec3..962b7c6489e7 100644 --- a/devel/qt6-remoteobjects/distinfo +++ b/devel/qt6-remoteobjects/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1743027814 -SHA256 (KDE/Qt/6.8.3/qtremoteobjects-everywhere-src-6.8.3.tar.xz) = 5a40d1a67c2e02911f3014977cdce59eb49e8af2c82f4e18c06ce7031744aeaf -SIZE (KDE/Qt/6.8.3/qtremoteobjects-everywhere-src-6.8.3.tar.xz) = 539556 +TIMESTAMP = 1743708084 +SHA256 (KDE/Qt/6.9.0/qtremoteobjects-everywhere-src-6.9.0.tar.xz) = f43a12f4fd78fda436b03f58f87b65f7f696866a8f51581a76aaf9e7239770dd +SIZE (KDE/Qt/6.9.0/qtremoteobjects-everywhere-src-6.9.0.tar.xz) = 543528 diff --git a/devel/qt6-remoteobjects/pkg-plist b/devel/qt6-remoteobjects/pkg-plist index 6b10e2fcbf10..6656f9452915 100644 --- a/devel/qt6-remoteobjects/pkg-plist +++ b/devel/qt6-remoteobjects/pkg-plist @@ -10,9 +10,12 @@ %%QT_INCDIR%%/QtRemoteObjects/%%FULLVER%%/QtRemoteObjects/private/qremoteobjectpendingcall_p.h %%QT_INCDIR%%/QtRemoteObjects/%%FULLVER%%/QtRemoteObjects/private/qremoteobjectregistrysource_p.h %%QT_INCDIR%%/QtRemoteObjects/%%FULLVER%%/QtRemoteObjects/private/qremoteobjectreplica_p.h +%%QT_INCDIR%%/QtRemoteObjects/%%FULLVER%%/QtRemoteObjects/private/qremoteobjectrepparser_p.h %%QT_INCDIR%%/QtRemoteObjects/%%FULLVER%%/QtRemoteObjects/private/qremoteobjectsource_p.h %%QT_INCDIR%%/QtRemoteObjects/%%FULLVER%%/QtRemoteObjects/private/qremoteobjectsourceio_p.h +%%QT_INCDIR%%/QtRemoteObjects/%%FULLVER%%/QtRemoteObjects/private/qremoteobjectstructs_p.h %%QT_INCDIR%%/QtRemoteObjects/%%FULLVER%%/QtRemoteObjects/private/qtremoteobjects-config_p.h +%%QT_INCDIR%%/QtRemoteObjects/%%FULLVER%%/QtRemoteObjects/private/rep_grammar_p.h %%QT_INCDIR%%/QtRemoteObjects/QAbstractItemModelReplica %%QT_INCDIR%%/QtRemoteObjects/QConnectionAbstractServer %%QT_INCDIR%%/QtRemoteObjects/QIntHash @@ -52,6 +55,7 @@ %%QT_INCDIR%%/QtRemoteObjects/qtremoteobjects-config.h %%QT_INCDIR%%/QtRemoteObjects/qtremoteobjectsexports.h %%QT_INCDIR%%/QtRemoteObjects/qtremoteobjectsversion.h +%%QT_INCDIR%%/QtRemoteObjects/repparser.h %%QT_INCDIR%%/QtRemoteObjectsQml/%%FULLVER%%/QtRemoteObjectsQml/private/qremoteobjectsqml_p.h %%QT_INCDIR%%/QtRemoteObjectsQml/QtRemoteObjectsQml %%QT_INCDIR%%/QtRemoteObjectsQml/QtRemoteObjectsQmlDepends @@ -59,6 +63,7 @@ %%QT_INCDIR%%/QtRemoteObjectsQml/qtremoteobjectsqmlversion.h %%QT_INCDIR%%/QtRepParser/QtRepParserDepends %%QT_INCDIR%%/QtRepParser/parser.g +%%QT_INCDIR%%/QtRepParser/qregexparser.h lib/cmake/Qt6BuildInternals/StandaloneTests/QtRemoteObjectsTestsConfig.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6declarative_remoteobjectsAdditionalTargetInfo.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6declarative_remoteobjectsConfig.cmake @@ -76,6 +81,14 @@ lib/cmake/Qt6RemoteObjects/Qt6RemoteObjectsTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6RemoteObjects/Qt6RemoteObjectsTargets.cmake lib/cmake/Qt6RemoteObjects/Qt6RemoteObjectsVersionlessAliasTargets.cmake lib/cmake/Qt6RemoteObjects/Qt6RemoteObjectsVersionlessTargets.cmake +lib/cmake/Qt6RemoteObjectsPrivate/Qt6RemoteObjectsPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6RemoteObjectsPrivate/Qt6RemoteObjectsPrivateConfig.cmake +lib/cmake/Qt6RemoteObjectsPrivate/Qt6RemoteObjectsPrivateConfigVersion.cmake +lib/cmake/Qt6RemoteObjectsPrivate/Qt6RemoteObjectsPrivateConfigVersionImpl.cmake +lib/cmake/Qt6RemoteObjectsPrivate/Qt6RemoteObjectsPrivateDependencies.cmake +lib/cmake/Qt6RemoteObjectsPrivate/Qt6RemoteObjectsPrivateTargets.cmake +lib/cmake/Qt6RemoteObjectsPrivate/Qt6RemoteObjectsPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6RemoteObjectsPrivate/Qt6RemoteObjectsPrivateVersionlessTargets.cmake lib/cmake/Qt6RemoteObjectsQml/Qt6RemoteObjectsQmlAdditionalTargetInfo.cmake lib/cmake/Qt6RemoteObjectsQml/Qt6RemoteObjectsQmlConfig.cmake lib/cmake/Qt6RemoteObjectsQml/Qt6RemoteObjectsQmlConfigVersion.cmake @@ -85,6 +98,14 @@ lib/cmake/Qt6RemoteObjectsQml/Qt6RemoteObjectsQmlTargets-%%CMAKE_BUILD_TYPE%%.cm lib/cmake/Qt6RemoteObjectsQml/Qt6RemoteObjectsQmlTargets.cmake lib/cmake/Qt6RemoteObjectsQml/Qt6RemoteObjectsQmlVersionlessAliasTargets.cmake lib/cmake/Qt6RemoteObjectsQml/Qt6RemoteObjectsQmlVersionlessTargets.cmake +lib/cmake/Qt6RemoteObjectsQmlPrivate/Qt6RemoteObjectsQmlPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6RemoteObjectsQmlPrivate/Qt6RemoteObjectsQmlPrivateConfig.cmake +lib/cmake/Qt6RemoteObjectsQmlPrivate/Qt6RemoteObjectsQmlPrivateConfigVersion.cmake +lib/cmake/Qt6RemoteObjectsQmlPrivate/Qt6RemoteObjectsQmlPrivateConfigVersionImpl.cmake +lib/cmake/Qt6RemoteObjectsQmlPrivate/Qt6RemoteObjectsQmlPrivateDependencies.cmake +lib/cmake/Qt6RemoteObjectsQmlPrivate/Qt6RemoteObjectsQmlPrivateTargets.cmake +lib/cmake/Qt6RemoteObjectsQmlPrivate/Qt6RemoteObjectsQmlPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6RemoteObjectsQmlPrivate/Qt6RemoteObjectsQmlPrivateVersionlessTargets.cmake lib/cmake/Qt6RemoteObjectsTools/Qt6RemoteObjectsToolsAdditionalTargetInfo.cmake lib/cmake/Qt6RemoteObjectsTools/Qt6RemoteObjectsToolsConfig.cmake lib/cmake/Qt6RemoteObjectsTools/Qt6RemoteObjectsToolsConfigVersion.cmake @@ -101,6 +122,14 @@ lib/cmake/Qt6RepParser/Qt6RepParserDependencies.cmake lib/cmake/Qt6RepParser/Qt6RepParserTargets.cmake lib/cmake/Qt6RepParser/Qt6RepParserVersionlessAliasTargets.cmake lib/cmake/Qt6RepParser/Qt6RepParserVersionlessTargets.cmake +lib/cmake/Qt6RepParserPrivate/Qt6RepParserPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6RepParserPrivate/Qt6RepParserPrivateConfig.cmake +lib/cmake/Qt6RepParserPrivate/Qt6RepParserPrivateConfigVersion.cmake +lib/cmake/Qt6RepParserPrivate/Qt6RepParserPrivateConfigVersionImpl.cmake +lib/cmake/Qt6RepParserPrivate/Qt6RepParserPrivateDependencies.cmake +lib/cmake/Qt6RepParserPrivate/Qt6RepParserPrivateTargets.cmake +lib/cmake/Qt6RepParserPrivate/Qt6RepParserPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6RepParserPrivate/Qt6RepParserPrivateVersionlessTargets.cmake %%QT_LIBDIR%%/libQt6RemoteObjects.prl %%QT_LIBDIR%%/libQt6RemoteObjects.so %%QT_LIBDIR%%/libQt6RemoteObjects.so.6 diff --git a/devel/qt6-scxml/distinfo b/devel/qt6-scxml/distinfo index 30fb702b293c..1e73f3e8eb01 100644 --- a/devel/qt6-scxml/distinfo +++ b/devel/qt6-scxml/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1743027815 -SHA256 (KDE/Qt/6.8.3/qtscxml-everywhere-src-6.8.3.tar.xz) = dbac976ab7299fb782dfc4c1e4bb1cafc059929bef2271a275f11d97ce7f2f5c -SIZE (KDE/Qt/6.8.3/qtscxml-everywhere-src-6.8.3.tar.xz) = 560632 +TIMESTAMP = 1743708088 +SHA256 (KDE/Qt/6.9.0/qtscxml-everywhere-src-6.9.0.tar.xz) = a73bb5241c124d776d79ea24749d707b71365e395d8af3382a1f1c43a69a6892 +SIZE (KDE/Qt/6.9.0/qtscxml-everywhere-src-6.9.0.tar.xz) = 560568 diff --git a/devel/qt6-scxml/pkg-plist b/devel/qt6-scxml/pkg-plist index 52f21d451151..b720e4de8486 100644 --- a/devel/qt6-scxml/pkg-plist +++ b/devel/qt6-scxml/pkg-plist @@ -9,7 +9,6 @@ %%QT_INCDIR%%/QtScxml/%%FULLVER%%/QtScxml/private/qscxmlstatemachine_p.h %%QT_INCDIR%%/QtScxml/%%FULLVER%%/QtScxml/private/qscxmlstatemachineinfo_p.h %%QT_INCDIR%%/QtScxml/%%FULLVER%%/QtScxml/private/qscxmltabledata_p.h -%%QT_INCDIR%%/QtScxml/%%FULLVER%%/QtScxml/private/qtscxml-config_p.h %%QT_INCDIR%%/QtScxml/QScxmlCompiler %%QT_INCDIR%%/QtScxml/QScxmlCppDataModel %%QT_INCDIR%%/QtScxml/QScxmlDataModel @@ -36,9 +35,14 @@ %%QT_INCDIR%%/QtScxml/qscxmlnulldatamodel.h %%QT_INCDIR%%/QtScxml/qscxmlstatemachine.h %%QT_INCDIR%%/QtScxml/qscxmltabledata.h -%%QT_INCDIR%%/QtScxml/qtscxml-config.h %%QT_INCDIR%%/QtScxml/qtscxmlexports.h %%QT_INCDIR%%/QtScxml/qtscxmlversion.h +%%QT_INCDIR%%/QtScxmlGlobal/%%FULLVER%%/QtScxmlGlobal/private/qtscxmlglobal-config_p.h +%%QT_INCDIR%%/QtScxmlGlobal/QtScxmlGlobal +%%QT_INCDIR%%/QtScxmlGlobal/QtScxmlGlobalDepends +%%QT_INCDIR%%/QtScxmlGlobal/QtScxmlGlobalVersion +%%QT_INCDIR%%/QtScxmlGlobal/qtscxmlglobal-config.h +%%QT_INCDIR%%/QtScxmlGlobal/qtscxmlglobalversion.h %%QT_INCDIR%%/QtScxmlQml/%%FULLVER%%/QtScxmlQml/private/eventconnection_p.h %%QT_INCDIR%%/QtScxmlQml/%%FULLVER%%/QtScxmlQml/private/invokedservices_p.h %%QT_INCDIR%%/QtScxmlQml/%%FULLVER%%/QtScxmlQml/private/qscxmlqmlglobals_p.h @@ -60,7 +64,7 @@ %%QT_INCDIR%%/QtStateMachine/%%FULLVER%%/QtStateMachine/private/qsignaltransition_p.h %%QT_INCDIR%%/QtStateMachine/%%FULLVER%%/QtStateMachine/private/qstate_p.h %%QT_INCDIR%%/QtStateMachine/%%FULLVER%%/QtStateMachine/private/qstatemachine_p.h -%%QT_INCDIR%%/QtStateMachine/%%FULLVER%%/QtStateMachine/private/qtstatemachine-config_p.h +%%QT_INCDIR%%/QtStateMachine/%%FULLVER%%/QtStateMachine/private/qstatemachineglobal_p.h %%QT_INCDIR%%/QtStateMachine/QAbstractState %%QT_INCDIR%%/QtStateMachine/QAbstractTransition %%QT_INCDIR%%/QtStateMachine/QEventTransition @@ -85,7 +89,6 @@ %%QT_INCDIR%%/QtStateMachine/qstate.h %%QT_INCDIR%%/QtStateMachine/qstatemachine.h %%QT_INCDIR%%/QtStateMachine/qstatemachineglobal.h -%%QT_INCDIR%%/QtStateMachine/qtstatemachine-config.h %%QT_INCDIR%%/QtStateMachine/qtstatemachineexports.h %%QT_INCDIR%%/QtStateMachine/qtstatemachineversion.h %%QT_INCDIR%%/QtStateMachineQml/%%FULLVER%%/QtStateMachineQml/private/childrenprivate_p.h @@ -131,6 +134,21 @@ lib/cmake/Qt6Scxml/Qt6ScxmlTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6Scxml/Qt6ScxmlTargets.cmake lib/cmake/Qt6Scxml/Qt6ScxmlVersionlessAliasTargets.cmake lib/cmake/Qt6Scxml/Qt6ScxmlVersionlessTargets.cmake +lib/cmake/Qt6ScxmlGlobalPrivate/Qt6ScxmlGlobalPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6ScxmlGlobalPrivate/Qt6ScxmlGlobalPrivateConfig.cmake +lib/cmake/Qt6ScxmlGlobalPrivate/Qt6ScxmlGlobalPrivateConfigVersion.cmake +lib/cmake/Qt6ScxmlGlobalPrivate/Qt6ScxmlGlobalPrivateConfigVersionImpl.cmake +lib/cmake/Qt6ScxmlGlobalPrivate/Qt6ScxmlGlobalPrivateTargets.cmake +lib/cmake/Qt6ScxmlGlobalPrivate/Qt6ScxmlGlobalPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6ScxmlGlobalPrivate/Qt6ScxmlGlobalPrivateVersionlessTargets.cmake +lib/cmake/Qt6ScxmlPrivate/Qt6ScxmlPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6ScxmlPrivate/Qt6ScxmlPrivateConfig.cmake +lib/cmake/Qt6ScxmlPrivate/Qt6ScxmlPrivateConfigVersion.cmake +lib/cmake/Qt6ScxmlPrivate/Qt6ScxmlPrivateConfigVersionImpl.cmake +lib/cmake/Qt6ScxmlPrivate/Qt6ScxmlPrivateDependencies.cmake +lib/cmake/Qt6ScxmlPrivate/Qt6ScxmlPrivateTargets.cmake +lib/cmake/Qt6ScxmlPrivate/Qt6ScxmlPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6ScxmlPrivate/Qt6ScxmlPrivateVersionlessTargets.cmake lib/cmake/Qt6ScxmlQml/Qt6ScxmlQmlAdditionalTargetInfo.cmake lib/cmake/Qt6ScxmlQml/Qt6ScxmlQmlConfig.cmake lib/cmake/Qt6ScxmlQml/Qt6ScxmlQmlConfigVersion.cmake @@ -140,6 +158,14 @@ lib/cmake/Qt6ScxmlQml/Qt6ScxmlQmlTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6ScxmlQml/Qt6ScxmlQmlTargets.cmake lib/cmake/Qt6ScxmlQml/Qt6ScxmlQmlVersionlessAliasTargets.cmake lib/cmake/Qt6ScxmlQml/Qt6ScxmlQmlVersionlessTargets.cmake +lib/cmake/Qt6ScxmlQmlPrivate/Qt6ScxmlQmlPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6ScxmlQmlPrivate/Qt6ScxmlQmlPrivateConfig.cmake +lib/cmake/Qt6ScxmlQmlPrivate/Qt6ScxmlQmlPrivateConfigVersion.cmake +lib/cmake/Qt6ScxmlQmlPrivate/Qt6ScxmlQmlPrivateConfigVersionImpl.cmake +lib/cmake/Qt6ScxmlQmlPrivate/Qt6ScxmlQmlPrivateDependencies.cmake +lib/cmake/Qt6ScxmlQmlPrivate/Qt6ScxmlQmlPrivateTargets.cmake +lib/cmake/Qt6ScxmlQmlPrivate/Qt6ScxmlQmlPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6ScxmlQmlPrivate/Qt6ScxmlQmlPrivateVersionlessTargets.cmake lib/cmake/Qt6ScxmlTools/Qt6ScxmlToolsAdditionalTargetInfo.cmake lib/cmake/Qt6ScxmlTools/Qt6ScxmlToolsConfig.cmake lib/cmake/Qt6ScxmlTools/Qt6ScxmlToolsConfigVersion.cmake @@ -157,6 +183,14 @@ lib/cmake/Qt6StateMachine/Qt6StateMachineTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6StateMachine/Qt6StateMachineTargets.cmake lib/cmake/Qt6StateMachine/Qt6StateMachineVersionlessAliasTargets.cmake lib/cmake/Qt6StateMachine/Qt6StateMachineVersionlessTargets.cmake +lib/cmake/Qt6StateMachinePrivate/Qt6StateMachinePrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6StateMachinePrivate/Qt6StateMachinePrivateConfig.cmake +lib/cmake/Qt6StateMachinePrivate/Qt6StateMachinePrivateConfigVersion.cmake +lib/cmake/Qt6StateMachinePrivate/Qt6StateMachinePrivateConfigVersionImpl.cmake +lib/cmake/Qt6StateMachinePrivate/Qt6StateMachinePrivateDependencies.cmake +lib/cmake/Qt6StateMachinePrivate/Qt6StateMachinePrivateTargets.cmake +lib/cmake/Qt6StateMachinePrivate/Qt6StateMachinePrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6StateMachinePrivate/Qt6StateMachinePrivateVersionlessTargets.cmake lib/cmake/Qt6StateMachineQml/Qt6StateMachineQmlAdditionalTargetInfo.cmake lib/cmake/Qt6StateMachineQml/Qt6StateMachineQmlConfig.cmake lib/cmake/Qt6StateMachineQml/Qt6StateMachineQmlConfigVersion.cmake @@ -166,6 +200,14 @@ lib/cmake/Qt6StateMachineQml/Qt6StateMachineQmlTargets-%%CMAKE_BUILD_TYPE%%.cmak lib/cmake/Qt6StateMachineQml/Qt6StateMachineQmlTargets.cmake lib/cmake/Qt6StateMachineQml/Qt6StateMachineQmlVersionlessAliasTargets.cmake lib/cmake/Qt6StateMachineQml/Qt6StateMachineQmlVersionlessTargets.cmake +lib/cmake/Qt6StateMachineQmlPrivate/Qt6StateMachineQmlPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6StateMachineQmlPrivate/Qt6StateMachineQmlPrivateConfig.cmake +lib/cmake/Qt6StateMachineQmlPrivate/Qt6StateMachineQmlPrivateConfigVersion.cmake +lib/cmake/Qt6StateMachineQmlPrivate/Qt6StateMachineQmlPrivateConfigVersionImpl.cmake +lib/cmake/Qt6StateMachineQmlPrivate/Qt6StateMachineQmlPrivateDependencies.cmake +lib/cmake/Qt6StateMachineQmlPrivate/Qt6StateMachineQmlPrivateTargets.cmake +lib/cmake/Qt6StateMachineQmlPrivate/Qt6StateMachineQmlPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6StateMachineQmlPrivate/Qt6StateMachineQmlPrivateVersionlessTargets.cmake %%QT_LIBDIR%%/libQt6Scxml.prl %%QT_LIBDIR%%/libQt6Scxml.so %%QT_LIBDIR%%/libQt6Scxml.so.6 @@ -189,6 +231,7 @@ lib/cmake/Qt6StateMachineQml/Qt6StateMachineQmlVersionlessTargets.cmake %%QT_MKSPECDIR%%/features/qscxmlc.prf %%QT_MKSPECDIR%%/modules/qt_lib_scxml.pri %%QT_MKSPECDIR%%/modules/qt_lib_scxml_private.pri +%%QT_MKSPECDIR%%/modules/qt_lib_scxmlglobal_private.pri %%QT_MKSPECDIR%%/modules/qt_lib_scxmlqml.pri %%QT_MKSPECDIR%%/modules/qt_lib_scxmlqml_private.pri %%QT_MKSPECDIR%%/modules/qt_lib_statemachine.pri @@ -209,6 +252,7 @@ libdata/pkgconfig/Qt6StateMachine.pc libdata/pkgconfig/Qt6StateMachineQml.pc %%QT_LIBEXECDIR%%/qscxmlc %%QT_DATADIR%%/modules/Scxml.json +%%QT_DATADIR%%/modules/ScxmlGlobalPrivate.json %%QT_DATADIR%%/modules/ScxmlQml.json %%QT_DATADIR%%/modules/StateMachine.json %%QT_DATADIR%%/modules/StateMachineQml.json diff --git a/devel/qt6-tools/distinfo b/devel/qt6-tools/distinfo index 4f4bffa3c67c..0cf776c8577d 100644 --- a/devel/qt6-tools/distinfo +++ b/devel/qt6-tools/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1743027817 -SHA256 (KDE/Qt/6.8.3/qttools-everywhere-src-6.8.3.tar.xz) = 02a4e219248b94f1333df843d25763f35251c1074cdc4fb5bda67d340f8c8b3a -SIZE (KDE/Qt/6.8.3/qttools-everywhere-src-6.8.3.tar.xz) = 10301984 +TIMESTAMP = 1743708102 +SHA256 (KDE/Qt/6.9.0/qttools-everywhere-src-6.9.0.tar.xz) = fa645589cc3f939022401a926825972a44277dead8ec8607d9f2662e6529c9a4 +SIZE (KDE/Qt/6.9.0/qttools-everywhere-src-6.9.0.tar.xz) = 10326748 diff --git a/devel/qt6-tools/files/patch-configure.cmake b/devel/qt6-tools/files/patch-configure.cmake index 3fcd6e398037..e5d15fe0e715 100644 --- a/devel/qt6-tools/files/patch-configure.cmake +++ b/devel/qt6-tools/files/patch-configure.cmake @@ -15,13 +15,25 @@ Call Stack (most recent call first): Regressed by: https://code.qt.io/cgit/qt/qttools.git/commit/?h=6.6.0&id=ff5c080c2eb9267c43da6fafe953bf50076443c4 ---- configure.cmake.orig 2023-09-11 09:43:37 UTC +--- configure.cmake.orig 2025-02-19 09:54:25 UTC +++ configure.cmake -@@ -7,6 +7,7 @@ - - #### Libraries +@@ -1,6 +1,11 @@ + # Copyright (C) 2022 The Qt Company Ltd. + # SPDX-License-Identifier: BSD-3-Clause ++#### Libraries ++ +qt_find_package(WrapZSTD 1.3 PROVIDED_TARGETS WrapZSTD::WrapZSTD MODULE_NAME designer) ++ ++ + #### Tests + qt_find_package(WrapLibClang 8 PROVIDED_TARGETS WrapLibClang::WrapLibClang) +@@ -8,7 +13,6 @@ endif() + if(TARGET WrapLibClang::WrapLibClang) + set(TEST_libclang "ON" CACHE BOOL "Required libclang version found." FORCE) + endif() +- - #### Tests + + #### Features diff --git a/devel/qt6-tools/pkg-plist b/devel/qt6-tools/pkg-plist index b43594698111..07be5f73c227 100644 --- a/devel/qt6-tools/pkg-plist +++ b/devel/qt6-tools/pkg-plist @@ -228,6 +228,8 @@ bin/qtplugininfo6 %%QT_INCDIR%%/QtHelp/qhelpsearchresult.h %%QT_INCDIR%%/QtHelp/qhelpsearchresultwidget.h %%QT_INCDIR%%/QtHelp/qthelpversion.h +%%QT_INCDIR%%/QtHelp/ui_qfilternamedialog.h +%%QT_INCDIR%%/QtHelp/ui_qhelpfiltersettingswidget.h %%QT_INCDIR%%/QtQDocCatch/QtQDocCatchDepends %%QT_INCDIR%%/QtQDocCatch/catch/catch.hpp %%QT_INCDIR%%/QtQDocCatchConversions/QtQDocCatchConversionsDepends @@ -297,6 +299,14 @@ lib/cmake/Qt6DesignerComponentsPrivate/Qt6DesignerComponentsPrivateTargets-%%CMA lib/cmake/Qt6DesignerComponentsPrivate/Qt6DesignerComponentsPrivateTargets.cmake lib/cmake/Qt6DesignerComponentsPrivate/Qt6DesignerComponentsPrivateVersionlessAliasTargets.cmake lib/cmake/Qt6DesignerComponentsPrivate/Qt6DesignerComponentsPrivateVersionlessTargets.cmake +lib/cmake/Qt6DesignerPrivate/Qt6DesignerPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6DesignerPrivate/Qt6DesignerPrivateConfig.cmake +lib/cmake/Qt6DesignerPrivate/Qt6DesignerPrivateConfigVersion.cmake +lib/cmake/Qt6DesignerPrivate/Qt6DesignerPrivateConfigVersionImpl.cmake +lib/cmake/Qt6DesignerPrivate/Qt6DesignerPrivateDependencies.cmake +lib/cmake/Qt6DesignerPrivate/Qt6DesignerPrivateTargets.cmake +lib/cmake/Qt6DesignerPrivate/Qt6DesignerPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6DesignerPrivate/Qt6DesignerPrivateVersionlessTargets.cmake lib/cmake/Qt6Help/Qt6HelpAdditionalTargetInfo.cmake lib/cmake/Qt6Help/Qt6HelpConfig.cmake lib/cmake/Qt6Help/Qt6HelpConfigVersion.cmake @@ -307,6 +317,14 @@ lib/cmake/Qt6Help/Qt6HelpTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6Help/Qt6HelpTargets.cmake lib/cmake/Qt6Help/Qt6HelpVersionlessAliasTargets.cmake lib/cmake/Qt6Help/Qt6HelpVersionlessTargets.cmake +lib/cmake/Qt6HelpPrivate/Qt6HelpPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6HelpPrivate/Qt6HelpPrivateConfig.cmake +lib/cmake/Qt6HelpPrivate/Qt6HelpPrivateConfigVersion.cmake +lib/cmake/Qt6HelpPrivate/Qt6HelpPrivateConfigVersionImpl.cmake +lib/cmake/Qt6HelpPrivate/Qt6HelpPrivateDependencies.cmake +lib/cmake/Qt6HelpPrivate/Qt6HelpPrivateTargets.cmake +lib/cmake/Qt6HelpPrivate/Qt6HelpPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6HelpPrivate/Qt6HelpPrivateVersionlessTargets.cmake lib/cmake/Qt6Linguist/Qt6LinguistAdditionalTargetInfo.cmake lib/cmake/Qt6Linguist/Qt6LinguistConfig.cmake lib/cmake/Qt6Linguist/Qt6LinguistConfigVersion.cmake @@ -379,6 +397,14 @@ lib/cmake/Qt6UiTools/Qt6UiToolsTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6UiTools/Qt6UiToolsTargets.cmake lib/cmake/Qt6UiTools/Qt6UiToolsVersionlessAliasTargets.cmake lib/cmake/Qt6UiTools/Qt6UiToolsVersionlessTargets.cmake +lib/cmake/Qt6UiToolsPrivate/Qt6UiToolsPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6UiToolsPrivate/Qt6UiToolsPrivateConfig.cmake +lib/cmake/Qt6UiToolsPrivate/Qt6UiToolsPrivateConfigVersion.cmake +lib/cmake/Qt6UiToolsPrivate/Qt6UiToolsPrivateConfigVersionImpl.cmake +lib/cmake/Qt6UiToolsPrivate/Qt6UiToolsPrivateDependencies.cmake +lib/cmake/Qt6UiToolsPrivate/Qt6UiToolsPrivateTargets.cmake +lib/cmake/Qt6UiToolsPrivate/Qt6UiToolsPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6UiToolsPrivate/Qt6UiToolsPrivateVersionlessTargets.cmake %%QT_BINDIR%%/assistant %%QT_BINDIR%%/designer %%QT_BINDIR%%/lconvert diff --git a/devel/qt6-translations/distinfo b/devel/qt6-translations/distinfo index 2a2c0176489d..1ebf0eeea101 100644 --- a/devel/qt6-translations/distinfo +++ b/devel/qt6-translations/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1743027818 -SHA256 (KDE/Qt/6.8.3/qttranslations-everywhere-src-6.8.3.tar.xz) = c3c61d79c3d8fe316a20b3617c64673ce5b5519b2e45535f49bee313152fa531 -SIZE (KDE/Qt/6.8.3/qttranslations-everywhere-src-6.8.3.tar.xz) = 1577680 +TIMESTAMP = 1743708107 +SHA256 (KDE/Qt/6.9.0/qttranslations-everywhere-src-6.9.0.tar.xz) = 1d5581ef5fc7c7bc556f2403017983683993bbebfcdf977ef8f180f604668c3f +SIZE (KDE/Qt/6.9.0/qttranslations-everywhere-src-6.9.0.tar.xz) = 1554044 diff --git a/devel/qt6-translations/pkg-plist b/devel/qt6-translations/pkg-plist index efd426236584..18cc51882b87 100644 --- a/devel/qt6-translations/pkg-plist +++ b/devel/qt6-translations/pkg-plist @@ -116,7 +116,6 @@ %%QT_L10NDIR%%/qt_ja.qm %%QT_L10NDIR%%/qt_ka.qm %%QT_L10NDIR%%/qt_ko.qm -%%QT_L10NDIR%%/qt_lg.qm %%QT_L10NDIR%%/qt_lt.qm %%QT_L10NDIR%%/qt_lv.qm %%QT_L10NDIR%%/qt_nl.qm @@ -151,7 +150,6 @@ %%QT_L10NDIR%%/qtbase_ja.qm %%QT_L10NDIR%%/qtbase_ka.qm %%QT_L10NDIR%%/qtbase_ko.qm -%%QT_L10NDIR%%/qtbase_lg.qm %%QT_L10NDIR%%/qtbase_lv.qm %%QT_L10NDIR%%/qtbase_nl.qm %%QT_L10NDIR%%/qtbase_nn.qm diff --git a/devel/qt6/Makefile b/devel/qt6/Makefile index c4e795320e42..d60e153214e5 100644 --- a/devel/qt6/Makefile +++ b/devel/qt6/Makefile @@ -9,4 +9,11 @@ WWW= https://www.qt.io/ USES= metaport qt:6 USE_QT= ${_USE_QT_ALL:S/$/:run/} +# Generate distinfo for all Qt components +makesum: + @for component in $$(${MAKE} -V_USE_QT_ALL); do \ + port=$$(${MAKE} -Vqt-$${component}_PORT | ${SED} -e 's|@.*$$||'); \ + ${MAKE} -C ${.CURDIR:H:H}/$${port} makesum; \ + done + .include diff --git a/devel/shiboken6/distinfo b/devel/shiboken6/distinfo index ca5e0d182e35..e465a38b7dca 100644 --- a/devel/shiboken6/distinfo +++ b/devel/shiboken6/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1743103533 -SHA256 (KDE/Qt/6.8.3/pyside-setup-everywhere-src-6.8.3.tar.xz) = d2c896f7f1a6a7ea4c9f98cfe317272fd139703ddf612b86999f09e48aeef0e6 -SIZE (KDE/Qt/6.8.3/pyside-setup-everywhere-src-6.8.3.tar.xz) = 16611768 +TIMESTAMP = 1743707727 +SHA256 (KDE/Qt/6.9.0/pyside-setup-everywhere-src-6.9.0.tar.xz) = 315b73bb7570d5b9e6793a8d3fafd1d2dd7f43d35eebb01d2b554ea206aad88e +SIZE (KDE/Qt/6.9.0/pyside-setup-everywhere-src-6.9.0.tar.xz) = 16652756 diff --git a/devel/shiboken6/pkg-plist b/devel/shiboken6/pkg-plist index 4648ae51d5a5..9d0fd69b2f19 100644 --- a/devel/shiboken6/pkg-plist +++ b/devel/shiboken6/pkg-plist @@ -10,6 +10,7 @@ include/shiboken6/pep384ext.h include/shiboken6/pep384impl.h include/shiboken6/pyobjectholder.h include/shiboken6/sbkarrayconverter.h +include/shiboken6/sbkbindingutils.h include/shiboken6/sbkcontainer.h include/shiboken6/sbkconverter.h include/shiboken6/sbkcppstring.h diff --git a/graphics/py-qt6-3d/distinfo b/graphics/py-qt6-3d/distinfo index 8b6fccffefd7..bacf12192d09 100644 --- a/graphics/py-qt6-3d/distinfo +++ b/graphics/py-qt6-3d/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1733628639 -SHA256 (PyQt6_3D-6.8.0.tar.gz) = f62790a787cfc99fcd84c774fa952b83c877dd2175355a3a6609d37fe1a1c7a3 -SIZE (PyQt6_3D-6.8.0.tar.gz) = 7469509 +TIMESTAMP = 1743732519 +SHA256 (pyqt6_3d-6.9.0.tar.gz) = af4b497e34f30e8dba53da2f2683e82994bc6d6f512fb7a91c3150aa31b6d49a +SIZE (pyqt6_3d-6.9.0.tar.gz) = 7469403 diff --git a/graphics/qt6-3d/distinfo b/graphics/qt6-3d/distinfo index 71a862ac7676..7c7ac27d49c9 100644 --- a/graphics/qt6-3d/distinfo +++ b/graphics/qt6-3d/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1743027820 -SHA256 (KDE/Qt/6.8.3/qt3d-everywhere-src-6.8.3.tar.xz) = 095e1be77ffd4b158d9e57f16ee898caf7d0d6e5406f466d9d8315d5b1e79563 -SIZE (KDE/Qt/6.8.3/qt3d-everywhere-src-6.8.3.tar.xz) = 141825440 +TIMESTAMP = 1743708191 +SHA256 (KDE/Qt/6.9.0/qt3d-everywhere-src-6.9.0.tar.xz) = 521dd56d40873d37b2dd9ca95181037b833a07c48aed5db44efcba83a4716cc2 +SIZE (KDE/Qt/6.9.0/qt3d-everywhere-src-6.9.0.tar.xz) = 141826404 diff --git a/graphics/qt6-3d/pkg-plist b/graphics/qt6-3d/pkg-plist index 17056fefcc4e..f6812081ba1c 100644 --- a/graphics/qt6-3d/pkg-plist +++ b/graphics/qt6-3d/pkg-plist @@ -1118,6 +1118,14 @@ lib/cmake/Qt63DAnimation/Qt63DAnimationTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt63DAnimation/Qt63DAnimationTargets.cmake lib/cmake/Qt63DAnimation/Qt63DAnimationVersionlessAliasTargets.cmake lib/cmake/Qt63DAnimation/Qt63DAnimationVersionlessTargets.cmake +lib/cmake/Qt63DAnimationPrivate/Qt63DAnimationPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt63DAnimationPrivate/Qt63DAnimationPrivateConfig.cmake +lib/cmake/Qt63DAnimationPrivate/Qt63DAnimationPrivateConfigVersion.cmake +lib/cmake/Qt63DAnimationPrivate/Qt63DAnimationPrivateConfigVersionImpl.cmake +lib/cmake/Qt63DAnimationPrivate/Qt63DAnimationPrivateDependencies.cmake +lib/cmake/Qt63DAnimationPrivate/Qt63DAnimationPrivateTargets.cmake +lib/cmake/Qt63DAnimationPrivate/Qt63DAnimationPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt63DAnimationPrivate/Qt63DAnimationPrivateVersionlessTargets.cmake lib/cmake/Qt63DCore/Qt63DCoreAdditionalTargetInfo.cmake lib/cmake/Qt63DCore/Qt63DCoreConfig.cmake lib/cmake/Qt63DCore/Qt63DCoreConfigVersion.cmake @@ -1127,6 +1135,14 @@ lib/cmake/Qt63DCore/Qt63DCoreTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt63DCore/Qt63DCoreTargets.cmake lib/cmake/Qt63DCore/Qt63DCoreVersionlessAliasTargets.cmake lib/cmake/Qt63DCore/Qt63DCoreVersionlessTargets.cmake +lib/cmake/Qt63DCorePrivate/Qt63DCorePrivateAdditionalTargetInfo.cmake +lib/cmake/Qt63DCorePrivate/Qt63DCorePrivateConfig.cmake +lib/cmake/Qt63DCorePrivate/Qt63DCorePrivateConfigVersion.cmake +lib/cmake/Qt63DCorePrivate/Qt63DCorePrivateConfigVersionImpl.cmake +lib/cmake/Qt63DCorePrivate/Qt63DCorePrivateDependencies.cmake +lib/cmake/Qt63DCorePrivate/Qt63DCorePrivateTargets.cmake +lib/cmake/Qt63DCorePrivate/Qt63DCorePrivateVersionlessAliasTargets.cmake +lib/cmake/Qt63DCorePrivate/Qt63DCorePrivateVersionlessTargets.cmake lib/cmake/Qt63DExtras/Qt63DExtrasAdditionalTargetInfo.cmake lib/cmake/Qt63DExtras/Qt63DExtrasConfig.cmake lib/cmake/Qt63DExtras/Qt63DExtrasConfigVersion.cmake @@ -1136,6 +1152,14 @@ lib/cmake/Qt63DExtras/Qt63DExtrasTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt63DExtras/Qt63DExtrasTargets.cmake lib/cmake/Qt63DExtras/Qt63DExtrasVersionlessAliasTargets.cmake lib/cmake/Qt63DExtras/Qt63DExtrasVersionlessTargets.cmake +lib/cmake/Qt63DExtrasPrivate/Qt63DExtrasPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt63DExtrasPrivate/Qt63DExtrasPrivateConfig.cmake +lib/cmake/Qt63DExtrasPrivate/Qt63DExtrasPrivateConfigVersion.cmake +lib/cmake/Qt63DExtrasPrivate/Qt63DExtrasPrivateConfigVersionImpl.cmake +lib/cmake/Qt63DExtrasPrivate/Qt63DExtrasPrivateDependencies.cmake +lib/cmake/Qt63DExtrasPrivate/Qt63DExtrasPrivateTargets.cmake +lib/cmake/Qt63DExtrasPrivate/Qt63DExtrasPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt63DExtrasPrivate/Qt63DExtrasPrivateVersionlessTargets.cmake lib/cmake/Qt63DInput/Qt63DInputAdditionalTargetInfo.cmake lib/cmake/Qt63DInput/Qt63DInputConfig.cmake lib/cmake/Qt63DInput/Qt63DInputConfigVersion.cmake @@ -1146,6 +1170,14 @@ lib/cmake/Qt63DInput/Qt63DInputTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt63DInput/Qt63DInputTargets.cmake lib/cmake/Qt63DInput/Qt63DInputVersionlessAliasTargets.cmake lib/cmake/Qt63DInput/Qt63DInputVersionlessTargets.cmake +lib/cmake/Qt63DInputPrivate/Qt63DInputPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt63DInputPrivate/Qt63DInputPrivateConfig.cmake +lib/cmake/Qt63DInputPrivate/Qt63DInputPrivateConfigVersion.cmake +lib/cmake/Qt63DInputPrivate/Qt63DInputPrivateConfigVersionImpl.cmake +lib/cmake/Qt63DInputPrivate/Qt63DInputPrivateDependencies.cmake +lib/cmake/Qt63DInputPrivate/Qt63DInputPrivateTargets.cmake +lib/cmake/Qt63DInputPrivate/Qt63DInputPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt63DInputPrivate/Qt63DInputPrivateVersionlessTargets.cmake lib/cmake/Qt63DLogic/Qt63DLogicAdditionalTargetInfo.cmake lib/cmake/Qt63DLogic/Qt63DLogicConfig.cmake lib/cmake/Qt63DLogic/Qt63DLogicConfigVersion.cmake @@ -1155,6 +1187,14 @@ lib/cmake/Qt63DLogic/Qt63DLogicTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt63DLogic/Qt63DLogicTargets.cmake lib/cmake/Qt63DLogic/Qt63DLogicVersionlessAliasTargets.cmake lib/cmake/Qt63DLogic/Qt63DLogicVersionlessTargets.cmake +lib/cmake/Qt63DLogicPrivate/Qt63DLogicPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt63DLogicPrivate/Qt63DLogicPrivateConfig.cmake +lib/cmake/Qt63DLogicPrivate/Qt63DLogicPrivateConfigVersion.cmake +lib/cmake/Qt63DLogicPrivate/Qt63DLogicPrivateConfigVersionImpl.cmake +lib/cmake/Qt63DLogicPrivate/Qt63DLogicPrivateDependencies.cmake +lib/cmake/Qt63DLogicPrivate/Qt63DLogicPrivateTargets.cmake +lib/cmake/Qt63DLogicPrivate/Qt63DLogicPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt63DLogicPrivate/Qt63DLogicPrivateVersionlessTargets.cmake lib/cmake/Qt63DQuick/Qt63DQuickAdditionalTargetInfo.cmake lib/cmake/Qt63DQuick/Qt63DQuickConfig.cmake lib/cmake/Qt63DQuick/Qt63DQuickConfigVersion.cmake @@ -1173,6 +1213,14 @@ lib/cmake/Qt63DQuickAnimation/Qt63DQuickAnimationTargets-%%CMAKE_BUILD_TYPE%%.cm lib/cmake/Qt63DQuickAnimation/Qt63DQuickAnimationTargets.cmake lib/cmake/Qt63DQuickAnimation/Qt63DQuickAnimationVersionlessAliasTargets.cmake lib/cmake/Qt63DQuickAnimation/Qt63DQuickAnimationVersionlessTargets.cmake +lib/cmake/Qt63DQuickAnimationPrivate/Qt63DQuickAnimationPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt63DQuickAnimationPrivate/Qt63DQuickAnimationPrivateConfig.cmake +lib/cmake/Qt63DQuickAnimationPrivate/Qt63DQuickAnimationPrivateConfigVersion.cmake +lib/cmake/Qt63DQuickAnimationPrivate/Qt63DQuickAnimationPrivateConfigVersionImpl.cmake +lib/cmake/Qt63DQuickAnimationPrivate/Qt63DQuickAnimationPrivateDependencies.cmake +lib/cmake/Qt63DQuickAnimationPrivate/Qt63DQuickAnimationPrivateTargets.cmake +lib/cmake/Qt63DQuickAnimationPrivate/Qt63DQuickAnimationPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt63DQuickAnimationPrivate/Qt63DQuickAnimationPrivateVersionlessTargets.cmake lib/cmake/Qt63DQuickExtras/Qt63DQuickExtrasAdditionalTargetInfo.cmake lib/cmake/Qt63DQuickExtras/Qt63DQuickExtrasConfig.cmake lib/cmake/Qt63DQuickExtras/Qt63DQuickExtrasConfigVersion.cmake @@ -1182,6 +1230,14 @@ lib/cmake/Qt63DQuickExtras/Qt63DQuickExtrasTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt63DQuickExtras/Qt63DQuickExtrasTargets.cmake lib/cmake/Qt63DQuickExtras/Qt63DQuickExtrasVersionlessAliasTargets.cmake lib/cmake/Qt63DQuickExtras/Qt63DQuickExtrasVersionlessTargets.cmake +lib/cmake/Qt63DQuickExtrasPrivate/Qt63DQuickExtrasPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt63DQuickExtrasPrivate/Qt63DQuickExtrasPrivateConfig.cmake +lib/cmake/Qt63DQuickExtrasPrivate/Qt63DQuickExtrasPrivateConfigVersion.cmake +lib/cmake/Qt63DQuickExtrasPrivate/Qt63DQuickExtrasPrivateConfigVersionImpl.cmake +lib/cmake/Qt63DQuickExtrasPrivate/Qt63DQuickExtrasPrivateDependencies.cmake +lib/cmake/Qt63DQuickExtrasPrivate/Qt63DQuickExtrasPrivateTargets.cmake +lib/cmake/Qt63DQuickExtrasPrivate/Qt63DQuickExtrasPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt63DQuickExtrasPrivate/Qt63DQuickExtrasPrivateVersionlessTargets.cmake lib/cmake/Qt63DQuickInput/Qt63DQuickInputAdditionalTargetInfo.cmake lib/cmake/Qt63DQuickInput/Qt63DQuickInputConfig.cmake lib/cmake/Qt63DQuickInput/Qt63DQuickInputConfigVersion.cmake @@ -1191,6 +1247,22 @@ lib/cmake/Qt63DQuickInput/Qt63DQuickInputTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt63DQuickInput/Qt63DQuickInputTargets.cmake lib/cmake/Qt63DQuickInput/Qt63DQuickInputVersionlessAliasTargets.cmake lib/cmake/Qt63DQuickInput/Qt63DQuickInputVersionlessTargets.cmake +lib/cmake/Qt63DQuickInputPrivate/Qt63DQuickInputPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt63DQuickInputPrivate/Qt63DQuickInputPrivateConfig.cmake +lib/cmake/Qt63DQuickInputPrivate/Qt63DQuickInputPrivateConfigVersion.cmake +lib/cmake/Qt63DQuickInputPrivate/Qt63DQuickInputPrivateConfigVersionImpl.cmake +lib/cmake/Qt63DQuickInputPrivate/Qt63DQuickInputPrivateDependencies.cmake +lib/cmake/Qt63DQuickInputPrivate/Qt63DQuickInputPrivateTargets.cmake +lib/cmake/Qt63DQuickInputPrivate/Qt63DQuickInputPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt63DQuickInputPrivate/Qt63DQuickInputPrivateVersionlessTargets.cmake +lib/cmake/Qt63DQuickPrivate/Qt63DQuickPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt63DQuickPrivate/Qt63DQuickPrivateConfig.cmake +lib/cmake/Qt63DQuickPrivate/Qt63DQuickPrivateConfigVersion.cmake +lib/cmake/Qt63DQuickPrivate/Qt63DQuickPrivateConfigVersionImpl.cmake +lib/cmake/Qt63DQuickPrivate/Qt63DQuickPrivateDependencies.cmake +lib/cmake/Qt63DQuickPrivate/Qt63DQuickPrivateTargets.cmake +lib/cmake/Qt63DQuickPrivate/Qt63DQuickPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt63DQuickPrivate/Qt63DQuickPrivateVersionlessTargets.cmake lib/cmake/Qt63DQuickRender/Qt63DQuickRenderAdditionalTargetInfo.cmake lib/cmake/Qt63DQuickRender/Qt63DQuickRenderConfig.cmake lib/cmake/Qt63DQuickRender/Qt63DQuickRenderConfigVersion.cmake @@ -1200,6 +1272,14 @@ lib/cmake/Qt63DQuickRender/Qt63DQuickRenderTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt63DQuickRender/Qt63DQuickRenderTargets.cmake lib/cmake/Qt63DQuickRender/Qt63DQuickRenderVersionlessAliasTargets.cmake lib/cmake/Qt63DQuickRender/Qt63DQuickRenderVersionlessTargets.cmake +lib/cmake/Qt63DQuickRenderPrivate/Qt63DQuickRenderPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt63DQuickRenderPrivate/Qt63DQuickRenderPrivateConfig.cmake +lib/cmake/Qt63DQuickRenderPrivate/Qt63DQuickRenderPrivateConfigVersion.cmake +lib/cmake/Qt63DQuickRenderPrivate/Qt63DQuickRenderPrivateConfigVersionImpl.cmake +lib/cmake/Qt63DQuickRenderPrivate/Qt63DQuickRenderPrivateDependencies.cmake +lib/cmake/Qt63DQuickRenderPrivate/Qt63DQuickRenderPrivateTargets.cmake +lib/cmake/Qt63DQuickRenderPrivate/Qt63DQuickRenderPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt63DQuickRenderPrivate/Qt63DQuickRenderPrivateVersionlessTargets.cmake lib/cmake/Qt63DQuickScene2D/Qt63DQuickScene2DAdditionalTargetInfo.cmake lib/cmake/Qt63DQuickScene2D/Qt63DQuickScene2DConfig.cmake lib/cmake/Qt63DQuickScene2D/Qt63DQuickScene2DConfigVersion.cmake @@ -1209,6 +1289,14 @@ lib/cmake/Qt63DQuickScene2D/Qt63DQuickScene2DTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt63DQuickScene2D/Qt63DQuickScene2DTargets.cmake lib/cmake/Qt63DQuickScene2D/Qt63DQuickScene2DVersionlessAliasTargets.cmake lib/cmake/Qt63DQuickScene2D/Qt63DQuickScene2DVersionlessTargets.cmake +lib/cmake/Qt63DQuickScene2DPrivate/Qt63DQuickScene2DPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt63DQuickScene2DPrivate/Qt63DQuickScene2DPrivateConfig.cmake +lib/cmake/Qt63DQuickScene2DPrivate/Qt63DQuickScene2DPrivateConfigVersion.cmake +lib/cmake/Qt63DQuickScene2DPrivate/Qt63DQuickScene2DPrivateConfigVersionImpl.cmake +lib/cmake/Qt63DQuickScene2DPrivate/Qt63DQuickScene2DPrivateDependencies.cmake +lib/cmake/Qt63DQuickScene2DPrivate/Qt63DQuickScene2DPrivateTargets.cmake +lib/cmake/Qt63DQuickScene2DPrivate/Qt63DQuickScene2DPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt63DQuickScene2DPrivate/Qt63DQuickScene2DPrivateVersionlessTargets.cmake lib/cmake/Qt63DQuickScene3D/Qt63DQuickScene3DAdditionalTargetInfo.cmake lib/cmake/Qt63DQuickScene3D/Qt63DQuickScene3DConfig.cmake lib/cmake/Qt63DQuickScene3D/Qt63DQuickScene3DConfigVersion.cmake @@ -1218,6 +1306,14 @@ lib/cmake/Qt63DQuickScene3D/Qt63DQuickScene3DTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt63DQuickScene3D/Qt63DQuickScene3DTargets.cmake lib/cmake/Qt63DQuickScene3D/Qt63DQuickScene3DVersionlessAliasTargets.cmake lib/cmake/Qt63DQuickScene3D/Qt63DQuickScene3DVersionlessTargets.cmake +lib/cmake/Qt63DQuickScene3DPrivate/Qt63DQuickScene3DPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt63DQuickScene3DPrivate/Qt63DQuickScene3DPrivateConfig.cmake +lib/cmake/Qt63DQuickScene3DPrivate/Qt63DQuickScene3DPrivateConfigVersion.cmake +lib/cmake/Qt63DQuickScene3DPrivate/Qt63DQuickScene3DPrivateConfigVersionImpl.cmake +lib/cmake/Qt63DQuickScene3DPrivate/Qt63DQuickScene3DPrivateDependencies.cmake +lib/cmake/Qt63DQuickScene3DPrivate/Qt63DQuickScene3DPrivateTargets.cmake +lib/cmake/Qt63DQuickScene3DPrivate/Qt63DQuickScene3DPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt63DQuickScene3DPrivate/Qt63DQuickScene3DPrivateVersionlessTargets.cmake lib/cmake/Qt63DRender/Qt63DRenderAdditionalTargetInfo.cmake lib/cmake/Qt63DRender/Qt63DRenderConfig.cmake lib/cmake/Qt63DRender/Qt63DRenderConfigVersion.cmake @@ -1276,6 +1372,14 @@ lib/cmake/Qt63DRender/Qt6Scene2DPluginConfigVersion.cmake lib/cmake/Qt63DRender/Qt6Scene2DPluginConfigVersionImpl.cmake lib/cmake/Qt63DRender/Qt6Scene2DPluginTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt63DRender/Qt6Scene2DPluginTargets.cmake +lib/cmake/Qt63DRenderPrivate/Qt63DRenderPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt63DRenderPrivate/Qt63DRenderPrivateConfig.cmake +lib/cmake/Qt63DRenderPrivate/Qt63DRenderPrivateConfigVersion.cmake +lib/cmake/Qt63DRenderPrivate/Qt63DRenderPrivateConfigVersionImpl.cmake +lib/cmake/Qt63DRenderPrivate/Qt63DRenderPrivateDependencies.cmake +lib/cmake/Qt63DRenderPrivate/Qt63DRenderPrivateTargets.cmake +lib/cmake/Qt63DRenderPrivate/Qt63DRenderPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt63DRenderPrivate/Qt63DRenderPrivateVersionlessTargets.cmake lib/cmake/Qt6BuildInternals/StandaloneTests/Qt3DTestsConfig.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6qtquickscene2dpluginAdditionalTargetInfo.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6qtquickscene2dpluginConfig.cmake diff --git a/graphics/qt6-imageformats/distinfo b/graphics/qt6-imageformats/distinfo index 8a22165874ed..b621bbf574f4 100644 --- a/graphics/qt6-imageformats/distinfo +++ b/graphics/qt6-imageformats/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1743027821 -SHA256 (KDE/Qt/6.8.3/qtimageformats-everywhere-src-6.8.3.tar.xz) = 049bfb99845e4801672aca07c3c4fc4c140f932a3a33faa899419579e33ef1c8 -SIZE (KDE/Qt/6.8.3/qtimageformats-everywhere-src-6.8.3.tar.xz) = 2035140 +TIMESTAMP = 1743708197 +SHA256 (KDE/Qt/6.9.0/qtimageformats-everywhere-src-6.9.0.tar.xz) = 2047c6242a57bf97cf40079fa9f91752c137cd9ae84760faa9a2e5e8a440606f +SIZE (KDE/Qt/6.9.0/qtimageformats-everywhere-src-6.9.0.tar.xz) = 2039800 diff --git a/graphics/qt6-lottie/distinfo b/graphics/qt6-lottie/distinfo index 640bfd5c085d..0085d7d5caf4 100644 --- a/graphics/qt6-lottie/distinfo +++ b/graphics/qt6-lottie/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1743027822 -SHA256 (KDE/Qt/6.8.3/qtlottie-everywhere-src-6.8.3.tar.xz) = d732e754497a1295c4f512312828a11551fe89433259af9ee9f1e62bb7263d24 -SIZE (KDE/Qt/6.8.3/qtlottie-everywhere-src-6.8.3.tar.xz) = 86104 +TIMESTAMP = 1743708199 +SHA256 (KDE/Qt/6.9.0/qtlottie-everywhere-src-6.9.0.tar.xz) = d4ba1614a587a279266036b1b08ac854718458fdd39708b37afde74f0b4afabe +SIZE (KDE/Qt/6.9.0/qtlottie-everywhere-src-6.9.0.tar.xz) = 99180 diff --git a/graphics/qt6-lottie/pkg-plist b/graphics/qt6-lottie/pkg-plist index 8dda40ef49b5..beb7b10e57ee 100644 --- a/graphics/qt6-lottie/pkg-plist +++ b/graphics/qt6-lottie/pkg-plist @@ -12,6 +12,7 @@ %%QT_INCDIR%%/QtBodymovin/%%FULLVER%%/QtBodymovin/private/bmimagelayer_p.h %%QT_INCDIR%%/QtBodymovin/%%FULLVER%%/QtBodymovin/private/bmlayer_p.h %%QT_INCDIR%%/QtBodymovin/%%FULLVER%%/QtBodymovin/private/bmpathtrimmer_p.h +%%QT_INCDIR%%/QtBodymovin/%%FULLVER%%/QtBodymovin/private/bmpolystar_p.h %%QT_INCDIR%%/QtBodymovin/%%FULLVER%%/QtBodymovin/private/bmproperty_p.h %%QT_INCDIR%%/QtBodymovin/%%FULLVER%%/QtBodymovin/private/bmrect_p.h %%QT_INCDIR%%/QtBodymovin/%%FULLVER%%/QtBodymovin/private/bmrepeater_p.h diff --git a/graphics/qt6-quickeffectmaker/distinfo b/graphics/qt6-quickeffectmaker/distinfo index b3ce55f962a0..2264c7f48493 100644 --- a/graphics/qt6-quickeffectmaker/distinfo +++ b/graphics/qt6-quickeffectmaker/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1743027823 -SHA256 (KDE/Qt/6.8.3/qtquickeffectmaker-everywhere-src-6.8.3.tar.xz) = cff4818ea0de7d1e0b9ab221faca6266d328dd97aa79bf9f0085390cac4dba07 -SIZE (KDE/Qt/6.8.3/qtquickeffectmaker-everywhere-src-6.8.3.tar.xz) = 4350080 +TIMESTAMP = 1743708205 +SHA256 (KDE/Qt/6.9.0/qtquickeffectmaker-everywhere-src-6.9.0.tar.xz) = 916213e4ca38e1a65949686dcf0139d81faf4f4619e3b68eb893c5f0065071aa +SIZE (KDE/Qt/6.9.0/qtquickeffectmaker-everywhere-src-6.9.0.tar.xz) = 4358544 diff --git a/graphics/qt6-quickeffectmaker/pkg-plist b/graphics/qt6-quickeffectmaker/pkg-plist index acd6e0a55dad..eca68c74fdbf 100644 --- a/graphics/qt6-quickeffectmaker/pkg-plist +++ b/graphics/qt6-quickeffectmaker/pkg-plist @@ -33,6 +33,7 @@ %%QT_QMLDIR%%/QtQuickEffectMaker/defaultnodes/extra/ledscreen.qen %%QT_QMLDIR%%/QtQuickEffectMaker/defaultnodes/extra/maskedblur.qen %%QT_QMLDIR%%/QtQuickEffectMaker/defaultnodes/extra/normalmapping.qen +%%QT_QMLDIR%%/QtQuickEffectMaker/defaultnodes/extra/rectangularshadow.qen %%QT_QMLDIR%%/QtQuickEffectMaker/defaultnodes/extra/spriteanimation.qen %%QT_QMLDIR%%/QtQuickEffectMaker/defaultnodes/extra/sunburst.qen %%QT_QMLDIR%%/QtQuickEffectMaker/defaultnodes/extra/swirl.qen diff --git a/graphics/qt6-svg/distinfo b/graphics/qt6-svg/distinfo index ab2172d69665..c2e56ccdb4fe 100644 --- a/graphics/qt6-svg/distinfo +++ b/graphics/qt6-svg/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1743027824 -SHA256 (KDE/Qt/6.8.3/qtsvg-everywhere-src-6.8.3.tar.xz) = 35eb516460f00f264eb504baa253432384351cf23fb9980a5857190e8deef438 -SIZE (KDE/Qt/6.8.3/qtsvg-everywhere-src-6.8.3.tar.xz) = 2009072 +TIMESTAMP = 1743708210 +SHA256 (KDE/Qt/6.9.0/qtsvg-everywhere-src-6.9.0.tar.xz) = ec359d930c95935ea48af58b100c2f5d0d275968ec8ca1e0e76629b7159215fc +SIZE (KDE/Qt/6.9.0/qtsvg-everywhere-src-6.9.0.tar.xz) = 2017172 diff --git a/graphics/qt6-svg/pkg-plist b/graphics/qt6-svg/pkg-plist index 84f3f750ed3f..555a68674ab3 100644 --- a/graphics/qt6-svg/pkg-plist +++ b/graphics/qt6-svg/pkg-plist @@ -1,3 +1,9 @@ +%%QT_INCDIR%%/QtSvg/%%FULLVER%%/QtSvg/private/qsvgabstractanimation_p.h +%%QT_INCDIR%%/QtSvg/%%FULLVER%%/QtSvg/private/qsvganimate_p.h +%%QT_INCDIR%%/QtSvg/%%FULLVER%%/QtSvg/private/qsvganimatedproperty_p.h +%%QT_INCDIR%%/QtSvg/%%FULLVER%%/QtSvg/private/qsvganimator_p.h +%%QT_INCDIR%%/QtSvg/%%FULLVER%%/QtSvg/private/qsvgcssanimation_p.h +%%QT_INCDIR%%/QtSvg/%%FULLVER%%/QtSvg/private/qsvgcsshandler_p.h %%QT_INCDIR%%/QtSvg/%%FULLVER%%/QtSvg/private/qsvgfilter_p.h %%QT_INCDIR%%/QtSvg/%%FULLVER%%/QtSvg/private/qsvgfont_p.h %%QT_INCDIR%%/QtSvg/%%FULLVER%%/QtSvg/private/qsvggraphics_p.h @@ -7,6 +13,7 @@ %%QT_INCDIR%%/QtSvg/%%FULLVER%%/QtSvg/private/qsvgstructure_p.h %%QT_INCDIR%%/QtSvg/%%FULLVER%%/QtSvg/private/qsvgstyle_p.h %%QT_INCDIR%%/QtSvg/%%FULLVER%%/QtSvg/private/qsvgtinydocument_p.h +%%QT_INCDIR%%/QtSvg/%%FULLVER%%/QtSvg/private/qsvgutils_p.h %%QT_INCDIR%%/QtSvg/%%FULLVER%%/QtSvg/private/qsvgvisitor_p.h %%QT_INCDIR%%/QtSvg/%%FULLVER%%/QtSvg/private/qtsvgglobal_p.h %%QT_INCDIR%%/QtSvg/QSvgGenerator @@ -51,6 +58,14 @@ lib/cmake/Qt6Svg/Qt6SvgTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6Svg/Qt6SvgTargets.cmake lib/cmake/Qt6Svg/Qt6SvgVersionlessAliasTargets.cmake lib/cmake/Qt6Svg/Qt6SvgVersionlessTargets.cmake +lib/cmake/Qt6SvgPrivate/Qt6SvgPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6SvgPrivate/Qt6SvgPrivateConfig.cmake +lib/cmake/Qt6SvgPrivate/Qt6SvgPrivateConfigVersion.cmake +lib/cmake/Qt6SvgPrivate/Qt6SvgPrivateConfigVersionImpl.cmake +lib/cmake/Qt6SvgPrivate/Qt6SvgPrivateDependencies.cmake +lib/cmake/Qt6SvgPrivate/Qt6SvgPrivateTargets.cmake +lib/cmake/Qt6SvgPrivate/Qt6SvgPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6SvgPrivate/Qt6SvgPrivateVersionlessTargets.cmake lib/cmake/Qt6SvgWidgets/Qt6SvgWidgetsAdditionalTargetInfo.cmake lib/cmake/Qt6SvgWidgets/Qt6SvgWidgetsConfig.cmake lib/cmake/Qt6SvgWidgets/Qt6SvgWidgetsConfigVersion.cmake @@ -60,6 +75,14 @@ lib/cmake/Qt6SvgWidgets/Qt6SvgWidgetsTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6SvgWidgets/Qt6SvgWidgetsTargets.cmake lib/cmake/Qt6SvgWidgets/Qt6SvgWidgetsVersionlessAliasTargets.cmake lib/cmake/Qt6SvgWidgets/Qt6SvgWidgetsVersionlessTargets.cmake +lib/cmake/Qt6SvgWidgetsPrivate/Qt6SvgWidgetsPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6SvgWidgetsPrivate/Qt6SvgWidgetsPrivateConfig.cmake +lib/cmake/Qt6SvgWidgetsPrivate/Qt6SvgWidgetsPrivateConfigVersion.cmake +lib/cmake/Qt6SvgWidgetsPrivate/Qt6SvgWidgetsPrivateConfigVersionImpl.cmake +lib/cmake/Qt6SvgWidgetsPrivate/Qt6SvgWidgetsPrivateDependencies.cmake +lib/cmake/Qt6SvgWidgetsPrivate/Qt6SvgWidgetsPrivateTargets.cmake +lib/cmake/Qt6SvgWidgetsPrivate/Qt6SvgWidgetsPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6SvgWidgetsPrivate/Qt6SvgWidgetsPrivateVersionlessTargets.cmake %%QT_LIBDIR%%/libQt6Svg.prl %%QT_LIBDIR%%/libQt6Svg.so %%QT_LIBDIR%%/libQt6Svg.so.6 diff --git a/graphics/qt6-wayland/distinfo b/graphics/qt6-wayland/distinfo index 56feec3c1381..6c886578755d 100644 --- a/graphics/qt6-wayland/distinfo +++ b/graphics/qt6-wayland/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1743027825 -SHA256 (KDE/Qt/6.8.3/qtwayland-everywhere-src-6.8.3.tar.xz) = 20fe385887d21190165a3180c17dcfc8b9a0e1da4ec76865b6334bdc709994b0 -SIZE (KDE/Qt/6.8.3/qtwayland-everywhere-src-6.8.3.tar.xz) = 1141132 +TIMESTAMP = 1743708215 +SHA256 (KDE/Qt/6.9.0/qtwayland-everywhere-src-6.9.0.tar.xz) = 503416fcb04db503bd130e6a49c45e3e546f091e83406f774a0c703130c91805 +SIZE (KDE/Qt/6.9.0/qtwayland-everywhere-src-6.9.0.tar.xz) = 1152368 diff --git a/graphics/qt6-wayland/pkg-plist b/graphics/qt6-wayland/pkg-plist index ea09b381daca..211c136cf60b 100644 --- a/graphics/qt6-wayland/pkg-plist +++ b/graphics/qt6-wayland/pkg-plist @@ -1,5 +1,6 @@ %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qtwaylandclient-config_p.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qtwaylandclientglobal_p.h +%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-appmenu.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-cursor-shape-v1.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-fractional-scale-v1.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-hardware-integration.h @@ -8,7 +9,6 @@ %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-qt-text-input-method-unstable-v1.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-qt-windowmanager.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-server-buffer-extension.h -%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-surface-extension.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-tablet-unstable-v2.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-text-input-unstable-v1.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-text-input-unstable-v2.h @@ -16,11 +16,14 @@ %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-touch-extension.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-viewporter.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-wayland.h +%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-wlr-data-control-unstable-v1.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-wp-primary-selection-unstable-v1.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-xdg-output-unstable-v1.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-xdg-shell.h +%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-xdg-system-bell-v1.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-xdg-toplevel-drag-v1.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandabstractdecoration_p.h +%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandappmenu_p.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandbuffer_p.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandclientbufferintegration_p.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandclientbufferintegrationfactory_p.h @@ -29,6 +32,7 @@ %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandclientshellapi_p.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandclipboard_p.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandcursor_p.h +%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylanddatacontrolv1_p.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylanddatadevice_p.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylanddatadevicemanager_p.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylanddataoffer_p.h @@ -37,7 +41,6 @@ %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylanddecorationplugin_p.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylanddisplay_p.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylanddnd_p.h -%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandextendedsurface_p.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandfractionalscale_p.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandhardwareintegration_p.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandinputcontext_p.h @@ -76,6 +79,7 @@ %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandvulkanwindow_p.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandwindow_p.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandwindowmanagerintegration_p.h +%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-appmenu-client-protocol.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-cursor-shape-v1-client-protocol.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-fractional-scale-v1-client-protocol.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-hardware-integration-client-protocol.h @@ -84,7 +88,6 @@ %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-qt-text-input-method-unstable-v1-client-protocol.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-qt-windowmanager-client-protocol.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-server-buffer-extension-client-protocol.h -%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-surface-extension-client-protocol.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-tablet-unstable-v2-client-protocol.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-text-input-unstable-v1-client-protocol.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-text-input-unstable-v2-client-protocol.h @@ -92,9 +95,11 @@ %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-touch-extension-client-protocol.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-viewporter-client-protocol.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-wayland-client-protocol.h +%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-wlr-data-control-unstable-v1-client-protocol.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-wp-primary-selection-unstable-v1-client-protocol.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-xdg-output-unstable-v1-client-protocol.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-xdg-shell-client-protocol.h +%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-xdg-system-bell-v1-client-protocol.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-xdg-toplevel-drag-v1-client-protocol.h %%QT_INCDIR%%/QtWaylandClient/QWaylandClientExtension %%QT_INCDIR%%/QtWaylandClient/QWaylandClientExtensionTemplate @@ -495,6 +500,14 @@ lib/cmake/Qt6WaylandClient/Qt6WaylandClientTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6WaylandClient/Qt6WaylandClientTargets.cmake lib/cmake/Qt6WaylandClient/Qt6WaylandClientVersionlessAliasTargets.cmake lib/cmake/Qt6WaylandClient/Qt6WaylandClientVersionlessTargets.cmake +lib/cmake/Qt6WaylandClientPrivate/Qt6WaylandClientPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6WaylandClientPrivate/Qt6WaylandClientPrivateConfig.cmake +lib/cmake/Qt6WaylandClientPrivate/Qt6WaylandClientPrivateConfigVersion.cmake +lib/cmake/Qt6WaylandClientPrivate/Qt6WaylandClientPrivateConfigVersionImpl.cmake +lib/cmake/Qt6WaylandClientPrivate/Qt6WaylandClientPrivateDependencies.cmake +lib/cmake/Qt6WaylandClientPrivate/Qt6WaylandClientPrivateTargets.cmake +lib/cmake/Qt6WaylandClientPrivate/Qt6WaylandClientPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6WaylandClientPrivate/Qt6WaylandClientPrivateVersionlessTargets.cmake lib/cmake/Qt6WaylandCompositor/Qt6QWaylandEglClientBufferIntegrationPluginAdditionalTargetInfo.cmake lib/cmake/Qt6WaylandCompositor/Qt6QWaylandEglClientBufferIntegrationPluginConfig.cmake lib/cmake/Qt6WaylandCompositor/Qt6QWaylandEglClientBufferIntegrationPluginConfigVersion.cmake @@ -539,6 +552,14 @@ lib/cmake/Qt6WaylandCompositorIviapplication/Qt6WaylandCompositorIviapplicationT lib/cmake/Qt6WaylandCompositorIviapplication/Qt6WaylandCompositorIviapplicationTargets.cmake lib/cmake/Qt6WaylandCompositorIviapplication/Qt6WaylandCompositorIviapplicationVersionlessAliasTargets.cmake lib/cmake/Qt6WaylandCompositorIviapplication/Qt6WaylandCompositorIviapplicationVersionlessTargets.cmake +lib/cmake/Qt6WaylandCompositorIviapplicationPrivate/Qt6WaylandCompositorIviapplicationPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6WaylandCompositorIviapplicationPrivate/Qt6WaylandCompositorIviapplicationPrivateConfig.cmake +lib/cmake/Qt6WaylandCompositorIviapplicationPrivate/Qt6WaylandCompositorIviapplicationPrivateConfigVersion.cmake +lib/cmake/Qt6WaylandCompositorIviapplicationPrivate/Qt6WaylandCompositorIviapplicationPrivateConfigVersionImpl.cmake +lib/cmake/Qt6WaylandCompositorIviapplicationPrivate/Qt6WaylandCompositorIviapplicationPrivateDependencies.cmake +lib/cmake/Qt6WaylandCompositorIviapplicationPrivate/Qt6WaylandCompositorIviapplicationPrivateTargets.cmake +lib/cmake/Qt6WaylandCompositorIviapplicationPrivate/Qt6WaylandCompositorIviapplicationPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6WaylandCompositorIviapplicationPrivate/Qt6WaylandCompositorIviapplicationPrivateVersionlessTargets.cmake lib/cmake/Qt6WaylandCompositorPresentationTime/Qt6WaylandCompositorPresentationTimeAdditionalTargetInfo.cmake lib/cmake/Qt6WaylandCompositorPresentationTime/Qt6WaylandCompositorPresentationTimeConfig.cmake lib/cmake/Qt6WaylandCompositorPresentationTime/Qt6WaylandCompositorPresentationTimeConfigVersion.cmake @@ -548,6 +569,22 @@ lib/cmake/Qt6WaylandCompositorPresentationTime/Qt6WaylandCompositorPresentationT lib/cmake/Qt6WaylandCompositorPresentationTime/Qt6WaylandCompositorPresentationTimeTargets.cmake lib/cmake/Qt6WaylandCompositorPresentationTime/Qt6WaylandCompositorPresentationTimeVersionlessAliasTargets.cmake lib/cmake/Qt6WaylandCompositorPresentationTime/Qt6WaylandCompositorPresentationTimeVersionlessTargets.cmake +lib/cmake/Qt6WaylandCompositorPresentationTimePrivate/Qt6WaylandCompositorPresentationTimePrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6WaylandCompositorPresentationTimePrivate/Qt6WaylandCompositorPresentationTimePrivateConfig.cmake +lib/cmake/Qt6WaylandCompositorPresentationTimePrivate/Qt6WaylandCompositorPresentationTimePrivateConfigVersion.cmake +lib/cmake/Qt6WaylandCompositorPresentationTimePrivate/Qt6WaylandCompositorPresentationTimePrivateConfigVersionImpl.cmake +lib/cmake/Qt6WaylandCompositorPresentationTimePrivate/Qt6WaylandCompositorPresentationTimePrivateDependencies.cmake +lib/cmake/Qt6WaylandCompositorPresentationTimePrivate/Qt6WaylandCompositorPresentationTimePrivateTargets.cmake +lib/cmake/Qt6WaylandCompositorPresentationTimePrivate/Qt6WaylandCompositorPresentationTimePrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6WaylandCompositorPresentationTimePrivate/Qt6WaylandCompositorPresentationTimePrivateVersionlessTargets.cmake +lib/cmake/Qt6WaylandCompositorPrivate/Qt6WaylandCompositorPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6WaylandCompositorPrivate/Qt6WaylandCompositorPrivateConfig.cmake +lib/cmake/Qt6WaylandCompositorPrivate/Qt6WaylandCompositorPrivateConfigVersion.cmake +lib/cmake/Qt6WaylandCompositorPrivate/Qt6WaylandCompositorPrivateConfigVersionImpl.cmake +lib/cmake/Qt6WaylandCompositorPrivate/Qt6WaylandCompositorPrivateDependencies.cmake +lib/cmake/Qt6WaylandCompositorPrivate/Qt6WaylandCompositorPrivateTargets.cmake +lib/cmake/Qt6WaylandCompositorPrivate/Qt6WaylandCompositorPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6WaylandCompositorPrivate/Qt6WaylandCompositorPrivateVersionlessTargets.cmake lib/cmake/Qt6WaylandCompositorWLShell/Qt6WaylandCompositorWLShellAdditionalTargetInfo.cmake lib/cmake/Qt6WaylandCompositorWLShell/Qt6WaylandCompositorWLShellConfig.cmake lib/cmake/Qt6WaylandCompositorWLShell/Qt6WaylandCompositorWLShellConfigVersion.cmake @@ -557,6 +594,14 @@ lib/cmake/Qt6WaylandCompositorWLShell/Qt6WaylandCompositorWLShellTargets-%%CMAKE lib/cmake/Qt6WaylandCompositorWLShell/Qt6WaylandCompositorWLShellTargets.cmake lib/cmake/Qt6WaylandCompositorWLShell/Qt6WaylandCompositorWLShellVersionlessAliasTargets.cmake lib/cmake/Qt6WaylandCompositorWLShell/Qt6WaylandCompositorWLShellVersionlessTargets.cmake +lib/cmake/Qt6WaylandCompositorWLShellPrivate/Qt6WaylandCompositorWLShellPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6WaylandCompositorWLShellPrivate/Qt6WaylandCompositorWLShellPrivateConfig.cmake +lib/cmake/Qt6WaylandCompositorWLShellPrivate/Qt6WaylandCompositorWLShellPrivateConfigVersion.cmake +lib/cmake/Qt6WaylandCompositorWLShellPrivate/Qt6WaylandCompositorWLShellPrivateConfigVersionImpl.cmake +lib/cmake/Qt6WaylandCompositorWLShellPrivate/Qt6WaylandCompositorWLShellPrivateDependencies.cmake +lib/cmake/Qt6WaylandCompositorWLShellPrivate/Qt6WaylandCompositorWLShellPrivateTargets.cmake +lib/cmake/Qt6WaylandCompositorWLShellPrivate/Qt6WaylandCompositorWLShellPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6WaylandCompositorWLShellPrivate/Qt6WaylandCompositorWLShellPrivateVersionlessTargets.cmake lib/cmake/Qt6WaylandCompositorXdgShell/Qt6WaylandCompositorXdgShellAdditionalTargetInfo.cmake lib/cmake/Qt6WaylandCompositorXdgShell/Qt6WaylandCompositorXdgShellConfig.cmake lib/cmake/Qt6WaylandCompositorXdgShell/Qt6WaylandCompositorXdgShellConfigVersion.cmake @@ -566,6 +611,14 @@ lib/cmake/Qt6WaylandCompositorXdgShell/Qt6WaylandCompositorXdgShellTargets-%%CMA lib/cmake/Qt6WaylandCompositorXdgShell/Qt6WaylandCompositorXdgShellTargets.cmake lib/cmake/Qt6WaylandCompositorXdgShell/Qt6WaylandCompositorXdgShellVersionlessAliasTargets.cmake lib/cmake/Qt6WaylandCompositorXdgShell/Qt6WaylandCompositorXdgShellVersionlessTargets.cmake +lib/cmake/Qt6WaylandCompositorXdgShellPrivate/Qt6WaylandCompositorXdgShellPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6WaylandCompositorXdgShellPrivate/Qt6WaylandCompositorXdgShellPrivateConfig.cmake +lib/cmake/Qt6WaylandCompositorXdgShellPrivate/Qt6WaylandCompositorXdgShellPrivateConfigVersion.cmake +lib/cmake/Qt6WaylandCompositorXdgShellPrivate/Qt6WaylandCompositorXdgShellPrivateConfigVersionImpl.cmake +lib/cmake/Qt6WaylandCompositorXdgShellPrivate/Qt6WaylandCompositorXdgShellPrivateDependencies.cmake +lib/cmake/Qt6WaylandCompositorXdgShellPrivate/Qt6WaylandCompositorXdgShellPrivateTargets.cmake +lib/cmake/Qt6WaylandCompositorXdgShellPrivate/Qt6WaylandCompositorXdgShellPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6WaylandCompositorXdgShellPrivate/Qt6WaylandCompositorXdgShellPrivateVersionlessTargets.cmake lib/cmake/Qt6WaylandEglClientHwIntegrationPrivate/Qt6WaylandEglClientHwIntegrationPrivateAdditionalTargetInfo.cmake lib/cmake/Qt6WaylandEglClientHwIntegrationPrivate/Qt6WaylandEglClientHwIntegrationPrivateConfig.cmake lib/cmake/Qt6WaylandEglClientHwIntegrationPrivate/Qt6WaylandEglClientHwIntegrationPrivateConfigVersion.cmake diff --git a/misc/qt6-doc/distinfo b/misc/qt6-doc/distinfo index 01debb859f82..aab1aa4b2ed5 100644 --- a/misc/qt6-doc/distinfo +++ b/misc/qt6-doc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1743027827 -SHA256 (KDE/Qt/6.8.3/qtdoc-everywhere-src-6.8.3.tar.xz) = f55371489e97325ec8e9e8683ec6f9f581a20a8b27736e2b4df8a8414fddeb59 -SIZE (KDE/Qt/6.8.3/qtdoc-everywhere-src-6.8.3.tar.xz) = 46015000 +TIMESTAMP = 1743708256 +SHA256 (KDE/Qt/6.9.0/qtdoc-everywhere-src-6.9.0.tar.xz) = 1f3b636b3c2cfac17a39e4ab5eaa74f1ea9c3d0faab0f06180378f30e22eb9fd +SIZE (KDE/Qt/6.9.0/qtdoc-everywhere-src-6.9.0.tar.xz) = 46280924 diff --git a/misc/qt6-doc/pkg-plist b/misc/qt6-doc/pkg-plist index 2964c6d79ffc..5f2270784717 100644 --- a/misc/qt6-doc/pkg-plist +++ b/misc/qt6-doc/pkg-plist @@ -82,6 +82,7 @@ %%QT_DOCDIR%%/qtdoc/explore-qt.html %%QT_DOCDIR%%/qtdoc/extras-changes-qt6.html %%QT_DOCDIR%%/qtdoc/fdl.html +%%QT_DOCDIR%%/qtdoc/feature-delivery-example.html %%QT_DOCDIR%%/qtdoc/functions.html %%QT_DOCDIR%%/qtdoc/get-and-install-qt-cli.html %%QT_DOCDIR%%/qtdoc/get-and-install-qt.html @@ -184,12 +185,12 @@ %%QT_DOCDIR%%/qtdoc/images/qt-edu-design-studio-open.png %%QT_DOCDIR%%/qtdoc/images/qt-edu-design-studio-welcome.png %%QT_DOCDIR%%/qtdoc/images/qt-edu-download.png +%%QT_DOCDIR%%/qtdoc/images/qt-edu-eeula-terms.png %%QT_DOCDIR%%/qtdoc/images/qt-edu-install-design-studio.png %%QT_DOCDIR%%/qtdoc/images/qt-edu-install-finish-design-studio.png %%QT_DOCDIR%%/qtdoc/images/qt-edu-install-finish-qt.png %%QT_DOCDIR%%/qtdoc/images/qt-edu-install-qt.png %%QT_DOCDIR%%/qtdoc/images/qt-edu-install-xcode.png -%%QT_DOCDIR%%/qtdoc/images/qt-edu-license-agreement.png %%QT_DOCDIR%%/qtdoc/images/qt-edu-login.png %%QT_DOCDIR%%/qtdoc/images/qt-edu-maintenancetool.png %%QT_DOCDIR%%/qtdoc/images/qt-edu-password.png @@ -212,8 +213,6 @@ %%QT_DOCDIR%%/qtdoc/images/qtquick-demo-samegame-med-1.png %%QT_DOCDIR%%/qtdoc/images/qtquick-demo-samegame-med-2.png %%QT_DOCDIR%%/qtdoc/images/qtquick-demo-stocqt.png -%%QT_DOCDIR%%/qtdoc/images/qtquick-for-android-architecture.drawio.svg -%%QT_DOCDIR%%/qtdoc/images/qtquick-for-android-comparisson.drawio.svg %%QT_DOCDIR%%/qtdoc/images/qtquick3D.png %%QT_DOCDIR%%/qtdoc/images/rhiarch.png %%QT_DOCDIR%%/qtdoc/images/robotarm-example.png @@ -226,9 +225,13 @@ %%QT_DOCDIR%%/qtdoc/images/sql-examples.png %%QT_DOCDIR%%/qtdoc/images/thread-examples.png %%QT_DOCDIR%%/qtdoc/images/threadsandobjects.png -%%QT_DOCDIR%%/qtdoc/images/threadvisual-example.png %%QT_DOCDIR%%/qtdoc/images/tool-examples.png %%QT_DOCDIR%%/qtdoc/images/txtviewer_screenshot.png +%%QT_DOCDIR%%/qtdoc/images/vxwb-advanced-settings.png +%%QT_DOCDIR%%/qtdoc/images/vxwb-cmake-rtp-project.png +%%QT_DOCDIR%%/qtdoc/images/vxwb-connection.png +%%QT_DOCDIR%%/qtdoc/images/vxwb-rundebug-settings.png +%%QT_DOCDIR%%/qtdoc/images/vxwb-rundebug.png %%QT_DOCDIR%%/qtdoc/images/wayland-multi-process.png %%QT_DOCDIR%%/qtdoc/images/wayland-single-process-develop.png %%QT_DOCDIR%%/qtdoc/images/wayland-single-process-eglfs.png @@ -288,12 +291,14 @@ %%QT_DOCDIR%%/qtdoc/newclasses66.html %%QT_DOCDIR%%/qtdoc/newclasses67.html %%QT_DOCDIR%%/qtdoc/newclasses68.html +%%QT_DOCDIR%%/qtdoc/newclasses69.html %%QT_DOCDIR%%/qtdoc/obsoleteclasses.html %%QT_DOCDIR%%/qtdoc/obsoleteqmltypes.html %%QT_DOCDIR%%/qtdoc/overviews-main.html %%QT_DOCDIR%%/qtdoc/overviews.html %%QT_DOCDIR%%/qtdoc/packaging-recommendations.html %%QT_DOCDIR%%/qtdoc/plugins-howto.html +%%QT_DOCDIR%%/qtdoc/porting-qt3d-to-qtquick3d.html %%QT_DOCDIR%%/qtdoc/porting-to-android.html %%QT_DOCDIR%%/qtdoc/porting-to-ios.html %%QT_DOCDIR%%/qtdoc/porting-to-qt6-using-clazy.html @@ -308,6 +313,7 @@ %%QT_DOCDIR%%/qtdoc/qnx-target-requirements.html %%QT_DOCDIR%%/qtdoc/qnx.html %%QT_DOCDIR%%/qtdoc/qt-activex.html +%%QT_DOCDIR%%/qtdoc/qt-additional-modules.html %%QT_DOCDIR%%/qtdoc/qt-attribution-cmake-macros.html %%QT_DOCDIR%%/qtdoc/qt-attribution-llvm.html %%QT_DOCDIR%%/qtdoc/qt-attribution-llvmpipe.html @@ -315,16 +321,19 @@ %%QT_DOCDIR%%/qtdoc/qt-debian-packages.html %%QT_DOCDIR%%/qtdoc/qt-edu-for-designers.html %%QT_DOCDIR%%/qtdoc/qt-edu-for-developers.html +%%QT_DOCDIR%%/qtdoc/qt-edu-mcu.html %%QT_DOCDIR%%/qtdoc/qt-edu-raspberry-pi.html %%QT_DOCDIR%%/qtdoc/qt-edu-resources.html %%QT_DOCDIR%%/qtdoc/qt-embedded-fonts.html %%QT_DOCDIR%%/qtdoc/qt-embedded-kmap2qmap.html %%QT_DOCDIR%%/qtdoc/qt-embedded-makeqpf.html %%QT_DOCDIR%%/qtdoc/qt-for-education.html +%%QT_DOCDIR%%/qtdoc/qt-framework-product-information.html %%QT_DOCDIR%%/qtdoc/qt-gui-concepts.html %%QT_DOCDIR%%/qtdoc/qt-intro.html %%QT_DOCDIR%%/qtdoc/qt-online-installation.html %%QT_DOCDIR%%/qtdoc/qt-releases.html +%%QT_DOCDIR%%/qtdoc/qt-tools-utilities.html %%QT_DOCDIR%%/qtdoc/qt6-buildsystem.html %%QT_DOCDIR%%/qtdoc/qtdoc-attribution-colorpaletteclient.html %%QT_DOCDIR%%/qtdoc/qtdoc-attribution-dice-roundcarpet.html @@ -354,6 +363,7 @@ %%QT_DOCDIR%%/qtdoc/qtdoc-demos-todolist-example.html %%QT_DOCDIR%%/qtdoc/qtdoc-demos-windowembedding-example.html %%QT_DOCDIR%%/qtdoc/qtdoc-demos-xr-physicsbase-teleportation-example.html +%%QT_DOCDIR%%/qtdoc/qtdoc-toc.html %%QT_DOCDIR%%/qtdoc/qtdoc-tutorials-alarms-example.html %%QT_DOCDIR%%/qtdoc/qtdoc.index %%QT_DOCDIR%%/qtdoc/qtdoc.qhp @@ -369,7 +379,6 @@ %%QT_DOCDIR%%/qtdoc/qtpurchasing-iosclasses.html %%QT_DOCDIR%%/qtdoc/qtquick-debugging.html %%QT_DOCDIR%%/qtdoc/qtquick-deployment.html -%%QT_DOCDIR%%/qtdoc/qtquick-for-android.html %%QT_DOCDIR%%/qtdoc/qtquick-performance.html %%QT_DOCDIR%%/qtdoc/qtquick-qml-runtime.html %%QT_DOCDIR%%/qtdoc/qtquick-usecase-animations.html @@ -391,15 +400,13 @@ %%QT_DOCDIR%%/qtdoc/signalsandslots-syntaxes.html %%QT_DOCDIR%%/qtdoc/solutions-for-application-development.html %%QT_DOCDIR%%/qtdoc/solutions-for-ui-design.html -%%QT_DOCDIR%%/qtdoc/string-processing.html %%QT_DOCDIR%%/qtdoc/style/offline-dark.css %%QT_DOCDIR%%/qtdoc/style/offline-simple.css %%QT_DOCDIR%%/qtdoc/style/offline.css %%QT_DOCDIR%%/qtdoc/style/qt5-sidebar.html +%%QT_DOCDIR%%/qtdoc/style/tree_config.xml %%QT_DOCDIR%%/qtdoc/supported-platforms.html %%QT_DOCDIR%%/qtdoc/testing-and-debugging.html -%%QT_DOCDIR%%/qtdoc/third-party-libraries.html -%%QT_DOCDIR%%/qtdoc/thread-basics.html %%QT_DOCDIR%%/qtdoc/thread.html %%QT_DOCDIR%%/qtdoc/threads-modules.html %%QT_DOCDIR%%/qtdoc/threads-qobject.html @@ -435,6 +442,7 @@ %%QT_DOCDIR%%/qtdoc/whatsnew66.html %%QT_DOCDIR%%/qtdoc/whatsnew67.html %%QT_DOCDIR%%/qtdoc/whatsnew68.html +%%QT_DOCDIR%%/qtdoc/whatsnew69.html %%QT_DOCDIR%%/qtdoc/whatsnewqt6.html %%QT_DOCDIR%%/qtdoc/why-moc.html %%QT_DOCDIR%%/qtdoc/windows-building.html diff --git a/misc/qt6-examples/distinfo b/misc/qt6-examples/distinfo index 8dd7ead3b246..df7a147245b9 100644 --- a/misc/qt6-examples/distinfo +++ b/misc/qt6-examples/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1743027852 -SHA256 (KDE/Qt/6.8.3/qt-everywhere-src-6.8.3.tar.xz) = cdd3a69967208276bb01af7ace7dba0ba53e679f886a4cbe624225c60fb73f2c -SIZE (KDE/Qt/6.8.3/qt-everywhere-src-6.8.3.tar.xz) = 994812276 +TIMESTAMP = 1743708833 +SHA256 (KDE/Qt/6.9.0/qt-everywhere-src-6.9.0.tar.xz) = 4f61e50551d0004a513fefbdb0a410595d94812a48600646fb7341ea0d17e1cb +SIZE (KDE/Qt/6.9.0/qt-everywhere-src-6.9.0.tar.xz) = 1103717104 diff --git a/misc/qt6-examples/pkg-plist b/misc/qt6-examples/pkg-plist index 0ec028939e0e..39c297b389fc 100644 --- a/misc/qt6-examples/pkg-plist +++ b/misc/qt6-examples/pkg-plist @@ -675,6 +675,22 @@ %%QT_EXAMPLEDIR%%/corelib/threads/waitconditions/CMakeLists.txt %%QT_EXAMPLEDIR%%/corelib/threads/waitconditions/waitconditions.cpp %%QT_EXAMPLEDIR%%/corelib/threads/waitconditions/waitconditions.pro +%%QT_EXAMPLEDIR%%/corelib/time/CMakeLists.txt +%%QT_EXAMPLEDIR%%/corelib/time/calendarbackendplugin/CMakeLists.txt +%%QT_EXAMPLEDIR%%/corelib/time/calendarbackendplugin/application/CMakeLists.txt +%%QT_EXAMPLEDIR%%/corelib/time/calendarbackendplugin/application/application.pro +%%QT_EXAMPLEDIR%%/corelib/time/calendarbackendplugin/application/main.cpp +%%QT_EXAMPLEDIR%%/corelib/time/calendarbackendplugin/calendarbackendplugin.pro +%%QT_EXAMPLEDIR%%/corelib/time/calendarbackendplugin/common/calendarBackendInterface.h +%%QT_EXAMPLEDIR%%/corelib/time/calendarbackendplugin/doc/images/calendarwindow_transition.png +%%QT_EXAMPLEDIR%%/corelib/time/calendarbackendplugin/doc/src/calendarbackendplugin.qdoc +%%QT_EXAMPLEDIR%%/corelib/time/calendarbackendplugin/plugin/CMakeLists.txt +%%QT_EXAMPLEDIR%%/corelib/time/calendarbackendplugin/plugin/calendarbackend.cpp +%%QT_EXAMPLEDIR%%/corelib/time/calendarbackendplugin/plugin/calendarbackend.h +%%QT_EXAMPLEDIR%%/corelib/time/calendarbackendplugin/plugin/calendarplugin.cpp +%%QT_EXAMPLEDIR%%/corelib/time/calendarbackendplugin/plugin/calendarplugin.h +%%QT_EXAMPLEDIR%%/corelib/time/calendarbackendplugin/plugin/plugin.pro +%%QT_EXAMPLEDIR%%/corelib/time/time.pro %%QT_EXAMPLEDIR%%/corelib/tools/CMakeLists.txt %%QT_EXAMPLEDIR%%/corelib/tools/README %%QT_EXAMPLEDIR%%/corelib/tools/contiguouscache/CMakeLists.txt @@ -1034,6 +1050,7 @@ %%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/Quick3DAssets/Ventdee_LOD0/CMakeLists.txt %%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/Quick3DAssets/Ventdee_LOD0/Ventdee_LOD0.qml %%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/Quick3DAssets/Ventdee_LOD0/qmldir +%%QT_EXAMPLEDIR%%/demos/car-configurator/buildsetup.cmake %%QT_EXAMPLEDIR%%/demos/car-configurator/content/App.qml %%QT_EXAMPLEDIR%%/demos/car-configurator/content/CMakeLists.txt %%QT_EXAMPLEDIR%%/demos/car-configurator/content/CameraReset.qml @@ -1311,6 +1328,10 @@ %%QT_EXAMPLEDIR%%/demos/documentviewer/doc/src/documentviewer.qdoc %%QT_EXAMPLEDIR%%/demos/documentviewer/doc/src/txtviewer.qdoc %%QT_EXAMPLEDIR%%/demos/documentviewer/plugins/CMakeLists.txt +%%QT_EXAMPLEDIR%%/demos/documentviewer/plugins/imageviewer/CMakeLists.txt +%%QT_EXAMPLEDIR%%/demos/documentviewer/plugins/imageviewer/imageviewer.cpp +%%QT_EXAMPLEDIR%%/demos/documentviewer/plugins/imageviewer/imageviewer.h +%%QT_EXAMPLEDIR%%/demos/documentviewer/plugins/imageviewer/imageviewer.json %%QT_EXAMPLEDIR%%/demos/documentviewer/plugins/jsonviewer/CMakeLists.txt %%QT_EXAMPLEDIR%%/demos/documentviewer/plugins/jsonviewer/jsonviewer.cpp %%QT_EXAMPLEDIR%%/demos/documentviewer/plugins/jsonviewer/jsonviewer.h @@ -2612,6 +2633,16 @@ %%QT_EXAMPLEDIR%%/graphs/2d/hellographs/hellographs.qrc %%QT_EXAMPLEDIR%%/graphs/2d/hellographs/main.cpp %%QT_EXAMPLEDIR%%/graphs/2d/hellographs/qml/hellographs/main.qml +%%QT_EXAMPLEDIR%%/graphs/2d/quickwidgetgraphs/CMakeLists.txt +%%QT_EXAMPLEDIR%%/graphs/2d/quickwidgetgraphs/doc/images/quickwidgetgraphs-example.png +%%QT_EXAMPLEDIR%%/graphs/2d/quickwidgetgraphs/doc/src/quickwidgetgraphs.qdoc +%%QT_EXAMPLEDIR%%/graphs/2d/quickwidgetgraphs/main.cpp +%%QT_EXAMPLEDIR%%/graphs/2d/quickwidgetgraphs/piegraph.cpp +%%QT_EXAMPLEDIR%%/graphs/2d/quickwidgetgraphs/piegraph.h +%%QT_EXAMPLEDIR%%/graphs/2d/quickwidgetgraphs/piewidget.cpp +%%QT_EXAMPLEDIR%%/graphs/2d/quickwidgetgraphs/piewidget.h +%%QT_EXAMPLEDIR%%/graphs/2d/quickwidgetgraphs/qml/quickwidgetgraphs/main.qml +%%QT_EXAMPLEDIR%%/graphs/2d/quickwidgetgraphs/quickwidgetgraphs.pro %%QT_EXAMPLEDIR%%/graphs/3d/3d.pro %%QT_EXAMPLEDIR%%/graphs/3d/CMakeLists.txt %%QT_EXAMPLEDIR%%/graphs/3d/axishandling/CMakeLists.txt @@ -4691,6 +4722,23 @@ %%QT_EXAMPLEDIR%%/quick/multieffect/itemswitcher/qml/images/stripes.png %%QT_EXAMPLEDIR%%/quick/multieffect/itemswitcher/qml/main.qml %%QT_EXAMPLEDIR%%/quick/multieffect/multieffect.pro +%%QT_EXAMPLEDIR%%/quick/multieffect/neumorphicpanel/CMakeLists.txt +%%QT_EXAMPLEDIR%%/quick/multieffect/neumorphicpanel/doc/images/qml-neumorphicpanel-example.jpg +%%QT_EXAMPLEDIR%%/quick/multieffect/neumorphicpanel/doc/src/neumorphicpanel.qdoc +%%QT_EXAMPLEDIR%%/quick/multieffect/neumorphicpanel/main.cpp +%%QT_EXAMPLEDIR%%/quick/multieffect/neumorphicpanel/neumorphicpanel.pro +%%QT_EXAMPLEDIR%%/quick/multieffect/neumorphicpanel/qml.qrc +%%QT_EXAMPLEDIR%%/quick/multieffect/neumorphicpanel/qml/CloudyRectMaterial/CloudyRectMaterial.qep +%%QT_EXAMPLEDIR%%/quick/multieffect/neumorphicpanel/qml/CloudyRectMaterial/CloudyRectMaterial.qml +%%QT_EXAMPLEDIR%%/quick/multieffect/neumorphicpanel/qml/CloudyRectMaterial/cloudyrectmaterial.frag.qsb +%%QT_EXAMPLEDIR%%/quick/multieffect/neumorphicpanel/qml/CloudyRectMaterial/cloudyrectmaterial.vert.qsb +%%QT_EXAMPLEDIR%%/quick/multieffect/neumorphicpanel/qml/Settings.qml +%%QT_EXAMPLEDIR%%/quick/multieffect/neumorphicpanel/qml/SettingsComponentButton.qml +%%QT_EXAMPLEDIR%%/quick/multieffect/neumorphicpanel/qml/SettingsComponentSlider.qml +%%QT_EXAMPLEDIR%%/quick/multieffect/neumorphicpanel/qml/SettingsView.qml +%%QT_EXAMPLEDIR%%/quick/multieffect/neumorphicpanel/qml/images/arrow.png +%%QT_EXAMPLEDIR%%/quick/multieffect/neumorphicpanel/qml/images/qt_logo_white_rgb.png +%%QT_EXAMPLEDIR%%/quick/multieffect/neumorphicpanel/qml/main.qml %%QT_EXAMPLEDIR%%/quick/multieffect/testbed/CMakeLists.txt %%QT_EXAMPLEDIR%%/quick/multieffect/testbed/CMakeLists.txt.shared %%QT_EXAMPLEDIR%%/quick/multieffect/testbed/doc/images/qml-multieffecttestbed-example.jpg @@ -5556,6 +5604,16 @@ %%QT_EXAMPLEDIR%%/quick3d/bakedlightmap/main.qml %%QT_EXAMPLEDIR%%/quick3d/bakedlightmap/qlm_list.txt %%QT_EXAMPLEDIR%%/quick3d/bakedlightmap/qml.qrc +%%QT_EXAMPLEDIR%%/quick3d/cascadedshadowmaps/CMakeLists.txt +%%QT_EXAMPLEDIR%%/quick3d/cascadedshadowmaps/ConesAndCylinderTrio.qml +%%QT_EXAMPLEDIR%%/quick3d/cascadedshadowmaps/SettingsPane.qml +%%QT_EXAMPLEDIR%%/quick3d/cascadedshadowmaps/cascadedshadowmaps.pro +%%QT_EXAMPLEDIR%%/quick3d/cascadedshadowmaps/doc/images/cascadedshadowmaps.webp +%%QT_EXAMPLEDIR%%/quick3d/cascadedshadowmaps/doc/src/cascadedshadowmaps.qdoc +%%QT_EXAMPLEDIR%%/quick3d/cascadedshadowmaps/main.cpp +%%QT_EXAMPLEDIR%%/quick3d/cascadedshadowmaps/main.qml +%%QT_EXAMPLEDIR%%/quick3d/cascadedshadowmaps/qml.qrc +%%QT_EXAMPLEDIR%%/quick3d/cascadedshadowmaps/sliders.svg %%QT_EXAMPLEDIR%%/quick3d/customeffect/CMakeLists.txt %%QT_EXAMPLEDIR%%/quick3d/customeffect/checkers2.png %%QT_EXAMPLEDIR%%/quick3d/customeffect/customeffect.pro @@ -5748,6 +5806,45 @@ %%QT_EXAMPLEDIR%%/quick3d/offlineshaders/materials.qrc %%QT_EXAMPLEDIR%%/quick3d/offlineshaders/offlineshaders.pro %%QT_EXAMPLEDIR%%/quick3d/offlineshaders/qml.qrc +%%QT_EXAMPLEDIR%%/quick3d/orderindependenttransparency/AppSettings.qml +%%QT_EXAMPLEDIR%%/quick3d/orderindependenttransparency/BlendValueTest.qml +%%QT_EXAMPLEDIR%%/quick3d/orderindependenttransparency/CMakeLists.txt +%%QT_EXAMPLEDIR%%/quick3d/orderindependenttransparency/CustomCheckBox.qml +%%QT_EXAMPLEDIR%%/quick3d/orderindependenttransparency/CustomInfoView.qml +%%QT_EXAMPLEDIR%%/quick3d/orderindependenttransparency/CustomLabel.qml +%%QT_EXAMPLEDIR%%/quick3d/orderindependenttransparency/CustomSelectionBox.qml +%%QT_EXAMPLEDIR%%/quick3d/orderindependenttransparency/CustomSlider.qml +%%QT_EXAMPLEDIR%%/quick3d/orderindependenttransparency/FireParticles.qml +%%QT_EXAMPLEDIR%%/quick3d/orderindependenttransparency/FireStick.qml +%%QT_EXAMPLEDIR%%/quick3d/orderindependenttransparency/FireStone.qml +%%QT_EXAMPLEDIR%%/quick3d/orderindependenttransparency/Instancing.qml +%%QT_EXAMPLEDIR%%/quick3d/orderindependenttransparency/Particles.qml +%%QT_EXAMPLEDIR%%/quick3d/orderindependenttransparency/RandomEmitter.qml +%%QT_EXAMPLEDIR%%/quick3d/orderindependenttransparency/SettingsView.qml +%%QT_EXAMPLEDIR%%/quick3d/orderindependenttransparency/StartupView.qml +%%QT_EXAMPLEDIR%%/quick3d/orderindependenttransparency/doc/images/oit-example.jpg +%%QT_EXAMPLEDIR%%/quick3d/orderindependenttransparency/doc/src/oit.qdoc +%%QT_EXAMPLEDIR%%/quick3d/orderindependenttransparency/images/arrow_icon.png +%%QT_EXAMPLEDIR%%/quick3d/orderindependenttransparency/images/color_table3.png +%%QT_EXAMPLEDIR%%/quick3d/orderindependenttransparency/images/firestone.png +%%QT_EXAMPLEDIR%%/quick3d/orderindependenttransparency/images/flame.png +%%QT_EXAMPLEDIR%%/quick3d/orderindependenttransparency/images/icon_settings.png +%%QT_EXAMPLEDIR%%/quick3d/orderindependenttransparency/images/license.txt +%%QT_EXAMPLEDIR%%/quick3d/orderindependenttransparency/images/pillar_normal.png +%%QT_EXAMPLEDIR%%/quick3d/orderindependenttransparency/images/qt_logo.png +%%QT_EXAMPLEDIR%%/quick3d/orderindependenttransparency/images/qt_logo2.png +%%QT_EXAMPLEDIR%%/quick3d/orderindependenttransparency/images/qt_logo2_n.png +%%QT_EXAMPLEDIR%%/quick3d/orderindependenttransparency/images/stick_charred.png +%%QT_EXAMPLEDIR%%/quick3d/orderindependenttransparency/images/stick_heat3.png +%%QT_EXAMPLEDIR%%/quick3d/orderindependenttransparency/images/tilepattern.png +%%QT_EXAMPLEDIR%%/quick3d/orderindependenttransparency/main.cpp +%%QT_EXAMPLEDIR%%/quick3d/orderindependenttransparency/main.qml +%%QT_EXAMPLEDIR%%/quick3d/orderindependenttransparency/meshes/asteroid.mesh +%%QT_EXAMPLEDIR%%/quick3d/orderindependenttransparency/meshes/block.mesh +%%QT_EXAMPLEDIR%%/quick3d/orderindependenttransparency/meshes/stick3.mesh +%%QT_EXAMPLEDIR%%/quick3d/orderindependenttransparency/orderindependenttransparency.pro +%%QT_EXAMPLEDIR%%/quick3d/orderindependenttransparency/qml.qrc +%%QT_EXAMPLEDIR%%/quick3d/orderindependenttransparency/qmldir %%QT_EXAMPLEDIR%%/quick3d/particles3d/AlignedParticles.qml %%QT_EXAMPLEDIR%%/quick3d/particles3d/AnimatedSprite.qml %%QT_EXAMPLEDIR%%/quick3d/particles3d/AppSettings.qml @@ -6081,12 +6178,8 @@ %%QT_EXAMPLEDIR%%/quick3d/xr_anchors/main.cpp %%QT_EXAMPLEDIR%%/quick3d/xr_anchors/main.qml %%QT_EXAMPLEDIR%%/quick3d/xr_anchors/visionos/MacOSXBundleInfo.plist.in -%%QT_EXAMPLEDIR%%/quick3d/xr_freeformteleportation/BeamModel.qml %%QT_EXAMPLEDIR%%/quick3d/xr_freeformteleportation/Building.qml %%QT_EXAMPLEDIR%%/quick3d/xr_freeformteleportation/CMakeLists.txt -%%QT_EXAMPLEDIR%%/quick3d/xr_freeformteleportation/FreeformTeleporter.qml -%%QT_EXAMPLEDIR%%/quick3d/xr_freeformteleportation/TargetIndicator.qml -%%QT_EXAMPLEDIR%%/quick3d/xr_freeformteleportation/ValueFader.qml %%QT_EXAMPLEDIR%%/quick3d/xr_freeformteleportation/android/AndroidManifest.xml %%QT_EXAMPLEDIR%%/quick3d/xr_freeformteleportation/building.gltf %%QT_EXAMPLEDIR%%/quick3d/xr_freeformteleportation/doc/images/xrfreeformteleportation-example.jpg @@ -6103,8 +6196,7 @@ %%QT_EXAMPLEDIR%%/quick3d/xr_freeformteleportation/maps/Tiles108_1K_Color.jpg %%QT_EXAMPLEDIR%%/quick3d/xr_freeformteleportation/meshes/building.mesh %%QT_EXAMPLEDIR%%/quick3d/xr_freeformteleportation/qml.qrc -%%QT_EXAMPLEDIR%%/quick3d/xr_freeformteleportation/shaders/target_indicator.frag -%%QT_EXAMPLEDIR%%/quick3d/xr_freeformteleportation/shaders/target_indicator.vert +%%QT_EXAMPLEDIR%%/quick3d/xr_freeformteleportation/visionos/MacOSXBundleInfo.plist.in %%QT_EXAMPLEDIR%%/quick3d/xr_input/CMakeLists.txt %%QT_EXAMPLEDIR%%/quick3d/xr_input/ColorView.qml %%QT_EXAMPLEDIR%%/quick3d/xr_input/ExampleButton.qml @@ -6119,6 +6211,37 @@ %%QT_EXAMPLEDIR%%/quick3d/xr_input/meshes/handle.mesh %%QT_EXAMPLEDIR%%/quick3d/xr_input/meshes/teapot.mesh %%QT_EXAMPLEDIR%%/quick3d/xr_input/visionos/MacOSXBundleInfo.plist.in +%%QT_EXAMPLEDIR%%/quick3d/xr_interaction/CMakeLists.txt +%%QT_EXAMPLEDIR%%/quick3d/xr_interaction/GadgetBox.qml +%%QT_EXAMPLEDIR%%/quick3d/xr_interaction/Scene.qml +%%QT_EXAMPLEDIR%%/quick3d/xr_interaction/android/AndroidManifest.xml +%%QT_EXAMPLEDIR%%/quick3d/xr_interaction/assets/arrows.gltf +%%QT_EXAMPLEDIR%%/quick3d/xr_interaction/doc/images/xrinteraction-example.jpg +%%QT_EXAMPLEDIR%%/quick3d/xr_interaction/doc/src/qtquick3d-examples-xrinteraction.qdoc +%%QT_EXAMPLEDIR%%/quick3d/xr_interaction/main.cpp +%%QT_EXAMPLEDIR%%/quick3d/xr_interaction/main.qml +%%QT_EXAMPLEDIR%%/quick3d/xr_interaction/meshes/arrow_mesh.mesh +%%QT_EXAMPLEDIR%%/quick3d/xr_interaction/meshes/resize_mesh.mesh +%%QT_EXAMPLEDIR%%/quick3d/xr_interaction/meshes/rotate_mesh.mesh +%%QT_EXAMPLEDIR%%/quick3d/xr_interaction/visionos/MacOSXBundleInfo.plist.in +%%QT_EXAMPLEDIR%%/quick3d/xr_shared/AimController.qml +%%QT_EXAMPLEDIR%%/quick3d/xr_shared/AxisGadget.qml +%%QT_EXAMPLEDIR%%/quick3d/xr_shared/CMakeLists.txt +%%QT_EXAMPLEDIR%%/quick3d/xr_shared/FreeformTeleporter.qml +%%QT_EXAMPLEDIR%%/quick3d/xr_shared/PickRay.qml +%%QT_EXAMPLEDIR%%/quick3d/xr_shared/ResizeGadget.qml +%%QT_EXAMPLEDIR%%/quick3d/xr_shared/RotateGadget.qml +%%QT_EXAMPLEDIR%%/quick3d/xr_shared/TeleportBeam.qml +%%QT_EXAMPLEDIR%%/quick3d/xr_shared/TeleportTargetIndicator.qml +%%QT_EXAMPLEDIR%%/quick3d/xr_shared/TranslateGadget.qml +%%QT_EXAMPLEDIR%%/quick3d/xr_shared/ValueFader.qml +%%QT_EXAMPLEDIR%%/quick3d/xr_shared/XrCursor.qml +%%QT_EXAMPLEDIR%%/quick3d/xr_shared/XrGadget.qml +%%QT_EXAMPLEDIR%%/quick3d/xr_shared/XrItemHandle.qml +%%QT_EXAMPLEDIR%%/quick3d/xr_shared/shaders/cursor.frag +%%QT_EXAMPLEDIR%%/quick3d/xr_shared/shaders/cursor.vert +%%QT_EXAMPLEDIR%%/quick3d/xr_shared/shaders/target_indicator.frag +%%QT_EXAMPLEDIR%%/quick3d/xr_shared/shaders/target_indicator.vert %%QT_EXAMPLEDIR%%/quick3d/xr_simple/CMakeLists.txt %%QT_EXAMPLEDIR%%/quick3d/xr_simple/android/AndroidManifest.xml %%QT_EXAMPLEDIR%%/quick3d/xr_simple/doc/images/xrsimple-example.jpg @@ -6680,7 +6803,6 @@ %%QT_EXAMPLEDIR%%/quickcontrols/spreadsheets/Spreadsheets/HelpDialog.qml %%QT_EXAMPLEDIR%%/quickcontrols/spreadsheets/Spreadsheets/Main.qml %%QT_EXAMPLEDIR%%/quickcontrols/spreadsheets/Spreadsheets/RowHeaderView.qml -%%QT_EXAMPLEDIR%%/quickcontrols/spreadsheets/Spreadsheets/TableCell.qml %%QT_EXAMPLEDIR%%/quickcontrols/spreadsheets/Spreadsheets/datamodel.cpp %%QT_EXAMPLEDIR%%/quickcontrols/spreadsheets/Spreadsheets/datamodel.h %%QT_EXAMPLEDIR%%/quickcontrols/spreadsheets/Spreadsheets/icons/copy.svg diff --git a/multimedia/qt6-multimedia/distinfo b/multimedia/qt6-multimedia/distinfo index 26709f63bb7c..2f1e9a269b7f 100644 --- a/multimedia/qt6-multimedia/distinfo +++ b/multimedia/qt6-multimedia/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1743027853 -SHA256 (KDE/Qt/6.8.3/qtmultimedia-everywhere-src-6.8.3.tar.xz) = 32e82307d783172a3b984cc3c47c5e4e8b819cee3cbfc702c7012c47f15f6b01 -SIZE (KDE/Qt/6.8.3/qtmultimedia-everywhere-src-6.8.3.tar.xz) = 9705340 +TIMESTAMP = 1743708842 +SHA256 (KDE/Qt/6.9.0/qtmultimedia-everywhere-src-6.9.0.tar.xz) = 995c3b194f3de3e1929280639642f7661d94aa57523c459dbbf2f71dbdcaa18c +SIZE (KDE/Qt/6.9.0/qtmultimedia-everywhere-src-6.9.0.tar.xz) = 9745024 diff --git a/multimedia/qt6-multimedia/files/patch-src_CMakeLists.txt b/multimedia/qt6-multimedia/files/patch-src_CMakeLists.txt index 5b783c6ccaaf..4112b1c41f56 100644 --- a/multimedia/qt6-multimedia/files/patch-src_CMakeLists.txt +++ b/multimedia/qt6-multimedia/files/patch-src_CMakeLists.txt @@ -1,9 +1,9 @@ Prevent building spatialaudio_quick3d if quick3d is installed and the feature is disabled. ---- src/CMakeLists.txt.orig 2023-11-08 02:47:23 UTC +--- src/CMakeLists.txt.orig 2025-02-20 14:13:07 UTC +++ src/CMakeLists.txt -@@ -16,7 +16,7 @@ endif() +@@ -26,7 +26,7 @@ endif() if(TARGET Qt::Quick) add_subdirectory(multimediaquick) endif() diff --git a/multimedia/qt6-multimedia/files/patch-src_multimedia_CMakeLists.txt b/multimedia/qt6-multimedia/files/patch-src_multimedia_CMakeLists.txt index cacf6404d45e..78d7f708464d 100644 --- a/multimedia/qt6-multimedia/files/patch-src_multimedia_CMakeLists.txt +++ b/multimedia/qt6-multimedia/files/patch-src_multimedia_CMakeLists.txt @@ -1,6 +1,6 @@ ---- src/multimedia/CMakeLists.txt.orig 2024-11-22 07:31:25 UTC +--- src/multimedia/CMakeLists.txt.orig 2025-03-09 20:10:22 UTC +++ src/multimedia/CMakeLists.txt -@@ -115,7 +115,7 @@ qt_internal_extend_target(Multimedia +@@ -129,7 +129,7 @@ qt_internal_extend_target(Multimedia ) qt_internal_extend_target(Multimedia diff --git a/multimedia/qt6-multimedia/files/patch-src_plugins_multimedia_ffmpeg_qv4l2camera__p.h b/multimedia/qt6-multimedia/files/patch-src_plugins_multimedia_ffmpeg_qv4l2camera__p.h index f968a8db5070..83f757e0b68d 100644 --- a/multimedia/qt6-multimedia/files/patch-src_plugins_multimedia_ffmpeg_qv4l2camera__p.h +++ b/multimedia/qt6-multimedia/files/patch-src_plugins_multimedia_ffmpeg_qv4l2camera__p.h @@ -1,7 +1,7 @@ ---- src/plugins/multimedia/ffmpeg/qv4l2camera_p.h.orig 2024-03-19 05:09:26 UTC +--- src/plugins/multimedia/ffmpeg/qv4l2camera_p.h.orig 2025-03-09 20:10:22 UTC +++ src/plugins/multimedia/ffmpeg/qv4l2camera_p.h @@ -18,6 +18,8 @@ - #include + #include #include +#include // timeval diff --git a/multimedia/qt6-multimedia/pkg-plist b/multimedia/qt6-multimedia/pkg-plist index 9e3e76aec166..c7af4c7e603e 100644 --- a/multimedia/qt6-multimedia/pkg-plist +++ b/multimedia/qt6-multimedia/pkg-plist @@ -397,6 +397,14 @@ lib/cmake/Qt6Multimedia/Qt6MultimediaVersionlessTargets.cmake %%GSTREAMER%%lib/cmake/Qt6Multimedia/Qt6QGstreamerMediaPluginConfigVersionImpl.cmake %%GSTREAMER%%lib/cmake/Qt6Multimedia/Qt6QGstreamerMediaPluginTargets-%%CMAKE_BUILD_TYPE%%.cmake %%GSTREAMER%%lib/cmake/Qt6Multimedia/Qt6QGstreamerMediaPluginTargets.cmake +lib/cmake/Qt6MultimediaPrivate/Qt6MultimediaPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6MultimediaPrivate/Qt6MultimediaPrivateConfig.cmake +lib/cmake/Qt6MultimediaPrivate/Qt6MultimediaPrivateConfigVersion.cmake +lib/cmake/Qt6MultimediaPrivate/Qt6MultimediaPrivateConfigVersionImpl.cmake +lib/cmake/Qt6MultimediaPrivate/Qt6MultimediaPrivateDependencies.cmake +lib/cmake/Qt6MultimediaPrivate/Qt6MultimediaPrivateTargets.cmake +lib/cmake/Qt6MultimediaPrivate/Qt6MultimediaPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6MultimediaPrivate/Qt6MultimediaPrivateVersionlessTargets.cmake lib/cmake/Qt6MultimediaQuickPrivate/Qt6MultimediaQuickPrivateAdditionalTargetInfo.cmake lib/cmake/Qt6MultimediaQuickPrivate/Qt6MultimediaQuickPrivateConfig.cmake lib/cmake/Qt6MultimediaQuickPrivate/Qt6MultimediaQuickPrivateConfigVersion.cmake @@ -424,6 +432,14 @@ lib/cmake/Qt6MultimediaWidgets/Qt6MultimediaWidgetsTargets-%%CMAKE_BUILD_TYPE%%. lib/cmake/Qt6MultimediaWidgets/Qt6MultimediaWidgetsTargets.cmake lib/cmake/Qt6MultimediaWidgets/Qt6MultimediaWidgetsVersionlessAliasTargets.cmake lib/cmake/Qt6MultimediaWidgets/Qt6MultimediaWidgetsVersionlessTargets.cmake +lib/cmake/Qt6MultimediaWidgetsPrivate/Qt6MultimediaWidgetsPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6MultimediaWidgetsPrivate/Qt6MultimediaWidgetsPrivateConfig.cmake +lib/cmake/Qt6MultimediaWidgetsPrivate/Qt6MultimediaWidgetsPrivateConfigVersion.cmake +lib/cmake/Qt6MultimediaWidgetsPrivate/Qt6MultimediaWidgetsPrivateConfigVersionImpl.cmake +lib/cmake/Qt6MultimediaWidgetsPrivate/Qt6MultimediaWidgetsPrivateDependencies.cmake +lib/cmake/Qt6MultimediaWidgetsPrivate/Qt6MultimediaWidgetsPrivateTargets.cmake +lib/cmake/Qt6MultimediaWidgetsPrivate/Qt6MultimediaWidgetsPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6MultimediaWidgetsPrivate/Qt6MultimediaWidgetsPrivateVersionlessTargets.cmake %%Q3D%%lib/cmake/Qt6Qml/QmlPlugins/Qt6quick3dspatialaudioAdditionalTargetInfo.cmake %%Q3D%%lib/cmake/Qt6Qml/QmlPlugins/Qt6quick3dspatialaudioConfig.cmake %%Q3D%%lib/cmake/Qt6Qml/QmlPlugins/Qt6quick3dspatialaudioConfigVersion.cmake @@ -454,6 +470,14 @@ lib/cmake/Qt6SpatialAudio/Qt6SpatialAudioTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6SpatialAudio/Qt6SpatialAudioTargets.cmake lib/cmake/Qt6SpatialAudio/Qt6SpatialAudioVersionlessAliasTargets.cmake lib/cmake/Qt6SpatialAudio/Qt6SpatialAudioVersionlessTargets.cmake +lib/cmake/Qt6SpatialAudioPrivate/Qt6SpatialAudioPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6SpatialAudioPrivate/Qt6SpatialAudioPrivateConfig.cmake +lib/cmake/Qt6SpatialAudioPrivate/Qt6SpatialAudioPrivateConfigVersion.cmake +lib/cmake/Qt6SpatialAudioPrivate/Qt6SpatialAudioPrivateConfigVersionImpl.cmake +lib/cmake/Qt6SpatialAudioPrivate/Qt6SpatialAudioPrivateDependencies.cmake +lib/cmake/Qt6SpatialAudioPrivate/Qt6SpatialAudioPrivateTargets.cmake +lib/cmake/Qt6SpatialAudioPrivate/Qt6SpatialAudioPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6SpatialAudioPrivate/Qt6SpatialAudioPrivateVersionlessTargets.cmake %%QT_LIBDIR%%/libQt6BundledResonanceAudio.a %%FFMPEG%%%%QT_LIBDIR%%/libQt6FFmpegMediaPluginImpl.a %%FFMPEG%%%%QT_LIBDIR%%/libQt6FFmpegMediaPluginImpl.prl diff --git a/net/py-qt6-networkauth/distinfo b/net/py-qt6-networkauth/distinfo index 3a30021947df..528e5d14955c 100644 --- a/net/py-qt6-networkauth/distinfo +++ b/net/py-qt6-networkauth/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1733628655 -SHA256 (PyQt6_NetworkAuth-6.8.0.tar.gz) = 2a1043ff6d03fc19e7bc87fad4f32d4d7e56d2bf1bb89b2a43287c0161457d59 -SIZE (PyQt6_NetworkAuth-6.8.0.tar.gz) = 20739 +TIMESTAMP = 1743732662 +SHA256 (pyqt6_networkauth-6.9.0.tar.gz) = 9acb6e97bd54584bbaeac2aabc40ec17a79d868f7da37a163c7bd4b7a8f04b09 +SIZE (pyqt6_networkauth-6.9.0.tar.gz) = 21591 diff --git a/net/py-qt6-networkauth/pkg-plist b/net/py-qt6-networkauth/pkg-plist index 3bb7e6beee3c..a47d1028e512 100644 --- a/net/py-qt6-networkauth/pkg-plist +++ b/net/py-qt6-networkauth/pkg-plist @@ -7,6 +7,7 @@ %%PYQT_SIPDIR%%/QtNetworkAuth/qoauth1.sip %%PYQT_SIPDIR%%/QtNetworkAuth/qoauth1signature.sip %%PYQT_SIPDIR%%/QtNetworkAuth/qoauth2authorizationcodeflow.sip +%%PYQT_SIPDIR%%/QtNetworkAuth/qoauth2deviceauthorizationflow.sip %%PYQT_SIPDIR%%/QtNetworkAuth/qoauthhttpserverreplyhandler.sip %%PYQT_SIPDIR%%/QtNetworkAuth/qoauthoobreplyhandler.sip %%PYQT_SIPDIR%%/QtNetworkAuth/qoauthurischemereplyhandler.sip diff --git a/net/qt6-coap/distinfo b/net/qt6-coap/distinfo index 873db3b9cf8f..f61db8059128 100644 --- a/net/qt6-coap/distinfo +++ b/net/qt6-coap/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1743027593 -SHA256 (KDE/Qt/6.8.3/qt-qtcoap-v6.8.3_GH0.tar.gz) = 2a2035b0207b6a6832d595c2aff9ed6ad7dc8e82851dc68183371959fee7b3f5 -SIZE (KDE/Qt/6.8.3/qt-qtcoap-v6.8.3_GH0.tar.gz) = 186187 +TIMESTAMP = 1743708844 +SHA256 (KDE/Qt/6.9.0/qt-qtcoap-v6.9.0_GH0.tar.gz) = efa98979b1e9bc4bfc7d6438128fc83fbff8713f4bfbccb5312f62db9e4f112d +SIZE (KDE/Qt/6.9.0/qt-qtcoap-v6.9.0_GH0.tar.gz) = 186436 diff --git a/net/qt6-coap/pkg-plist b/net/qt6-coap/pkg-plist index e7aa731e0c42..722e45171c48 100644 --- a/net/qt6-coap/pkg-plist +++ b/net/qt6-coap/pkg-plist @@ -48,6 +48,14 @@ lib/cmake/Qt6Coap/Qt6CoapTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6Coap/Qt6CoapTargets.cmake lib/cmake/Qt6Coap/Qt6CoapVersionlessAliasTargets.cmake lib/cmake/Qt6Coap/Qt6CoapVersionlessTargets.cmake +lib/cmake/Qt6CoapPrivate/Qt6CoapPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6CoapPrivate/Qt6CoapPrivateConfig.cmake +lib/cmake/Qt6CoapPrivate/Qt6CoapPrivateConfigVersion.cmake +lib/cmake/Qt6CoapPrivate/Qt6CoapPrivateConfigVersionImpl.cmake +lib/cmake/Qt6CoapPrivate/Qt6CoapPrivateDependencies.cmake +lib/cmake/Qt6CoapPrivate/Qt6CoapPrivateTargets.cmake +lib/cmake/Qt6CoapPrivate/Qt6CoapPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6CoapPrivate/Qt6CoapPrivateVersionlessTargets.cmake %%QT_LIBDIR%%/libQt6Coap.prl %%QT_LIBDIR%%/libQt6Coap.so %%QT_LIBDIR%%/libQt6Coap.so.6 diff --git a/net/qt6-mqtt/distinfo b/net/qt6-mqtt/distinfo index 576c9baf2ba4..617bc83f6aab 100644 --- a/net/qt6-mqtt/distinfo +++ b/net/qt6-mqtt/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1743027856 -SHA256 (KDE/Qt/6.8.3/qt-qtmqtt-v6.8.3_GH0.tar.gz) = e921bb965c43417235a1d93d3b91fbbb66f18d022bf7b91a5ca39d5215f49232 -SIZE (KDE/Qt/6.8.3/qt-qtmqtt-v6.8.3_GH0.tar.gz) = 209241 +TIMESTAMP = 1743708846 +SHA256 (KDE/Qt/6.9.0/qt-qtmqtt-v6.9.0_GH0.tar.gz) = 7cdec84ca17ad2bd9d47418ca98820705a7798895a2315b5c20c46528a29547e +SIZE (KDE/Qt/6.9.0/qt-qtmqtt-v6.9.0_GH0.tar.gz) = 209532 diff --git a/net/qt6-mqtt/pkg-plist b/net/qt6-mqtt/pkg-plist index 8aee4279cac4..da87b95b6fd4 100644 --- a/net/qt6-mqtt/pkg-plist +++ b/net/qt6-mqtt/pkg-plist @@ -2,6 +2,7 @@ %%QT_INCDIR%%/QtMqtt/%%FULLVER%%/QtMqtt/private/qmqttconnection_p.h %%QT_INCDIR%%/QtMqtt/%%FULLVER%%/QtMqtt/private/qmqttconnectionproperties_p.h %%QT_INCDIR%%/QtMqtt/%%FULLVER%%/QtMqtt/private/qmqttcontrolpacket_p.h +%%QT_INCDIR%%/QtMqtt/%%FULLVER%%/QtMqtt/private/qmqttglobal_p.h %%QT_INCDIR%%/QtMqtt/%%FULLVER%%/QtMqtt/private/qmqttmessage_p.h %%QT_INCDIR%%/QtMqtt/%%FULLVER%%/QtMqtt/private/qmqttpublishproperties_p.h %%QT_INCDIR%%/QtMqtt/%%FULLVER%%/QtMqtt/private/qmqttsubscription_p.h @@ -46,6 +47,14 @@ lib/cmake/Qt6Mqtt/Qt6MqttTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6Mqtt/Qt6MqttTargets.cmake lib/cmake/Qt6Mqtt/Qt6MqttVersionlessAliasTargets.cmake lib/cmake/Qt6Mqtt/Qt6MqttVersionlessTargets.cmake +lib/cmake/Qt6MqttPrivate/Qt6MqttPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6MqttPrivate/Qt6MqttPrivateConfig.cmake +lib/cmake/Qt6MqttPrivate/Qt6MqttPrivateConfigVersion.cmake +lib/cmake/Qt6MqttPrivate/Qt6MqttPrivateConfigVersionImpl.cmake +lib/cmake/Qt6MqttPrivate/Qt6MqttPrivateDependencies.cmake +lib/cmake/Qt6MqttPrivate/Qt6MqttPrivateTargets.cmake +lib/cmake/Qt6MqttPrivate/Qt6MqttPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6MqttPrivate/Qt6MqttPrivateVersionlessTargets.cmake %%QT_LIBDIR%%/libQt6Mqtt.prl %%QT_LIBDIR%%/libQt6Mqtt.so %%QT_LIBDIR%%/libQt6Mqtt.so.6 diff --git a/net/qt6-networkauth/distinfo b/net/qt6-networkauth/distinfo index 523e789e9e6a..2fe8936dc262 100644 --- a/net/qt6-networkauth/distinfo +++ b/net/qt6-networkauth/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1743027857 -SHA256 (KDE/Qt/6.8.3/qtnetworkauth-everywhere-src-6.8.3.tar.xz) = 27ee8b7c105a9dd75f1182d8dddc3837b875f1145f05311bca343f0838ef4b49 -SIZE (KDE/Qt/6.8.3/qtnetworkauth-everywhere-src-6.8.3.tar.xz) = 257476 +TIMESTAMP = 1743708849 +SHA256 (KDE/Qt/6.9.0/qtnetworkauth-everywhere-src-6.9.0.tar.xz) = fac708b4227d4964d1d127cc6330b103a59a422a1e8334752506c454f7feb418 +SIZE (KDE/Qt/6.9.0/qtnetworkauth-everywhere-src-6.9.0.tar.xz) = 447628 diff --git a/net/qt6-networkauth/pkg-plist b/net/qt6-networkauth/pkg-plist index d64d01cd88f1..73b440f7f18e 100644 --- a/net/qt6-networkauth/pkg-plist +++ b/net/qt6-networkauth/pkg-plist @@ -4,6 +4,7 @@ %%QT_INCDIR%%/QtNetworkAuth/%%FULLVER%%/QtNetworkAuth/private/qoauth1_p.h %%QT_INCDIR%%/QtNetworkAuth/%%FULLVER%%/QtNetworkAuth/private/qoauth1signature_p.h %%QT_INCDIR%%/QtNetworkAuth/%%FULLVER%%/QtNetworkAuth/private/qoauth2authorizationcodeflow_p.h +%%QT_INCDIR%%/QtNetworkAuth/%%FULLVER%%/QtNetworkAuth/private/qoauth2deviceauthorizationflow_p.h %%QT_INCDIR%%/QtNetworkAuth/%%FULLVER%%/QtNetworkAuth/private/qoauthhttpserverreplyhandler_p.h %%QT_INCDIR%%/QtNetworkAuth/%%FULLVER%%/QtNetworkAuth/private/qoauthoobreplyhandler_p.h %%QT_INCDIR%%/QtNetworkAuth/%%FULLVER%%/QtNetworkAuth/private/qtnetworkauth-config_p.h @@ -13,6 +14,7 @@ %%QT_INCDIR%%/QtNetworkAuth/QOAuth1 %%QT_INCDIR%%/QtNetworkAuth/QOAuth1Signature %%QT_INCDIR%%/QtNetworkAuth/QOAuth2AuthorizationCodeFlow +%%QT_INCDIR%%/QtNetworkAuth/QOAuth2DeviceAuthorizationFlow %%QT_INCDIR%%/QtNetworkAuth/QOAuthHttpServerReplyHandler %%QT_INCDIR%%/QtNetworkAuth/QOAuthOobReplyHandler %%QT_INCDIR%%/QtNetworkAuth/QOAuthUriSchemeReplyHandler @@ -25,6 +27,7 @@ %%QT_INCDIR%%/QtNetworkAuth/qoauth1.h %%QT_INCDIR%%/QtNetworkAuth/qoauth1signature.h %%QT_INCDIR%%/QtNetworkAuth/qoauth2authorizationcodeflow.h +%%QT_INCDIR%%/QtNetworkAuth/qoauth2deviceauthorizationflow.h %%QT_INCDIR%%/QtNetworkAuth/qoauthglobal.h %%QT_INCDIR%%/QtNetworkAuth/qoauthhttpserverreplyhandler.h %%QT_INCDIR%%/QtNetworkAuth/qoauthoobreplyhandler.h @@ -41,6 +44,14 @@ lib/cmake/Qt6NetworkAuth/Qt6NetworkAuthTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6NetworkAuth/Qt6NetworkAuthTargets.cmake lib/cmake/Qt6NetworkAuth/Qt6NetworkAuthVersionlessAliasTargets.cmake lib/cmake/Qt6NetworkAuth/Qt6NetworkAuthVersionlessTargets.cmake +lib/cmake/Qt6NetworkAuthPrivate/Qt6NetworkAuthPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6NetworkAuthPrivate/Qt6NetworkAuthPrivateConfig.cmake +lib/cmake/Qt6NetworkAuthPrivate/Qt6NetworkAuthPrivateConfigVersion.cmake +lib/cmake/Qt6NetworkAuthPrivate/Qt6NetworkAuthPrivateConfigVersionImpl.cmake +lib/cmake/Qt6NetworkAuthPrivate/Qt6NetworkAuthPrivateDependencies.cmake +lib/cmake/Qt6NetworkAuthPrivate/Qt6NetworkAuthPrivateTargets.cmake +lib/cmake/Qt6NetworkAuthPrivate/Qt6NetworkAuthPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6NetworkAuthPrivate/Qt6NetworkAuthPrivateVersionlessTargets.cmake %%QT_LIBDIR%%/libQt6NetworkAuth.prl %%QT_LIBDIR%%/libQt6NetworkAuth.so %%QT_LIBDIR%%/libQt6NetworkAuth.so.6 diff --git a/print/qt6-pdf/pkg-plist b/print/qt6-pdf/pkg-plist index 1de07ee6fe90..a917c36cee6d 100644 --- a/print/qt6-pdf/pkg-plist +++ b/print/qt6-pdf/pkg-plist @@ -5,6 +5,7 @@ %%QT_INCDIR%%/QtPdf/%%FULLVER%%/QtPdf/private/qpdfsearchmodel_p.h %%QT_INCDIR%%/QtPdf/%%FULLVER%%/QtPdf/private/qpdfselection_p.h %%QT_INCDIR%%/QtPdf/%%FULLVER%%/QtPdf/private/qtpdf-config_p.h +%%QT_INCDIR%%/QtPdf/%%FULLVER%%/QtPdf/private/qtpdfglobal_p.h %%QT_INCDIR%%/QtPdf/QPdfBookmarkModel %%QT_INCDIR%%/QtPdf/QPdfDocument %%QT_INCDIR%%/QtPdf/QPdfDocumentRenderOptions @@ -75,6 +76,14 @@ lib/cmake/Qt6Pdf/Qt6PdfTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6Pdf/Qt6PdfTargets.cmake lib/cmake/Qt6Pdf/Qt6PdfVersionlessAliasTargets.cmake lib/cmake/Qt6Pdf/Qt6PdfVersionlessTargets.cmake +lib/cmake/Qt6PdfPrivate/Qt6PdfPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6PdfPrivate/Qt6PdfPrivateConfig.cmake +lib/cmake/Qt6PdfPrivate/Qt6PdfPrivateConfigVersion.cmake +lib/cmake/Qt6PdfPrivate/Qt6PdfPrivateConfigVersionImpl.cmake +lib/cmake/Qt6PdfPrivate/Qt6PdfPrivateDependencies.cmake +lib/cmake/Qt6PdfPrivate/Qt6PdfPrivateTargets.cmake +lib/cmake/Qt6PdfPrivate/Qt6PdfPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6PdfPrivate/Qt6PdfPrivateVersionlessTargets.cmake lib/cmake/Qt6PdfQuick/Qt6PdfQuickAdditionalTargetInfo.cmake lib/cmake/Qt6PdfQuick/Qt6PdfQuickConfig.cmake lib/cmake/Qt6PdfQuick/Qt6PdfQuickConfigVersion.cmake @@ -84,6 +93,14 @@ lib/cmake/Qt6PdfQuick/Qt6PdfQuickTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6PdfQuick/Qt6PdfQuickTargets.cmake lib/cmake/Qt6PdfQuick/Qt6PdfQuickVersionlessAliasTargets.cmake lib/cmake/Qt6PdfQuick/Qt6PdfQuickVersionlessTargets.cmake +lib/cmake/Qt6PdfQuickPrivate/Qt6PdfQuickPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6PdfQuickPrivate/Qt6PdfQuickPrivateConfig.cmake +lib/cmake/Qt6PdfQuickPrivate/Qt6PdfQuickPrivateConfigVersion.cmake +lib/cmake/Qt6PdfQuickPrivate/Qt6PdfQuickPrivateConfigVersionImpl.cmake +lib/cmake/Qt6PdfQuickPrivate/Qt6PdfQuickPrivateDependencies.cmake +lib/cmake/Qt6PdfQuickPrivate/Qt6PdfQuickPrivateTargets.cmake +lib/cmake/Qt6PdfQuickPrivate/Qt6PdfQuickPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6PdfQuickPrivate/Qt6PdfQuickPrivateVersionlessTargets.cmake lib/cmake/Qt6PdfWidgets/Qt6PdfWidgetsAdditionalTargetInfo.cmake lib/cmake/Qt6PdfWidgets/Qt6PdfWidgetsConfig.cmake lib/cmake/Qt6PdfWidgets/Qt6PdfWidgetsConfigVersion.cmake @@ -93,6 +110,14 @@ lib/cmake/Qt6PdfWidgets/Qt6PdfWidgetsTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6PdfWidgets/Qt6PdfWidgetsTargets.cmake lib/cmake/Qt6PdfWidgets/Qt6PdfWidgetsVersionlessAliasTargets.cmake lib/cmake/Qt6PdfWidgets/Qt6PdfWidgetsVersionlessTargets.cmake +lib/cmake/Qt6PdfWidgetsPrivate/Qt6PdfWidgetsPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6PdfWidgetsPrivate/Qt6PdfWidgetsPrivateConfig.cmake +lib/cmake/Qt6PdfWidgetsPrivate/Qt6PdfWidgetsPrivateConfigVersion.cmake +lib/cmake/Qt6PdfWidgetsPrivate/Qt6PdfWidgetsPrivateConfigVersionImpl.cmake +lib/cmake/Qt6PdfWidgetsPrivate/Qt6PdfWidgetsPrivateDependencies.cmake +lib/cmake/Qt6PdfWidgetsPrivate/Qt6PdfWidgetsPrivateTargets.cmake +lib/cmake/Qt6PdfWidgetsPrivate/Qt6PdfWidgetsPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6PdfWidgetsPrivate/Qt6PdfWidgetsPrivateVersionlessTargets.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6PdfQuickpluginAdditionalTargetInfo.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6PdfQuickpluginConfig.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6PdfQuickpluginConfigVersion.cmake diff --git a/science/qt6-quick3dphysics/distinfo b/science/qt6-quick3dphysics/distinfo index 8e8b54d5ef29..88e17048798e 100644 --- a/science/qt6-quick3dphysics/distinfo +++ b/science/qt6-quick3dphysics/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1743027858 -SHA256 (KDE/Qt/6.8.3/qtquick3dphysics-everywhere-src-6.8.3.tar.xz) = e862233530775dbd9ce914447d23a1e7116e63decf5bf8e5a25899a59e297fac -SIZE (KDE/Qt/6.8.3/qtquick3dphysics-everywhere-src-6.8.3.tar.xz) = 4682552 +TIMESTAMP = 1743708855 +SHA256 (KDE/Qt/6.9.0/qtquick3dphysics-everywhere-src-6.9.0.tar.xz) = 5f1e2f7e591faf14d0d7e6e397a15707a7b8536e52cb3c07ce3425ddf55826a0 +SIZE (KDE/Qt/6.9.0/qtquick3dphysics-everywhere-src-6.9.0.tar.xz) = 4682640 diff --git a/science/qt6-quick3dphysics/pkg-plist b/science/qt6-quick3dphysics/pkg-plist index 653fce7b1054..769b63cf2550 100644 --- a/science/qt6-quick3dphysics/pkg-plist +++ b/science/qt6-quick3dphysics/pkg-plist @@ -81,6 +81,22 @@ lib/cmake/Qt6Quick3DPhysicsHelpers/Qt6Quick3DPhysicsHelpersTargets-%%CMAKE_BUILD lib/cmake/Qt6Quick3DPhysicsHelpers/Qt6Quick3DPhysicsHelpersTargets.cmake lib/cmake/Qt6Quick3DPhysicsHelpers/Qt6Quick3DPhysicsHelpersVersionlessAliasTargets.cmake lib/cmake/Qt6Quick3DPhysicsHelpers/Qt6Quick3DPhysicsHelpersVersionlessTargets.cmake +lib/cmake/Qt6Quick3DPhysicsHelpersPrivate/Qt6Quick3DPhysicsHelpersPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6Quick3DPhysicsHelpersPrivate/Qt6Quick3DPhysicsHelpersPrivateConfig.cmake +lib/cmake/Qt6Quick3DPhysicsHelpersPrivate/Qt6Quick3DPhysicsHelpersPrivateConfigVersion.cmake +lib/cmake/Qt6Quick3DPhysicsHelpersPrivate/Qt6Quick3DPhysicsHelpersPrivateConfigVersionImpl.cmake +lib/cmake/Qt6Quick3DPhysicsHelpersPrivate/Qt6Quick3DPhysicsHelpersPrivateDependencies.cmake +lib/cmake/Qt6Quick3DPhysicsHelpersPrivate/Qt6Quick3DPhysicsHelpersPrivateTargets.cmake +lib/cmake/Qt6Quick3DPhysicsHelpersPrivate/Qt6Quick3DPhysicsHelpersPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6Quick3DPhysicsHelpersPrivate/Qt6Quick3DPhysicsHelpersPrivateVersionlessTargets.cmake +lib/cmake/Qt6Quick3DPhysicsPrivate/Qt6Quick3DPhysicsPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6Quick3DPhysicsPrivate/Qt6Quick3DPhysicsPrivateConfig.cmake +lib/cmake/Qt6Quick3DPhysicsPrivate/Qt6Quick3DPhysicsPrivateConfigVersion.cmake +lib/cmake/Qt6Quick3DPhysicsPrivate/Qt6Quick3DPhysicsPrivateConfigVersionImpl.cmake +lib/cmake/Qt6Quick3DPhysicsPrivate/Qt6Quick3DPhysicsPrivateDependencies.cmake +lib/cmake/Qt6Quick3DPhysicsPrivate/Qt6Quick3DPhysicsPrivateTargets.cmake +lib/cmake/Qt6Quick3DPhysicsPrivate/Qt6Quick3DPhysicsPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6Quick3DPhysicsPrivate/Qt6Quick3DPhysicsPrivateVersionlessTargets.cmake %%QT_BINDIR%%/cooker %%QT_LIBDIR%%/libQt6BundledPhysX.a %%QT_LIBDIR%%/libQt6Quick3DPhysics.prl diff --git a/www/py-qt6-webengine/distinfo b/www/py-qt6-webengine/distinfo index 62f51b9e53b2..1d8386e1f8ae 100644 --- a/www/py-qt6-webengine/distinfo +++ b/www/py-qt6-webengine/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1733628696 -SHA256 (PyQt6_WebEngine-6.8.0.tar.gz) = 64045ea622b6a41882c2b18f55ae9714b8660acff06a54e910eb72822c2f3ff2 -SIZE (PyQt6_WebEngine-6.8.0.tar.gz) = 34203 +TIMESTAMP = 1743732713 +SHA256 (pyqt6_webengine-6.9.0.tar.gz) = 6ae537e3bbda06b8e06535e4852297e0bc3b00543c47929541fcc9b11981aa25 +SIZE (pyqt6_webengine-6.9.0.tar.gz) = 34616 diff --git a/www/py-qt6-webengine/pkg-plist b/www/py-qt6-webengine/pkg-plist index 59dc8df6b257..37fba3730c44 100644 --- a/www/py-qt6-webengine/pkg-plist +++ b/www/py-qt6-webengine/pkg-plist @@ -24,6 +24,7 @@ %%PYQT_SIPDIR%%/QtWebEngineCore/qwebenginepage.sip %%PYQT_SIPDIR%%/QtWebEngineCore/qwebenginepermission.sip %%PYQT_SIPDIR%%/QtWebEngineCore/qwebengineprofile.sip +%%PYQT_SIPDIR%%/QtWebEngineCore/qwebengineprofilebuilder.sip %%PYQT_SIPDIR%%/QtWebEngineCore/qwebenginequotarequest.sip %%PYQT_SIPDIR%%/QtWebEngineCore/qwebengineregisterprotocolhandlerrequest.sip %%PYQT_SIPDIR%%/QtWebEngineCore/qwebenginescript.sip diff --git a/www/qt6-httpserver/distinfo b/www/qt6-httpserver/distinfo index 1875aff4a0b2..f0345dfe7f2c 100644 --- a/www/qt6-httpserver/distinfo +++ b/www/qt6-httpserver/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1743027859 -SHA256 (KDE/Qt/6.8.3/qthttpserver-everywhere-src-6.8.3.tar.xz) = 792be98dd979a3f1cf42477139321a8999a648b7e7ad041ae133965c3cc35f65 -SIZE (KDE/Qt/6.8.3/qthttpserver-everywhere-src-6.8.3.tar.xz) = 185480 +TIMESTAMP = 1743708860 +SHA256 (KDE/Qt/6.9.0/qthttpserver-everywhere-src-6.9.0.tar.xz) = 91d2cfef1b4c4c09c6189ab26a3a0afa02f0e9512683aecf4d1b44e56112ae73 +SIZE (KDE/Qt/6.9.0/qthttpserver-everywhere-src-6.9.0.tar.xz) = 189188 diff --git a/www/qt6-httpserver/pkg-plist b/www/qt6-httpserver/pkg-plist index 1ccfed5a1ac3..47945d989d73 100644 --- a/www/qt6-httpserver/pkg-plist +++ b/www/qt6-httpserver/pkg-plist @@ -4,6 +4,7 @@ %%QT_INCDIR%%/QtHttpServer/%%FULLVER%%/QtHttpServer/private/qhttpserverhttp2protocolhandler_p.h %%QT_INCDIR%%/QtHttpServer/%%FULLVER%%/QtHttpServer/private/qhttpserverliterals_p.h %%QT_INCDIR%%/QtHttpServer/%%FULLVER%%/QtHttpServer/private/qhttpserverrequest_p.h +%%QT_INCDIR%%/QtHttpServer/%%FULLVER%%/QtHttpServer/private/qhttpserverrequestfilter_p.h %%QT_INCDIR%%/QtHttpServer/%%FULLVER%%/QtHttpServer/private/qhttpserverresponder_p.h %%QT_INCDIR%%/QtHttpServer/%%FULLVER%%/QtHttpServer/private/qhttpserverresponse_p.h %%QT_INCDIR%%/QtHttpServer/%%FULLVER%%/QtHttpServer/private/qhttpserverrouter_p.h @@ -11,6 +12,7 @@ %%QT_INCDIR%%/QtHttpServer/%%FULLVER%%/QtHttpServer/private/qhttpserverstream_p.h %%QT_INCDIR%%/QtHttpServer/QAbstractHttpServer %%QT_INCDIR%%/QtHttpServer/QHttpServer +%%QT_INCDIR%%/QtHttpServer/QHttpServerConfiguration %%QT_INCDIR%%/QtHttpServer/QHttpServerRequest %%QT_INCDIR%%/QtHttpServer/QHttpServerResponder %%QT_INCDIR%%/QtHttpServer/QHttpServerResponse @@ -23,6 +25,7 @@ %%QT_INCDIR%%/QtHttpServer/QtHttpServerVersion %%QT_INCDIR%%/QtHttpServer/qabstracthttpserver.h %%QT_INCDIR%%/QtHttpServer/qhttpserver.h +%%QT_INCDIR%%/QtHttpServer/qhttpserverconfiguration.h %%QT_INCDIR%%/QtHttpServer/qhttpserverrequest.h %%QT_INCDIR%%/QtHttpServer/qhttpserverresponder.h %%QT_INCDIR%%/QtHttpServer/qhttpserverresponse.h @@ -44,6 +47,14 @@ lib/cmake/Qt6HttpServer/Qt6HttpServerTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6HttpServer/Qt6HttpServerTargets.cmake lib/cmake/Qt6HttpServer/Qt6HttpServerVersionlessAliasTargets.cmake lib/cmake/Qt6HttpServer/Qt6HttpServerVersionlessTargets.cmake +lib/cmake/Qt6HttpServerPrivate/Qt6HttpServerPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6HttpServerPrivate/Qt6HttpServerPrivateConfig.cmake +lib/cmake/Qt6HttpServerPrivate/Qt6HttpServerPrivateConfigVersion.cmake +lib/cmake/Qt6HttpServerPrivate/Qt6HttpServerPrivateConfigVersionImpl.cmake +lib/cmake/Qt6HttpServerPrivate/Qt6HttpServerPrivateDependencies.cmake +lib/cmake/Qt6HttpServerPrivate/Qt6HttpServerPrivateTargets.cmake +lib/cmake/Qt6HttpServerPrivate/Qt6HttpServerPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6HttpServerPrivate/Qt6HttpServerPrivateVersionlessTargets.cmake %%QT_LIBDIR%%/libQt6HttpServer.prl %%QT_LIBDIR%%/libQt6HttpServer.so %%QT_LIBDIR%%/libQt6HttpServer.so.6 diff --git a/www/qt6-webchannel/distinfo b/www/qt6-webchannel/distinfo index 35de2e5fb1c5..06243b8464b7 100644 --- a/www/qt6-webchannel/distinfo +++ b/www/qt6-webchannel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1743027860 -SHA256 (KDE/Qt/6.8.3/qtwebchannel-everywhere-src-6.8.3.tar.xz) = 967046b2650b7fc7b27547522e998e35d62291d795b20d9497e4bcc714831262 -SIZE (KDE/Qt/6.8.3/qtwebchannel-everywhere-src-6.8.3.tar.xz) = 209372 +TIMESTAMP = 1743708863 +SHA256 (KDE/Qt/6.9.0/qtwebchannel-everywhere-src-6.9.0.tar.xz) = 10519a9cdde17a7d955f332480c6bcd1202e4b2c48fd94eb31efaa21d0fabfee +SIZE (KDE/Qt/6.9.0/qtwebchannel-everywhere-src-6.9.0.tar.xz) = 209432 diff --git a/www/qt6-webchannel/pkg-plist b/www/qt6-webchannel/pkg-plist index c306d39eaa88..cee08b6d05ff 100644 --- a/www/qt6-webchannel/pkg-plist +++ b/www/qt6-webchannel/pkg-plist @@ -36,6 +36,14 @@ lib/cmake/Qt6WebChannel/Qt6WebChannelTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6WebChannel/Qt6WebChannelTargets.cmake lib/cmake/Qt6WebChannel/Qt6WebChannelVersionlessAliasTargets.cmake lib/cmake/Qt6WebChannel/Qt6WebChannelVersionlessTargets.cmake +lib/cmake/Qt6WebChannelPrivate/Qt6WebChannelPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6WebChannelPrivate/Qt6WebChannelPrivateConfig.cmake +lib/cmake/Qt6WebChannelPrivate/Qt6WebChannelPrivateConfigVersion.cmake +lib/cmake/Qt6WebChannelPrivate/Qt6WebChannelPrivateConfigVersionImpl.cmake +lib/cmake/Qt6WebChannelPrivate/Qt6WebChannelPrivateDependencies.cmake +lib/cmake/Qt6WebChannelPrivate/Qt6WebChannelPrivateTargets.cmake +lib/cmake/Qt6WebChannelPrivate/Qt6WebChannelPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6WebChannelPrivate/Qt6WebChannelPrivateVersionlessTargets.cmake lib/cmake/Qt6WebChannelQuick/Qt6WebChannelQuickAdditionalTargetInfo.cmake lib/cmake/Qt6WebChannelQuick/Qt6WebChannelQuickConfig.cmake lib/cmake/Qt6WebChannelQuick/Qt6WebChannelQuickConfigVersion.cmake @@ -45,6 +53,14 @@ lib/cmake/Qt6WebChannelQuick/Qt6WebChannelQuickTargets-%%CMAKE_BUILD_TYPE%%.cmak lib/cmake/Qt6WebChannelQuick/Qt6WebChannelQuickTargets.cmake lib/cmake/Qt6WebChannelQuick/Qt6WebChannelQuickVersionlessAliasTargets.cmake lib/cmake/Qt6WebChannelQuick/Qt6WebChannelQuickVersionlessTargets.cmake +lib/cmake/Qt6WebChannelQuickPrivate/Qt6WebChannelQuickPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6WebChannelQuickPrivate/Qt6WebChannelQuickPrivateConfig.cmake +lib/cmake/Qt6WebChannelQuickPrivate/Qt6WebChannelQuickPrivateConfigVersion.cmake +lib/cmake/Qt6WebChannelQuickPrivate/Qt6WebChannelQuickPrivateConfigVersionImpl.cmake +lib/cmake/Qt6WebChannelQuickPrivate/Qt6WebChannelQuickPrivateDependencies.cmake +lib/cmake/Qt6WebChannelQuickPrivate/Qt6WebChannelQuickPrivateTargets.cmake +lib/cmake/Qt6WebChannelQuickPrivate/Qt6WebChannelQuickPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6WebChannelQuickPrivate/Qt6WebChannelQuickPrivateVersionlessTargets.cmake %%QT_LIBDIR%%/libQt6WebChannel.prl %%QT_LIBDIR%%/libQt6WebChannel.so %%QT_LIBDIR%%/libQt6WebChannel.so.6 diff --git a/www/qt6-webengine/Makefile b/www/qt6-webengine/Makefile index 625fa2976dc4..aefae03111a9 100644 --- a/www/qt6-webengine/Makefile +++ b/www/qt6-webengine/Makefile @@ -50,6 +50,7 @@ LIB_DEPENDS+= libabsl_base.so:devel/abseil \ libavcodec.so:multimedia/ffmpeg \ libdbus-1.so:devel/dbus \ libdrm.so:graphics/libdrm \ + libepoll-shim.so:devel/libepoll-shim \ libevent.so:devel/libevent \ libexpat.so:textproc/expat2 \ libfontconfig.so:x11-fonts/fontconfig \ @@ -63,6 +64,7 @@ LIB_DEPENDS+= libabsl_base.so:devel/abseil \ libre2.so:devel/re2 \ libsnappy.so:archivers/snappy \ libtiff.so:graphics/tiff \ + libudev.so:devel/libudev-devd \ libvpx.so:multimedia/libvpx \ libwebp.so:graphics/webp @@ -76,6 +78,8 @@ USE_XORG+= x11 xcb xcomposite xcursor xdamage xext xfixes xi xkbfile \ CMAKE_ON+= QT_FEATURE_qtwebengine_build CMAKE_OFF+= QT_FEATURE_qtpdf_build +CXXFLAGS+= -I${LOCALBASE}/include/libepoll-shim + SYS_LIBS= freetype harfbuzz-ng libdrm libevent libpng libxml libxslt openh264 opus .endif @@ -135,12 +139,6 @@ SNDIO_CMAKE_ON= -DQT_FEATURE_webengine_system_sndio:BOOL=ON SNDIO_CMAKE_OFF= -DQT_FEATURE_webengine_system_sndio:BOOL=OFF .endif -.include - -.if ${ARCH} == i386 || ${ARCH} == armv7 -EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-32bit-compress_files_js -.endif - post-extract: @${MKDIR} ${WRKSRC}/src/3rdparty/chromium/media/audio/sndio \ ${WRKSRC}/src/3rdparty/chromium/sandbox/policy/freebsd \ @@ -180,4 +178,4 @@ post-install-DRIVER-on: .endif -.include +.include diff --git a/www/qt6-webengine/distinfo b/www/qt6-webengine/distinfo index d3c9765fb36d..608b96c11754 100644 --- a/www/qt6-webengine/distinfo +++ b/www/qt6-webengine/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1743027864 -SHA256 (KDE/Qt/6.8.3/qtwebengine-everywhere-src-6.8.3.tar.xz) = df4e19ba2b3a540551b6f998d62597377ffa688c1cff564589b7da2e2bf87337 -SIZE (KDE/Qt/6.8.3/qtwebengine-everywhere-src-6.8.3.tar.xz) = 566553436 +TIMESTAMP = 1743709257 +SHA256 (KDE/Qt/6.9.0/qtwebengine-everywhere-src-6.9.0.tar.xz) = 2b33d1c85e85ed58729db228448f92105ab746ffdc9b98f0c4e3bf00b789789e +SIZE (KDE/Qt/6.9.0/qtwebengine-everywhere-src-6.9.0.tar.xz) = 672153992 diff --git a/www/qt6-webengine/files/extra-patch-32bit-compress_files_js b/www/qt6-webengine/files/extra-patch-32bit-compress_files_js deleted file mode 100644 index f8841846ef6c..000000000000 --- a/www/qt6-webengine/files/extra-patch-32bit-compress_files_js +++ /dev/null @@ -1,14 +0,0 @@ -Reduce Brotli compression on i386 to have more memory available. Otherwise, -node.js stops with either SIGSEGV or SIGABRT after ~530 processed files. - ---- src/3rdparty/chromium/third_party/devtools-frontend/src/scripts/build/compress_files.js.orig 2023-01-10 09:16:05 UTC -+++ src/3rdparty/chromium/third_party/devtools-frontend/src/scripts/build/compress_files.js -@@ -52,7 +52,7 @@ async function brotli(sourceData, compressedFilename) - output.write(Buffer.from(brotliConst)); - output.write(Buffer.from(sizeHeader)); - return new Promise((resolve, reject) => { -- pipeline(Readable.from(sourceData), zlib.createBrotliCompress(), output, err => { -+ pipeline(Readable.from(sourceData), zlib.createBrotliCompress({ params: { [zlib.constants.BROTLI_PARAM_QUALITY]: 4 } }), output, err => { - return err ? reject(err) : resolve(); - }); - }); diff --git a/www/qt6-webengine/files/patch-cmake_Functions.cmake b/www/qt6-webengine/files/patch-cmake_Functions.cmake index e158ced72b96..1d1ee4076893 100644 --- a/www/qt6-webengine/files/patch-cmake_Functions.cmake +++ b/www/qt6-webengine/files/patch-cmake_Functions.cmake @@ -1,6 +1,6 @@ ---- cmake/Functions.cmake.orig 2024-10-02 15:40:01 UTC +--- cmake/Functions.cmake.orig 2025-03-09 19:36:47 UTC +++ cmake/Functions.cmake -@@ -416,7 +416,7 @@ function(add_linker_options target buildDir completeSt +@@ -136,7 +136,7 @@ function(add_linker_options target buildDir completeSt set(libs_rsp "${buildDir}/${ninjaTarget}_libs.rsp") set(ldir_rsp "${buildDir}/${ninjaTarget}_ldir.rsp") set_target_properties(${cmakeTarget} PROPERTIES STATIC_LIBRARY_OPTIONS "@${objects_rsp}") @@ -9,7 +9,7 @@ get_gn_arch(cpu ${TEST_architecture_arch}) if(CMAKE_CROSSCOMPILING AND cpu STREQUAL "arm" AND ${config} STREQUAL "Debug") target_link_options(${cmakeTarget} PRIVATE "LINKER:--long-plt") -@@ -676,6 +676,8 @@ function(get_gn_os result) +@@ -396,6 +396,8 @@ function(get_gn_os result) set(${result} "mac" PARENT_SCOPE) elseif(IOS) set(${result} "ios" PARENT_SCOPE) @@ -18,7 +18,7 @@ else() message(DEBUG "Unrecognized OS") endif() -@@ -879,7 +881,7 @@ macro(append_build_type_setup) +@@ -612,7 +614,7 @@ macro(append_build_type_setup) extend_gn_list(gnArgArg ARGS enable_precompiled_headers @@ -27,7 +27,7 @@ ) extend_gn_list(gnArgArg ARGS dcheck_always_on -@@ -939,7 +941,7 @@ macro(append_compiler_linker_sdk_setup) +@@ -704,7 +706,7 @@ macro(append_compiler_linker_sdk_setup) use_libcxx=true ) endif() @@ -36,7 +36,7 @@ extend_gn_list(gnArgArg ARGS use_libcxx CONDITION QT_FEATURE_stdlib_libcpp ) -@@ -977,7 +979,7 @@ macro(append_compiler_linker_sdk_setup) +@@ -745,7 +747,7 @@ macro(append_compiler_linker_sdk_setup) ) endif() get_gn_arch(cpu ${TEST_architecture_arch}) @@ -45,16 +45,16 @@ extend_gn_list_cflag(gnArgArg ARG arm_tune -@@ -1067,7 +1069,7 @@ macro(append_toolchain_setup) - host_cpu="${cpu}" - ) +@@ -850,7 +852,7 @@ macro(append_toolchain_setup) endif() + unset(host_cpu) + unset(target_cpu) - elseif(LINUX) + elseif(LINUX OR FREEBSD) get_gn_arch(cpu ${TEST_architecture_arch}) list(APPEND gnArgArg custom_toolchain="${buildDir}/target_toolchain:target" -@@ -1205,6 +1207,20 @@ function(add_gn_build_artifacts_to_target) +@@ -991,6 +993,20 @@ function(add_gn_build_artifacts_to_target) set_target_properties(${arg_CMAKE_TARGET} PROPERTIES LINK_DEPENDS ${arg_BUILDDIR}/${config}/${arch}/${arg_NINJA_STAMP} ) @@ -75,21 +75,3 @@ if(QT_IS_MACOS_UNIVERSAL) add_intermediate_archive(${target} ${arg_BUILDDIR}/${config}/${arch} ${arg_COMPLETE_STATIC}) elseif(IOS) -@@ -1331,7 +1347,7 @@ function(check_for_ulimit) - - function(check_for_ulimit) - message("-- Checking 'ulimit -n'") -- execute_process(COMMAND bash -c "ulimit -n" -+ execute_process(COMMAND sh -c "ulimit -n" - OUTPUT_VARIABLE ulimitOutput - ) - string(REGEX MATCHALL "[0-9]+" limit "${ulimitOutput}") -@@ -1340,7 +1356,7 @@ function(check_for_ulimit) - if(NOT ${CMAKE_VERSION} VERSION_LESS "3.21.0") - message(" -- Creating linker launcher") - file(GENERATE OUTPUT ${PROJECT_BINARY_DIR}/linker_ulimit.sh -- CONTENT "#!/bin/bash\nulimit -n 4096\nexec \"$@\"" -+ CONTENT "#!/bin/sh\nulimit -n 4096\nexec \"$@\"" - FILE_PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ - ) - set(COIN_BUG_699 ON PARENT_SCOPE) diff --git a/www/qt6-webengine/files/patch-cmake_QtConfigureHelpers.cmake b/www/qt6-webengine/files/patch-cmake_QtConfigureHelpers.cmake new file mode 100644 index 000000000000..9dbb24127482 --- /dev/null +++ b/www/qt6-webengine/files/patch-cmake_QtConfigureHelpers.cmake @@ -0,0 +1,20 @@ +--- cmake/QtConfigureHelpers.cmake.orig 2025-02-21 12:29:33 UTC ++++ cmake/QtConfigureHelpers.cmake +@@ -191,7 +191,7 @@ function(qt_webengine_configure_check_for_ulimit) + + function(qt_webengine_configure_check_for_ulimit) + message(STATUS "Checking 'ulimit -n'") +- execute_process(COMMAND bash -c "ulimit -n" ++ execute_process(COMMAND sh -c "ulimit -n" + OUTPUT_VARIABLE ulimit_output + ) + string(REGEX MATCHALL "[0-9]+" limit "${ulimit_output}") +@@ -200,7 +200,7 @@ function(qt_webengine_configure_check_for_ulimit) + if(NOT ${CMAKE_VERSION} VERSION_LESS "3.21.0") + message(STATUS "Creating linker launcher") + file(GENERATE OUTPUT ${PROJECT_BINARY_DIR}/linker_ulimit.sh +- CONTENT "#!/bin/bash\nulimit -n 4096\nexec \"$@\"" ++ CONTENT "#!/bin/sh\nulimit -n 4096\nexec \"$@\"" + FILE_PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ + ) + set(COIN_BUG_699 ON PARENT_SCOPE) diff --git a/www/qt6-webengine/files/patch-configure.cmake b/www/qt6-webengine/files/patch-configure.cmake index 90d0ec130ed5..5505a55e5e3c 100644 --- a/www/qt6-webengine/files/patch-configure.cmake +++ b/www/qt6-webengine/files/patch-configure.cmake @@ -1,15 +1,55 @@ ---- configure.cmake.orig 2024-11-21 04:36:37 UTC +--- configure.cmake.orig 2025-02-21 12:29:33 UTC +++ configure.cmake -@@ -73,7 +73,7 @@ endif() - endif() +@@ -292,12 +292,12 @@ qt_webengine_configure_check("supported-platform" - #### Tests --if(LINUX) -+if(LINUX OR FREEBSD) - check_for_ulimit() - endif() + qt_webengine_configure_check("supported-platform" + MODULES QtWebEngine +- CONDITION LINUX OR (WIN32 AND NOT (WIN_ARM_64 AND DEFINED ENV{COIN_PLATFORM_ID})) OR MACOS ++ CONDITION LINUX OR (WIN32 AND NOT (WIN_ARM_64 AND DEFINED ENV{COIN_PLATFORM_ID})) OR MACOS OR FREEBSD + MESSAGE "Build can be done only on Linux, Windows or macOS." + ) + qt_webengine_configure_check("supported-platform" + MODULES QtPdf +- CONDITION LINUX OR WIN32 OR MACOS OR IOS OR ANDROID ++ CONDITION LINUX OR WIN32 OR MACOS OR IOS OR ANDROID OR FREEBSD + MESSAGE "Build can be done only on Linux, Windows, macO, iOS and Android." + ) + +@@ -317,15 +317,6 @@ qt_webengine_configure_check("static-build" + MESSAGE "Static build is not supported." + ) -@@ -434,7 +434,7 @@ qt_feature("webengine-ozone-x11" PRIVATE +-qt_webengine_configure_check("nodejs" +- MODULES QtWebEngine +- CONDITION TARGET Nodejs::Nodejs AND +- NOT (Nodejs_ARCH STREQUAL "ia32") AND +- NOT (Nodejs_ARCH STREQUAL "x86") AND +- NOT (Nodejs_ARCH STREQUAL "arm") +- MESSAGE "64-bit Node.js ${QT_CONFIGURE_CHECK_nodejs_version} version or later is required." +- DOCUMENTATION "64-bit Nodejs ${QT_CONFIGURE_CHECK_nodejs_version} version or later." +-) + qt_webengine_configure_check("python3" + MODULES QtWebEngine QtPdf + CONDITION Python3_FOUND +@@ -448,6 +439,8 @@ qt_webengine_configure_check("compiler" + CONDITION MSVC OR + (LINUX AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU") OR + (LINUX AND CMAKE_CXX_COMPILER_ID STREQUAL "Clang") OR ++ (FREEBSD AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU") OR ++ (FREEBSD AND CMAKE_CXX_COMPILER_ID STREQUAL "Clang") OR + (MACOS AND CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang") + MESSAGE + "${CMAKE_CXX_COMPILER_ID} compiler is not supported." +@@ -457,6 +450,8 @@ qt_webengine_configure_check("compiler" + CONDITION MSVC OR + (LINUX AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU") OR + (LINUX AND CMAKE_CXX_COMPILER_ID STREQUAL "Clang") OR ++ (FREEBSD AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU") OR ++ (FREEBSD AND CMAKE_CXX_COMPILER_ID STREQUAL "Clang") OR + (APPLE AND CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang") OR + (ANDROID AND CMAKE_CXX_COMPILER_ID STREQUAL "Clang") OR + (MINGW AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU") OR +@@ -709,7 +704,7 @@ qt_feature("webengine-ozone-x11" PRIVATE qt_feature("webengine-ozone-x11" PRIVATE LABEL "Support X11 on qpa-xcb" @@ -17,55 +57,4 @@ + CONDITION LINUX OR FREEBSD AND TARGET Qt::Gui AND QT_FEATURE_xcb - AND X11_FOUND -@@ -474,12 +474,12 @@ add_check_for_support( - ) - add_check_for_support( - MODULES QtWebEngine -- CONDITION LINUX OR (WIN32 AND NOT WIN_ARM_64) OR MACOS -+ CONDITION LINUX OR (WIN32 AND NOT WIN_ARM_64) OR MACOS OR FREEBSD - MESSAGE "Build can be done only on Linux, Windows or macOS." - ) - add_check_for_support( - MODULES QtPdf -- CONDITION LINUX OR (WIN32 AND NOT WIN_ARM_64) OR MACOS OR IOS OR ANDROID -+ CONDITION LINUX OR (WIN32 AND NOT WIN_ARM_64) OR MACOS OR IOS OR ANDROID OR FREEBSD - MESSAGE "Build can be done only on Linux, Windows, macO, iOS and Android." - ) - if(LINUX AND CMAKE_CROSSCOMPILING) -@@ -502,13 +502,6 @@ add_check_for_support( - MESSAGE "node.js version 14 or later is required." - ) - add_check_for_support( -- MODULES QtWebEngine -- CONDITION NOT (Nodejs_ARCH STREQUAL "ia32") AND -- NOT (Nodejs_ARCH STREQUAL "x86") AND -- NOT (Nodejs_ARCH STREQUAL "arm") -- MESSAGE "32bit version of Nodejs is not supported." --) --add_check_for_support( - MODULES QtWebEngine QtPdf - CONDITION Python3_EXECUTABLE - MESSAGE "Python version 3.8 or later is required." -@@ -572,8 +565,8 @@ add_check_for_support( - add_check_for_support( - MODULES QtWebEngine - CONDITION MSVC OR -- (LINUX AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU") OR -- (LINUX AND CMAKE_CXX_COMPILER_ID STREQUAL "Clang") OR -+ (FREEBSD AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU") OR -+ (FREEBSD AND CMAKE_CXX_COMPILER_ID STREQUAL "Clang") OR - (MACOS AND CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang") - MESSAGE - "${CMAKE_CXX_COMPILER_ID} compiler is not supported." -@@ -582,8 +575,8 @@ add_check_for_support( - add_check_for_support( - MODULES QtPdf - CONDITION MSVC OR -- (LINUX AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU") OR -- (LINUX AND CMAKE_CXX_COMPILER_ID STREQUAL "Clang") OR -+ (FREEBSD AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU") OR -+ (FREEBSD AND CMAKE_CXX_COMPILER_ID STREQUAL "Clang") OR - (APPLE AND CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang") OR - (ANDROID AND CMAKE_CXX_COMPILER_ID STREQUAL "Clang") OR - (MINGW AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU") OR + AND qpa_xcb_support_check diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_BUILD.gn index 86d1b13290b8..67f845c974a5 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_BUILD.gn @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/BUILD.gn.orig 2024-07-03 01:14:49 UTC +--- src/3rdparty/chromium/BUILD.gn.orig 2025-02-21 12:29:33 UTC +++ src/3rdparty/chromium/BUILD.gn -@@ -64,7 +64,7 @@ declare_args() { +@@ -67,7 +67,7 @@ declare_args() { qtwebengine_target = "//tools/gn" } @@ -9,7 +9,7 @@ # An official (maximally optimized!) component (optimized for build times) # build doesn't make sense and usually doesn't work. assert(!is_component_build) -@@ -96,7 +96,6 @@ group("gn_all") { +@@ -99,7 +99,6 @@ group("gn_all") { "//codelabs", "//components:components_unittests", "//components/gwp_asan:gwp_asan_unittests", @@ -17,7 +17,7 @@ "//net:net_unittests", "//sandbox:sandbox_unittests", "//services:services_unittests", -@@ -426,7 +425,7 @@ group("gn_all") { +@@ -438,7 +437,7 @@ group("gn_all") { } } @@ -26,32 +26,32 @@ deps += [ "//third_party/breakpad:breakpad_unittests", "//third_party/breakpad:core-2-minidump", -@@ -626,6 +625,15 @@ group("gn_all") { +@@ -629,6 +628,15 @@ group("gn_all") { } } + if (is_bsd) { + deps -= [ -+ "//third_party/breakpad:dump_syms($host_toolchain)", -+ "//third_party/breakpad:microdump_stackwalk($host_toolchain)", -+ "//third_party/breakpad:minidump_dump($host_toolchain)", -+ "//third_party/breakpad:minidump_stackwalk($host_toolchain)", ++ "//third_party/breakpad:dump_syms($host_system_allocator_toolchain)", ++ "//third_party/breakpad:microdump_stackwalk($host_system_allocator_toolchain)", ++ "//third_party/breakpad:minidump_dump($host_system_allocator_toolchain)", ++ "//third_party/breakpad:minidump_stackwalk($host_system_allocator_toolchain)", + ] + } + - if (is_mac) { + if (is_mac && !is_qtwebengine) { deps += [ - "//third_party/breakpad:dump_syms", -@@ -672,7 +680,7 @@ group("gn_all") { - host_os == "win") { - deps += [ "//chrome/test/mini_installer:mini_installer_tests" ] + "//third_party/breakpad:dump_syms($host_system_allocator_toolchain)", +@@ -677,7 +685,7 @@ group("gn_all") { } -- } else if (!is_android && !is_ios && !is_fuchsia) { -+ } else if (!is_android && !is_ios && !is_fuchsia && !is_bsd) { - deps += [ "//third_party/breakpad:symupload($host_toolchain)" ] } -@@ -1093,7 +1101,7 @@ if (use_blink && !is_cronet_build) { +- if (!is_fuchsia) { ++ if (!is_fuchsia && !is_bsd) { + # The official builders use this binary from the default toolchain's + # output directory after building in order to upload the symbols of that + # binary. They build the binary like `ninja symupload` which requires the +@@ -1159,7 +1167,7 @@ if (use_blink && !is_cronet_build) { ] } @@ -59,31 +59,31 @@ + if (!is_chromeos_ash && !is_ios && !is_fuchsia && !is_android && !is_castos && !is_bsd) { script_test("chrome_wpt_tests") { script = "//third_party/blink/tools/run_wpt_tests.py" - args = [ -@@ -1184,7 +1192,7 @@ if (use_blink && !is_cronet_build) { + args = _common_web_test_options + [ "--product=chrome" ] +@@ -1252,7 +1260,7 @@ if (use_blink && !is_cronet_build) { data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ] } - if (!is_win && !is_android) { + if (!is_win && !is_android && !is_bsd) { - data_deps += - [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ] - } -@@ -1193,7 +1201,7 @@ if (use_blink && !is_cronet_build) { - data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] + # Using the default toolchain for this tool, as it's run during tests not + # during the build. This places a symlink in the root_build_dir for scrips + # to use. +@@ -1266,7 +1274,7 @@ if (use_blink && !is_cronet_build) { + data_deps += [ "//third_party/breakpad:dump_syms" ] } - if (is_linux || is_chromeos) { + if ((is_linux && !is_bsd) || is_chromeos) { - data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] - } - -@@ -1643,7 +1651,7 @@ group("chromium_builder_perf") { + # Using the default toolchain for this tool, as it's run during tests not + # during the build. This places a symlink in the root_build_dir for scrips + # to use. +@@ -1730,7 +1738,7 @@ group("chromium_builder_perf") { data_deps += [ "//chrome/test:performance_browser_tests" ] } - if (!is_win) { + if (!is_win && !is_bsd) { - data_deps += - [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ] + data_deps += [ "//third_party/breakpad:minidump_stackwalk($host_system_allocator_toolchain)" ] } + } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_BUILD.gn index ebadb159749f..d7ff343cada4 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_BUILD.gn @@ -1,15 +1,6 @@ ---- src/3rdparty/chromium/base/BUILD.gn.orig 2024-07-03 01:14:49 UTC +--- src/3rdparty/chromium/base/BUILD.gn.orig 2025-02-21 12:29:33 UTC +++ src/3rdparty/chromium/base/BUILD.gn -@@ -188,7 +188,7 @@ buildflag_header("ios_cronet_buildflags") { - flags = [ "CRONET_BUILD=$is_cronet_build" ] - } - --enable_message_pump_epoll = is_linux || is_chromeos || is_android -+enable_message_pump_epoll = (is_linux || is_chromeos || is_android) && !is_bsd - buildflag_header("message_pump_buildflags") { - header = "message_pump_buildflags.h" - header_dir = "base/message_loop" -@@ -1125,11 +1125,23 @@ jumbo_component("base") { +@@ -1107,11 +1107,26 @@ jumbo_component("base") { # Needed for 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. @@ -21,7 +12,10 @@ + # *BSD needs libkvm + if (is_bsd) { -+ libs += [ "kvm" ] ++ libs += [ ++ "kvm", ++ "epoll-shim", ++ ] + } + + if (is_freebsd) { @@ -34,7 +28,7 @@ if (use_allocator_shim) { if (is_apple) { sources += [ "allocator/early_zone_registration_apple.h" ] -@@ -1149,7 +1161,7 @@ jumbo_component("base") { +@@ -1131,7 +1146,7 @@ jumbo_component("base") { # Allow more direct string conversions on platforms with native utf8 # strings @@ -43,7 +37,7 @@ defines += [ "SYSTEM_NATIVE_UTF8" ] } -@@ -2100,6 +2112,22 @@ jumbo_component("base") { +@@ -2116,6 +2131,22 @@ jumbo_component("base") { ] } @@ -66,7 +60,7 @@ # iOS if (is_ios) { sources += [ -@@ -2230,6 +2258,31 @@ jumbo_component("base") { +@@ -2260,6 +2291,33 @@ jumbo_component("base") { } } @@ -74,6 +68,8 @@ + 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", @@ -98,16 +94,16 @@ if (use_blink) { sources += [ "files/file_path_watcher.cc", -@@ -2240,7 +2293,7 @@ jumbo_component("base") { - } +@@ -2586,7 +2644,7 @@ buildflag_header("protected_memory_buildflags") { + header = "protected_memory_buildflags.h" + header_dir = "base/memory" - if (dep_libevent) { -- deps += [ "//third_party/libevent" ] -+ public_deps += [ "//third_party/libevent" ] - } +- protected_memory_enabled = !is_component_build && is_clang && ++ protected_memory_enabled = !is_openbsd && !is_component_build && is_clang && + (is_win || is_linux || is_android || is_mac) - if (use_libevent) { -@@ -3005,7 +3058,7 @@ if (is_apple) { + flags = [ "PROTECTED_MEMORY_ENABLED=$protected_memory_enabled" ] +@@ -3069,7 +3127,7 @@ if (is_apple) { } } @@ -116,24 +112,16 @@ # This test must compile with -fstack-protector-all source_set("stack_canary_linux_unittests") { testonly = true -@@ -3642,14 +3695,14 @@ test("base_unittests") { +@@ -3731,7 +3789,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", - "nix/mime_util_xdg_unittest.cc", - ] - -- if (!is_nacl) { -+ if (!is_nacl && !is_bsd) { - deps += [ ":stack_canary_linux_unittests" ] - } - } -@@ -3664,7 +3717,7 @@ test("base_unittests") { +@@ -3758,7 +3816,7 @@ test("base_unittests") { "posix/file_descriptor_shuffle_unittest.cc", "posix/unix_domain_socket_unittest.cc", ] @@ -142,7 +130,7 @@ sources += [ "profiler/stack_base_address_posix_unittest.cc", "profiler/stack_copier_signal_unittest.cc", -@@ -3675,7 +3728,7 @@ test("base_unittests") { +@@ -3769,7 +3827,7 @@ test("base_unittests") { # Allow more direct string conversions on platforms with native utf8 # strings @@ -151,8 +139,8 @@ defines += [ "SYSTEM_NATIVE_UTF8" ] } -@@ -3938,7 +3991,7 @@ test("base_unittests") { - } +@@ -3956,7 +4014,7 @@ test("base_unittests") { + deps += [ ":base_profiler_test_support_library" ] } - if (is_fuchsia || is_linux || is_chromeos) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_dispatcher_tls.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_dispatcher_tls.h index 2fe6ae1d70c6..c3d862b9eb2c 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_dispatcher_tls.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_dispatcher_tls.h @@ -1,8 +1,8 @@ ---- src/3rdparty/chromium/base/allocator/dispatcher/tls.h.orig 2023-11-03 10:09:45 UTC +--- src/3rdparty/chromium/base/allocator/dispatcher/tls.h.orig 2024-05-21 18:07:39 UTC +++ src/3rdparty/chromium/base/allocator/dispatcher/tls.h -@@ -74,7 +74,7 @@ struct BASE_EXPORT MMapAllocator { - partition_alloc::PartitionPageSize(); - #elif BUILDFLAG(IS_APPLE) +@@ -77,7 +77,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/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc.gni b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc.gni index 46a2e18c9559..9b89f7f392e8 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc.gni +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc.gni @@ -1,7 +1,7 @@ ---- src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc.gni.orig 2024-03-06 06:05:23 UTC +--- src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc.gni.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc.gni -@@ -30,7 +30,7 @@ if (is_nacl) { - } +@@ -31,7 +31,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) @@ -9,12 +9,12 @@ declare_args() { # Causes all the allocations to be routed via allocator_shim.cc. Usually, -@@ -335,7 +335,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 || is_chromeos) && target_cpu == "x64" && !is_cronet_build -+ !is_bsd && (is_linux || is_chromeos) && target_cpu == "x64" && !is_cronet_build +@@ -391,7 +391,7 @@ assert(!use_asan_backup_ref_ptr || use_raw_ptr_hookabl + # dependencies that use partition_allocator are compiled in AOSP against a + # version of glibc that does not include pkeys syscall numbers. + is_pkeys_available = +- (is_linux || is_chromeos) && current_cpu == "x64" && !is_cronet_build ++ !is_bsd && (is_linux || is_chromeos) && current_cpu == "x64" && !is_cronet_build + declare_args() { + enable_pkeys = is_pkeys_available } - assert(!enable_pkeys || ((is_linux || is_chromeos) && target_cpu == "x64"), - "Pkeys are only supported on x64 linux and ChromeOS") diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_BUILD.gn index 4885eb86cba7..cc1021369a9b 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_BUILD.gn @@ -1,7 +1,7 @@ ---- src/3rdparty/chromium/base/allocator/partition_allocator/src/partition_alloc/BUILD.gn.orig 2024-10-02 15:40:01 UTC +--- src/3rdparty/chromium/base/allocator/partition_allocator/src/partition_alloc/BUILD.gn.orig 2025-02-21 12:29:33 UTC +++ src/3rdparty/chromium/base/allocator/partition_allocator/src/partition_alloc/BUILD.gn -@@ -856,7 +856,7 @@ if (is_clang_or_gcc || is_msvc || is_mingw) { - configs -= [ "//build/config/compiler:enable_arc" ] +@@ -860,7 +860,7 @@ if (is_clang_or_gcc || is_msvc || is_mingw) { + configs -= [ partition_alloc_enable_arc_config ] } } - if (is_chromeos || is_linux) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_address__space__randomization.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_address__space__randomization.h index cfb2742ca500..fde21bf3e5c3 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_address__space__randomization.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_address__space__randomization.h @@ -1,20 +1,20 @@ ---- src/3rdparty/chromium/base/allocator/partition_allocator/src/partition_alloc/address_space_randomization.h.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/base/allocator/partition_allocator/src/partition_alloc/address_space_randomization.h.orig 2024-07-30 11:12:21 UTC +++ src/3rdparty/chromium/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) + #if PA_BUILDFLAG(PA_ARCH_CPU_64_BITS) - #if defined(MEMORY_TOOL_REPLACES_ALLOCATOR) -+ #if defined(MEMORY_TOOL_REPLACES_ALLOCATOR) && !BUILDFLAG(IS_BSD) ++ #if defined(MEMORY_TOOL_REPLACES_ALLOCATOR) && !PA_BUILDFLAG(IS_BSD) // We shouldn't allocate system pages at all for sanitizer builds. However, // we do, and if random hint addresses interfere with address ranges -@@ -126,7 +126,7 @@ AslrMask(uintptr_t bits) { +@@ -125,7 +125,7 @@ AslrMask(uintptr_t bits) { return AslrAddress(0x20000000ULL); } - -- #elif BUILDFLAG(IS_LINUX) -+ #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #elif PA_BUILDFLAG(PA_ARCH_CPU_ARM64) +- #if PA_BUILDFLAG(IS_LINUX) ++ #if PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_BSD) // Linux on arm64 can use 39, 42, 48, or 52-bit user space, depending on // page size and number of levels of translation pages used. We use diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_page__allocator.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_page__allocator.h index 24009d850968..140506fd1bc6 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_page__allocator.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_page__allocator.h @@ -1,11 +1,11 @@ ---- src/3rdparty/chromium/base/allocator/partition_allocator/src/partition_alloc/page_allocator.h.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/base/allocator/partition_allocator/src/partition_alloc/page_allocator.h.orig 2024-08-26 12:06:38 UTC +++ src/3rdparty/chromium/base/allocator/partition_allocator/src/partition_alloc/page_allocator.h -@@ -256,7 +256,7 @@ bool DecommitAndZeroSystemPages(void* address, +@@ -269,7 +269,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) +-#if PA_BUILDFLAG(IS_APPLE) ++#if PA_BUILDFLAG(IS_APPLE) || PA_BUILDFLAG(IS_BSD) return false; #else return true; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_page__allocator__constants.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_page__allocator__constants.h index 369c01827f4b..4c0d3da78778 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_page__allocator__constants.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_page__allocator__constants.h @@ -1,38 +1,13 @@ ---- src/3rdparty/chromium/base/allocator/partition_allocator/src/partition_alloc/page_allocator_constants.h.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/base/allocator/partition_allocator/src/partition_alloc/page_allocator_constants.h.orig 2024-08-26 12:06:38 UTC +++ src/3rdparty/chromium/base/allocator/partition_allocator/src/partition_alloc/page_allocator_constants.h -@@ -25,7 +25,7 @@ - // elimination. +@@ -26,8 +26,8 @@ #define PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR __attribute__((const)) --#elif (BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)) && defined(ARCH_CPU_ARM64) -+#elif (BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64) + #elif (PA_BUILDFLAG(IS_ANDROID) && PA_BUILDFLAG(PA_ARCH_CPU_64_BITS)) || \ +- (PA_BUILDFLAG(IS_LINUX) && PA_BUILDFLAG(PA_ARCH_CPU_ARM64)) || \ +- (PA_BUILDFLAG(IS_LINUX) && PA_BUILDFLAG(PA_ARCH_CPU_PPC64)) ++ ((PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_BSD)) && PA_BUILDFLAG(PA_ARCH_CPU_ARM64)) || \ ++ ((PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_BSD)) && PA_BUILDFLAG(PA_ARCH_CPU_PPC64)) // 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(vm_page_shift); --#elif (BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)) && defined(ARCH_CPU_ARM64) -+#elif (BUILDFLAG(IS_ANDROID) || 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_ANDROID) || BUILDFLAG(IS_LINUX)) && defined(ARCH_CPU_ARM64) -+#elif (BUILDFLAG(IS_ANDROID) || 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); -@@ -153,7 +153,7 @@ PA_ALWAYS_INLINE PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONS - SystemPageSize() { - #if (BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_64_BITS)) || \ - (BUILDFLAG(IS_ANDROID) && defined(ARCH_CPU_ARM64)) || \ -- (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 Android/Linux to avoid << - // on a non-constexpr. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_page__allocator__internals__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_page__allocator__internals__posix.cc new file mode 100644 index 000000000000..fe5ef967ecc3 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_page__allocator__internals__posix.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_posix.cc.orig 2024-08-26 12:06:38 UTC ++++ src/3rdparty/chromium/base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_posix.cc +@@ -9,7 +9,7 @@ + #include "partition_alloc/page_allocator.h" + + #if PA_BUILDFLAG(HAS_MEMORY_TAGGING) || \ +- (defined(__ARM_FEATURE_BTI_DEFAULT) && (__ARM_FEATURE_BTI_DEFAULT == 1)) ++ (defined(__ARM_FEATURE_BTI_DEFAULT) && (__ARM_FEATURE_BTI_DEFAULT == 1) && !PA_BUILDFLAG(IS_BSD)) + struct __ifunc_arg_t; + + #include "partition_alloc/aarch64_support.h" diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_page__allocator__internals__posix.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_page__allocator__internals__posix.h index c93b1be7c587..60bec9706295 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_page__allocator__internals__posix.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_page__allocator__internals__posix.h @@ -1,12 +1,12 @@ ---- src/3rdparty/chromium/base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_posix.h.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_posix.h.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_posix.h -@@ -411,8 +411,12 @@ bool TryRecommitSystemPagesInternal( +@@ -412,8 +412,12 @@ bool TryRecommitSystemPagesInternal( void DiscardSystemPagesInternal(uintptr_t address, size_t length) { void* ptr = reinterpret_cast(address); --#if BUILDFLAG(IS_APPLE) -+#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD) -+#if BUILDFLAG(IS_BSD) +-#if PA_BUILDFLAG(IS_APPLE) ++#if PA_BUILDFLAG(IS_APPLE) || PA_BUILDFLAG(IS_BSD) ++#if PA_BUILDFLAG(IS_BSD) + int ret = madvise(ptr, length, MADV_FREE); +#else int ret = madvise(ptr, length, MADV_FREE_REUSABLE); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_partition__address__space.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_partition__address__space.cc deleted file mode 100644 index 5170b78750fb..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_partition__address__space.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/base/allocator/partition_allocator/src/partition_alloc/partition_address_space.cc.orig 2024-02-23 21:04:38 UTC -+++ src/3rdparty/chromium/base/allocator/partition_allocator/src/partition_alloc/partition_address_space.cc -@@ -421,7 +421,7 @@ void PartitionAddressSpace::UninitThreadIsolatedPoolFo - } - #endif - --#if (BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)) && defined(ARCH_CPU_ARM64) -+#if (BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64) - - PageCharacteristics page_characteristics; - diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_debug_proc__maps__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_debug_proc__maps__linux.cc new file mode 100644 index 000000000000..1ce0cc6c6e8a --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_debug_proc__maps__linux.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug/proc_maps_linux.cc.orig 2024-08-26 12:06:38 UTC ++++ src/3rdparty/chromium/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug/proc_maps_linux.cc +@@ -19,7 +19,7 @@ + #include "partition_alloc/partition_alloc_check.h" + + #if PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_CHROMEOS) || \ +- PA_BUILDFLAG(IS_ANDROID) ++ PA_BUILDFLAG(IS_ANDROID) || PA_BUILDFLAG(IS_BSD) + #include + #endif + diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_debug_stack__trace__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_debug_stack__trace__posix.cc index 5c9b69b52e1c..4e2d93083c04 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_debug_stack__trace__posix.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_debug_stack__trace__posix.cc @@ -1,16 +1,16 @@ ---- src/3rdparty/chromium/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug/stack_trace_posix.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug/stack_trace_posix.cc.orig 2024-07-30 11:12:21 UTC +++ src/3rdparty/chromium/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) +-#if !PA_BUILDFLAG(IS_ANDROID) && !PA_BUILDFLAG(IS_APPLE) ++#if !PA_BUILDFLAG(IS_ANDROID) && !PA_BUILDFLAG(IS_APPLE) && !PA_BUILDFLAG(IS_BSD) #include // For ElfW() macro. #endif --#if BUILDFLAG(IS_APPLE) -+#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD) +-#if PA_BUILDFLAG(IS_APPLE) ++#if PA_BUILDFLAG(IS_APPLE) || PA_BUILDFLAG(IS_BSD) #include #endif @@ -18,17 +18,17 @@ namespace { --#if !BUILDFLAG(IS_APPLE) -+#if !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD) +-#if !PA_BUILDFLAG(IS_APPLE) ++#if !PA_BUILDFLAG(IS_APPLE) && !PA_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) + #endif // !PA_BUILDFLAG(IS_APPLE) --#if BUILDFLAG(IS_APPLE) -+#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD) +-#if PA_BUILDFLAG(IS_APPLE) ++#if PA_BUILDFLAG(IS_APPLE) || PA_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/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_rand__util__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_rand__util__posix.cc index ff0aabe6289c..32b9763b2a86 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_rand__util__posix.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_rand__util__posix.cc @@ -1,10 +1,10 @@ ---- src/3rdparty/chromium/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/rand_util_posix.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/rand_util_posix.cc.orig 2024-07-30 11:12:21 UTC +++ src/3rdparty/chromium/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) ++#elif PA_BUILDFLAG(IS_BSD) + if (getentropy(output, output_length) == 0) { + return; + } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread.h index f584ea6e1009..1fa753339d45 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread.h @@ -1,11 +1,11 @@ ---- src/3rdparty/chromium/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread.h.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread.h.orig 2024-07-30 11:12:21 UTC +++ src/3rdparty/chromium/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) + #elif PA_BUILDFLAG(IS_APPLE) typedef mach_port_t PlatformThreadId; -+#elif BUILDFLAG(IS_BSD) ++#elif PA_BUILDFLAG(IS_BSD) +typedef uint64_t PlatformThreadId; - #elif BUILDFLAG(IS_POSIX) + #elif PA_BUILDFLAG(IS_POSIX) typedef pid_t PlatformThreadId; #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread__internal__posix.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread__internal__posix.h index f7b3d31f7b5f..aaaf1dec6610 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread__internal__posix.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread__internal__posix.h @@ -1,11 +1,11 @@ ---- src/3rdparty/chromium/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_internal_posix.h.orig 2023-12-10 06:10:27 UTC +--- src/3rdparty/chromium/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_internal_posix.h.orig 2024-07-30 11:12:21 UTC +++ src/3rdparty/chromium/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 { --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) +-#if PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_CHROMEOS) ++#if PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_CHROMEOS) || PA_BUILDFLAG(IS_BSD) // Current thread id is cached in thread local storage for performance reasons. // In some rare cases it's important to invalidate that cache explicitly (e.g. // after going through clone() syscall which does not call pthread_atfork() diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread__posix.cc index 0e72a3f867e1..95a79724e7f6 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread__posix.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread__posix.cc @@ -1,11 +1,11 @@ ---- src/3rdparty/chromium/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_posix.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_posix.cc.orig 2024-07-30 11:12:21 UTC +++ src/3rdparty/chromium/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) +-#if PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_CHROMEOS) ++#if PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_CHROMEOS) || PA_BUILDFLAG(IS_BSD) #include #include #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_partition__alloc__config.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_partition__alloc__config.h index 7558a814bd88..6c552b7d1562 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_partition__alloc__config.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_partition__alloc__config.h @@ -1,20 +1,20 @@ ---- src/3rdparty/chromium/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_config.h.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_config.h.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/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. +@@ -168,7 +168,7 @@ constexpr bool kUseLazyCommit = false; // 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)) + #define PA_CONFIG_HAS_ATFORK_HANDLER() \ + (PA_BUILDFLAG(IS_APPLE) || PA_BUILDFLAG(IS_LINUX) || \ +- PA_BUILDFLAG(IS_CHROMEOS)) ++ PA_BUILDFLAG(IS_CHROMEOS) || PA_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; + // Enable shadow metadata. // - // Also enabled on ARM64 macOS, as the 16kiB pages on this platform lead to - // larger slot spans. --#if BUILDFLAG(IS_LINUX) || (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64)) -+#if BUILDFLAG(IS_LINUX) || (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64)) || BUILDFLAG(IS_BSD) +@@ -231,7 +231,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 PA_BUILDFLAG(IS_LINUX) || \ +- (PA_BUILDFLAG(IS_APPLE) && PA_BUILDFLAG(PA_ARCH_CPU_ARM64)) ++ (PA_BUILDFLAG(IS_APPLE) && PA_BUILDFLAG(PA_ARCH_CPU_ARM64)) || PA_BUILDFLAG(IS_BSD) #define PA_CONFIG_PREFER_SMALLER_SLOT_SPANS() 1 #else #define PA_CONFIG_PREFER_SMALLER_SLOT_SPANS() 0 diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_partition__alloc__constants.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_partition__alloc__constants.h index 900822e4d013..ee90eacba8f2 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_partition__alloc__constants.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_partition__alloc__constants.h @@ -1,20 +1,20 @@ ---- src/3rdparty/chromium/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h.orig 2024-08-26 12:51:32 UTC +--- src/3rdparty/chromium/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h.orig 2024-09-30 07:45:04 UTC +++ src/3rdparty/chromium/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h -@@ -112,7 +112,7 @@ PartitionPageShift() { - } - #elif (BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_64_BITS)) || \ - (BUILDFLAG(IS_ANDROID) && defined(ARCH_CPU_ARM64)) || \ -- (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; -@@ -315,7 +315,7 @@ constexpr size_t kPoolMaxSize = 1 * kGiB; - #if BUILDFLAG(HAS_64_BIT_POINTERS) - #if BUILDFLAG(IS_IOS) - constexpr size_t kPoolMaxSize = 1 * kGiB; --#elif BUILDFLAG(IS_ANDROID) || \ -+#elif BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) || \ - BUILDFLAG(ENABLE_POINTER_COMPRESSION) +@@ -329,7 +329,7 @@ PA_DEFINE_OPERATORS_FOR_FLAGS(PoolHandleMask); + // 8GB for each of the glued pools). + #if PA_BUILDFLAG(HAS_64_BIT_POINTERS) + #if PA_BUILDFLAG(IS_ANDROID) || PA_BUILDFLAG(IS_IOS) || \ +- PA_BUILDFLAG(ENABLE_POINTER_COMPRESSION) ++ PA_BUILDFLAG(ENABLE_POINTER_COMPRESSION) || PA_BUILDFLAG(IS_BSD) constexpr size_t kPoolMaxSize = 8 * kGiB; #else + constexpr size_t kPoolMaxSize = 16 * kGiB; +@@ -446,7 +446,7 @@ PA_ALWAYS_INLINE constexpr size_t MaxDirectMapped() { + // TODO(casey.smalley@arm.com): under 64k pages we can end up in a situation + // where a normal slot span will be large enough to contain multiple items, + // but the address will go over the final partition page after being aligned. +-#if PA_BUILDFLAG(IS_LINUX) && PA_BUILDFLAG(PA_ARCH_CPU_ARM64) ++#if (PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_BSD)) && PA_BUILDFLAG(PA_ARCH_CPU_ARM64) + constexpr size_t kMaxSupportedAlignment = kSuperPageSize / 4; + #else + constexpr size_t kMaxSupportedAlignment = kSuperPageSize / 2; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_partition__alloc__forward.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_partition__alloc__forward.h index 674ed11744d9..ee021b3e2b13 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_partition__alloc__forward.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_partition__alloc__forward.h @@ -4,7 +4,7 @@ // the second one 16. We could technically return something different for // malloc() and operator new(), but this would complicate things, and most of // our allocations are presumably coming from operator new() anyway. -+#if defined(__i386__) && defined(OS_FREEBSD) ++#if defined(__i386__) && PA_BUILDFLAG(IS_FREEBSD) +constexpr size_t kAlignment = 8; +#else constexpr size_t kAlignment = diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_partition__page__constants.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_partition__page__constants.h deleted file mode 100644 index 1a908cd3cdbc..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_partition__page__constants.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/base/allocator/partition_allocator/src/partition_alloc/partition_page_constants.h.orig 2024-02-23 21:04:38 UTC -+++ src/3rdparty/chromium/base/allocator/partition_allocator/src/partition_alloc/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_ANDROID) || BUILDFLAG(IS_LINUX)) && defined(ARCH_CPU_ARM64) -+#elif (BUILDFLAG(IS_ANDROID) || 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/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_partition__root.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_partition__root.cc index 392db24a350f..851a06098206 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_partition__root.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_partition__root.cc @@ -1,38 +1,29 @@ ---- src/3rdparty/chromium/base/allocator/partition_allocator/src/partition_alloc/partition_root.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/base/allocator/partition_allocator/src/partition_alloc/partition_root.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/base/allocator/partition_allocator/src/partition_alloc/partition_root.cc -@@ -47,7 +47,7 @@ +@@ -44,7 +44,7 @@ #include "wow64apiset.h" #endif --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) +-#if PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_CHROMEOS) ++#if PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_CHROMEOS) || PA_BUILDFLAG(IS_BSD) #include #endif -@@ -278,7 +278,7 @@ void PartitionAllocMallocInitOnce() { +@@ -290,7 +290,7 @@ void PartitionAllocMallocInitOnce() { return; } --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) +-#if PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_CHROMEOS) ++#if PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_CHROMEOS) || PA_BUILDFLAG(IS_BSD) // When fork() is called, only the current thread continues to execute in the // child process. If the lock is held, but *not* by this thread when fork() is // called, we have a deadlock. -@@ -377,7 +377,7 @@ static size_t PartitionPurgeSlotSpan(PartitionRoot* ro - (PartitionPageSize() * kMaxPartitionPagesPerRegularSlotSpan) / - MinPurgeableSlotSize(); - #elif BUILDFLAG(IS_APPLE) || \ -- ((BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)) && \ -+ ((BUILDFLAG(IS_ANDROID) || 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, -@@ -942,7 +942,7 @@ void PartitionRoot::Init(PartitionOptions opts) { +@@ -1110,7 +1110,7 @@ void PartitionRoot::Init(PartitionOptions opts) { // apple OSes. PA_CHECK((internal::SystemPageSize() == (size_t{1} << 12)) || (internal::SystemPageSize() == (size_t{1} << 14))); --#elif BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64) -+#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64) +-#elif PA_BUILDFLAG(IS_LINUX) && PA_BUILDFLAG(PA_ARCH_CPU_ARM64) ++#elif (PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_BSD)) && PA_BUILDFLAG(PA_ARCH_CPU_ARM64) // Check runtime pagesize. Though the code is currently the same, it is - // not merged with the IS_APPLE case above as a 1 << 16 case needs to be - // added here in the future, to allow 64 kiB pagesize. That is only + // not merged with the IS_APPLE case above as a 1 << 16 case is only + // supported on Linux on AArch64. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_spinning__mutex.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_spinning__mutex.cc index 47e312021dc7..91edf0242df2 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_spinning__mutex.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_spinning__mutex.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/base/allocator/partition_allocator/src/partition_alloc/spinning_mutex.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/base/allocator/partition_allocator/src/partition_alloc/spinning_mutex.cc.orig 2024-08-26 12:06:38 UTC +++ src/3rdparty/chromium/base/allocator/partition_allocator/src/partition_alloc/spinning_mutex.cc @@ -17,7 +17,16 @@ #endif @@ -17,7 +17,7 @@ #include #include -@@ -109,8 +118,16 @@ void SpinningMutex::FutexWait() { +@@ -106,8 +115,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. @@ -34,7 +34,7 @@ if (err) { // These are programming error, check them. -@@ -122,8 +139,16 @@ void SpinningMutex::FutexWait() { +@@ -119,8 +136,16 @@ void SpinningMutex::FutexWait() { void SpinningMutex::FutexWake() { int saved_errno = errno; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_starscan_stack_stack.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_stack_stack.cc similarity index 78% rename from www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_starscan_stack_stack.cc rename to www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_stack_stack.cc index 91e7850bd1d7..2a9b857b50d8 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_starscan_stack_stack.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_stack_stack.cc @@ -1,14 +1,14 @@ ---- src/3rdparty/chromium/base/allocator/partition_allocator/src/partition_alloc/starscan/stack/stack.cc.orig 2023-12-10 06:10:27 UTC -+++ src/3rdparty/chromium/base/allocator/partition_allocator/src/partition_alloc/starscan/stack/stack.cc +--- src/3rdparty/chromium/base/allocator/partition_allocator/src/partition_alloc/stack/stack.cc.orig 2024-07-30 11:12:21 UTC ++++ src/3rdparty/chromium/base/allocator/partition_allocator/src/partition_alloc/stack/stack.cc @@ -18,6 +18,10 @@ #include #endif -+#if BUILDFLAG(IS_BSD) ++#if PA_BUILDFLAG(IS_BSD) +#include +#endif + - #if defined(LIBC_GLIBC) + #if PA_BUILDFLAG(PA_LIBC_GLIBC) extern "C" void* __libc_stack_end; #endif @@ -48,6 +52,36 @@ void* GetStackTop() { @@ -17,7 +17,7 @@ return pthread_get_stackaddr_np(pthread_self()); +} + -+#elif defined(OS_OPENBSD) ++#elif PA_BUILDFLAG(IS_OPENBSD) + +void* GetStackTop() { + stack_t ss; @@ -26,7 +26,7 @@ + return reinterpret_cast(ss.ss_sp); +} + -+#elif defined(OS_FREEBSD) ++#elif PA_BUILDFLAG(IS_FREEBSD) + +void* GetStackTop() { + pthread_attr_t attr; @@ -47,4 +47,4 @@ + return nullptr; } - #elif BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA) + #elif PA_BUILDFLAG(IS_POSIX) || PA_BUILDFLAG(IS_FUCHSIA) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_thread__isolation_pkey.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_thread__isolation_pkey.cc index 60317d26f79a..20ba1c5aed33 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_thread__isolation_pkey.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_thread__isolation_pkey.cc @@ -1,11 +1,11 @@ ---- src/3rdparty/chromium/base/allocator/partition_allocator/src/partition_alloc/thread_isolation/pkey.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/base/allocator/partition_allocator/src/partition_alloc/thread_isolation/pkey.cc.orig 2024-07-30 11:12:21 UTC +++ src/3rdparty/chromium/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) +-#if !PA_BUILDFLAG(IS_LINUX) && !PA_BUILDFLAG(IS_CHROMEOS) ++#if !PA_BUILDFLAG(IS_LINUX) && !PA_BUILDFLAG(IS_CHROMEOS) && !PA_BUILDFLAG(IS_BSD) #error "This pkey code is currently only supported on Linux and ChromeOS" #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_base__paths__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_base__paths__posix.cc index c36d7ef91d62..12f4f54f202b 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_base__paths__posix.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_base__paths__posix.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/base/base_paths_posix.cc.orig 2023-11-03 16:09:21 UTC +--- src/3rdparty/chromium/base/base_paths_posix.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/base/base_paths_posix.cc @@ -15,6 +15,7 @@ #include @@ -23,17 +23,17 @@ #elif BUILDFLAG(IS_SOLARIS) || BUILDFLAG(IS_AIX) #include #endif -@@ -48,8 +53,7 @@ bool PathProviderPosix(int key, FilePath* result) { +@@ -47,8 +52,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 }; -- absl::optional bin_dir = StringSysctl(name, std::size(name)); -+ absl::optional bin_dir = StringSysctl({ CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 }); +- std::optional bin_dir = StringSysctl(name, std::size(name)); ++ std::optional 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) { + } +@@ -62,13 +66,65 @@ bool PathProviderPosix(int key, FilePath* result) { *result = FilePath(bin_dir); return true; #elif BUILDFLAG(IS_OPENBSD) || BUILDFLAG(IS_AIX) @@ -73,7 +73,7 @@ + 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/qt6-webengine/files/patch-src_3rdparty_chromium_base_base__switches.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_base__switches.cc deleted file mode 100644 index 7ed92e8d362c..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_base__switches.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/base/base_switches.cc.orig 2024-02-23 21:04:38 UTC -+++ src/3rdparty/chromium/base/base_switches.cc -@@ -172,7 +172,7 @@ const char kPackageVersionName[] = "package-version-na - const char kPackageVersionCode[] = "package-version-code"; - #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/qt6-webengine/files/patch-src_3rdparty_chromium_base_base__switches.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_base__switches.h deleted file mode 100644 index 233a61a61877..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_base__switches.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/base/base_switches.h.orig 2024-02-23 21:04:38 UTC -+++ src/3rdparty/chromium/base/base_switches.h -@@ -60,7 +60,7 @@ extern const char kPackageVersionName[]; - extern const char kPackageVersionCode[]; - #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/qt6-webengine/files/patch-src_3rdparty_chromium_base_compiler__specific.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_compiler__specific.h index b01321905b32..bc82bddbe5cf 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_compiler__specific.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_compiler__specific.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/compiler_specific.h.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/base/compiler_specific.h.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/base/compiler_specific.h -@@ -316,7 +316,7 @@ +@@ -257,7 +257,7 @@ // // In some cases it's desirable to remove this, e.g. on hot functions, or if // we have purposely changed the reference canary. @@ -9,3 +9,12 @@ #if HAS_ATTRIBUTE(__no_stack_protector__) #define NO_STACK_PROTECTOR __attribute__((__no_stack_protector__)) #else +@@ -388,7 +388,7 @@ inline constexpr bool AnalyzerAssumeTrue(bool arg) { + // See https://clang.llvm.org/docs/AttributeReference.html#preserve-most for + // more details. + #if (defined(ARCH_CPU_ARM64) || defined(ARCH_CPU_X86_64)) && \ +- !(BUILDFLAG(IS_WIN) && defined(ARCH_CPU_ARM64)) && \ ++ !((BUILDFLAG(IS_WIN) || BUILDFLAG(IS_OPENBSD)) && defined(ARCH_CPU_ARM64)) && \ + !defined(COMPONENT_BUILD) && defined(__clang__) && \ + __clang_major__ >= 17 && HAS_ATTRIBUTE(preserve_most) + #define PRESERVE_MOST __attribute__((preserve_most)) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_debug_debugger__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_debug_debugger__posix.cc index 1b1d4b71fa31..3f636803c471 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_debug_debugger__posix.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_debug_debugger__posix.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/debug/debugger_posix.cc.orig 2022-04-21 18:48:31 UTC +--- src/3rdparty/chromium/base/debug/debugger_posix.cc.orig 2024-06-17 12:56:06 UTC +++ src/3rdparty/chromium/base/debug/debugger_posix.cc -@@ -35,6 +35,10 @@ +@@ -41,6 +41,10 @@ #include #endif @@ -11,7 +11,7 @@ #if BUILDFLAG(IS_FREEBSD) #include #endif -@@ -95,32 +99,51 @@ bool BeingDebugged() { +@@ -100,32 +104,51 @@ bool BeingDebugged() { // Caution: struct kinfo_proc is marked __APPLE_API_UNSTABLE. The source and // binary interfaces may change. @@ -27,7 +27,8 @@ 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((info_size / sizeof(struct kinfo_proc))); + if ((info = reinterpret_cast(malloc(info_size))) == NULL) { + is_set = true; + being_debugged = false; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_debug_elf__reader.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_debug_elf__reader.cc index babce6ea3dbf..65fbfc3a27f9 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_debug_elf__reader.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_debug_elf__reader.cc @@ -1,18 +1,13 @@ ---- src/3rdparty/chromium/base/debug/elf_reader.cc.orig 2023-09-13 12:11:42 UTC +--- src/3rdparty/chromium/base/debug/elf_reader.cc.orig 2024-06-17 12:56:06 UTC +++ src/3rdparty/chromium/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(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 +@@ -50,6 +50,10 @@ using Xword = Elf64_Xword; + + constexpr char kGnuNoteName[] = "GNU"; - size_t section_size = bits::AlignUp(current_note->n_namesz, 4u) + - bits::AlignUp(current_note->n_descsz, 4u) + ++#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/qt6-webengine/files/patch-src_3rdparty_chromium_base_debug_proc__maps__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_debug_proc__maps__linux.cc index be4f9db8864a..3fd2fef67f76 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_debug_proc__maps__linux.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_debug_proc__maps__linux.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/debug/proc_maps_linux.cc.orig 2022-02-28 16:54:41 UTC +--- src/3rdparty/chromium/base/debug/proc_maps_linux.cc.orig 2024-06-17 12:56:06 UTC +++ src/3rdparty/chromium/base/debug/proc_maps_linux.cc -@@ -13,7 +13,7 @@ +@@ -18,7 +18,7 @@ #include "base/strings/string_split.h" #include "build/build_config.h" diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_debug_stack__trace.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_debug_stack__trace.cc index e90462600ad2..36e7dfe9bdd2 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_debug_stack__trace.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_debug_stack__trace.cc @@ -1,21 +1,29 @@ ---- src/3rdparty/chromium/base/debug/stack_trace.cc.orig 2023-12-10 06:10:27 UTC +--- src/3rdparty/chromium/base/debug/stack_trace.cc.orig 2024-09-30 07:45:04 UTC +++ src/3rdparty/chromium/base/debug/stack_trace.cc -@@ -266,7 +266,9 @@ void StackTrace::Print() const { - } - - void StackTrace::OutputToStream(std::ostream* os) const { -+#if !BUILDFLAG(IS_BSD) - OutputToStreamWithPrefix(os, nullptr); -+#endif - } +@@ -258,7 +258,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; +@@ -320,7 +320,7 @@ std::string StackTrace::ToString() const { - std::string StackTrace::ToString() const { -@@ -274,7 +276,7 @@ std::string StackTrace::ToString() const { - } - std::string StackTrace::ToStringWithPrefix(const char* prefix_string) const { + std::string StackTrace::ToStringWithPrefix(cstring_view 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(); +@@ -344,7 +344,7 @@ bool StackTrace::ShouldSuppressOutput() { + } + + 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/qt6-webengine/files/patch-src_3rdparty_chromium_base_debug_stack__trace__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_debug_stack__trace__posix.cc index aa1ce925d251..532d94c4327c 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_debug_stack__trace__posix.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_debug_stack__trace__posix.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/debug/stack_trace_posix.cc.orig 2023-11-03 10:09:45 UTC +--- src/3rdparty/chromium/base/debug/stack_trace_posix.cc.orig 2024-07-30 11:12:21 UTC +++ src/3rdparty/chromium/base/debug/stack_trace_posix.cc -@@ -41,7 +41,7 @@ +@@ -46,7 +46,7 @@ // execinfo.h and backtrace(3) are really only present in glibc and in macOS // libc. #if BUILDFLAG(IS_APPLE) || \ @@ -9,7 +9,7 @@ #define HAVE_BACKTRACE #include #endif -@@ -59,8 +59,10 @@ +@@ -64,8 +64,10 @@ #include #endif @@ -21,7 +21,7 @@ #include "base/debug/proc_maps_linux.h" #endif -@@ -302,7 +304,7 @@ void PrintToStderr(const char* output) { +@@ -307,7 +309,7 @@ void PrintToStderr(const char* output) { std::ignore = HANDLE_EINTR(write(STDERR_FILENO, output, strlen(output))); } @@ -30,7 +30,7 @@ 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 -@@ -319,7 +321,11 @@ void AlarmSignalHandler(int signal, siginfo_t* info, v +@@ -324,7 +326,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 @@ -42,7 +42,7 @@ } #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || // BUILDFLAG(IS_CHROMEOS) -@@ -536,7 +542,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf +@@ -541,7 +547,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf _exit(EXIT_FAILURE); } @@ -51,7 +51,7 @@ // Set an alarm to trigger in case the default handler does not terminate // the process. See 'AlarmSignalHandler' for more details. struct sigaction action; -@@ -561,6 +567,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf +@@ -566,6 +572,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(). @@ -59,7 +59,7 @@ long retval = syscall(SYS_rt_tgsigqueueinfo, getpid(), syscall(SYS_gettid), info->si_signo, info); if (retval == 0) { -@@ -575,6 +582,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf +@@ -580,6 +587,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf if (errno != EPERM) { _exit(EXIT_FAILURE); } @@ -67,7 +67,7 @@ #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || // BUILDFLAG(IS_CHROMEOS) -@@ -764,6 +772,7 @@ class SandboxSymbolizeHelper { +@@ -769,6 +777,7 @@ class SandboxSymbolizeHelper { return -1; } @@ -75,7 +75,7 @@ // 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. -@@ -856,11 +865,15 @@ class SandboxSymbolizeHelper { +@@ -861,11 +870,15 @@ class SandboxSymbolizeHelper { r.base = cur_base; } } @@ -91,7 +91,7 @@ // Reads /proc/self/maps. std::string contents; if (!ReadProcMaps(&contents)) { -@@ -878,6 +891,7 @@ class SandboxSymbolizeHelper { +@@ -883,6 +896,7 @@ class SandboxSymbolizeHelper { is_initialized_ = true; return true; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_files_dir__reader__linux.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_files_dir__reader__linux.h index 19452aceb4d0..2bc1103a6e28 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_files_dir__reader__linux.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_files_dir__reader__linux.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/files/dir_reader_linux.h.orig 2022-08-31 12:19:35 UTC +--- src/3rdparty/chromium/base/files/dir_reader_linux.h.orig 2024-06-17 12:56:06 UTC +++ src/3rdparty/chromium/base/files/dir_reader_linux.h -@@ -16,10 +16,16 @@ +@@ -21,10 +21,16 @@ #include "base/logging.h" #include "base/posix/eintr_wrapper.h" @@ -17,7 +17,7 @@ struct linux_dirent { uint64_t d_ino; int64_t d_off; -@@ -27,6 +33,7 @@ struct linux_dirent { +@@ -32,6 +38,7 @@ struct linux_dirent { unsigned char d_type; char d_name[0]; }; @@ -25,7 +25,7 @@ class DirReaderLinux { public: -@@ -61,7 +68,11 @@ class DirReaderLinux { +@@ -66,7 +73,11 @@ class DirReaderLinux { if (offset_ != size_) return true; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_files_file__util__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_files_file__util__posix.cc index 2c01494e9c9d..a8fb145e6498 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_files_file__util__posix.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_files_file__util__posix.cc @@ -1,7 +1,7 @@ ---- src/3rdparty/chromium/base/files/file_util_posix.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/base/files/file_util_posix.cc.orig 2024-07-30 11:12:21 UTC +++ src/3rdparty/chromium/base/files/file_util_posix.cc -@@ -779,33 +779,34 @@ bool CreateDirectoryAndGetError(const FilePath& full_p - File::Error* error) { +@@ -889,36 +889,33 @@ bool CreateNewTempDirectory(const FilePath::StringType + bool CreateDirectoryAndGetError(const FilePath& full_path, File::Error* error) { ScopedBlockingCall scoped_blocking_call( FROM_HERE, BlockingType::MAY_BLOCK); // For call to mkdir(). + const FilePath kFileSystemRoot("/"); @@ -10,11 +10,11 @@ // Collect a list of all parent directories. FilePath last_path = full_path; - subpaths.push_back(full_path); +- for (FilePath path = full_path.DirName(); path.value() != last_path.value(); +- path = path.DirName()) { + if (full_path != kFileSystemRoot) + subpaths.push_back(full_path); - for (FilePath path = full_path.DirName(); -- path.value() != last_path.value(); path = path.DirName()) { -+ (path.value() != last_path.value() && ++ for (FilePath path = full_path.DirName(); (path.value() != last_path.value() && + (path != kFileSystemRoot)); path = path.DirName()) { subpaths.push_back(path); last_path = path; @@ -22,28 +22,30 @@ // Iterate through the parents and create the missing ones. for (const FilePath& subpath : base::Reversed(subpaths)) { -- if (DirectoryExists(subpath)) +- if (DirectoryExists(subpath)) { - continue; -- if (mkdir(subpath.value().c_str(), 0700) == 0) +- } +- if (mkdir(subpath.value().c_str(), 0700) == 0) { - continue; +- } - // Mkdir failed, but it might have failed with EEXIST, or some other error - // due to the directory appearing out of thin air. This can occur if - // two processes are trying to create the same file system tree at the same - // time. Check to see if it exists and make sure it is a directory. - int saved_errno = errno; - if (!DirectoryExists(subpath)) { -- if (error) +- 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; -+ } + } +- errno = saved_errno; +- return false; + } else if (!DirectoryExists(subpath)) { + if (error) + *error = File::OSErrorToFileError(ENOTDIR); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_files_scoped__file.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_files_scoped__file.cc index c9f4e70ddabc..75923df84853 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_files_scoped__file.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_files_scoped__file.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/files/scoped_file.cc.orig 2022-02-28 16:54:41 UTC +--- src/3rdparty/chromium/base/files/scoped_file.cc.orig 2024-07-30 11:12:21 UTC +++ src/3rdparty/chromium/base/files/scoped_file.cc -@@ -31,7 +31,7 @@ void ScopedFDCloseTraits::Free(int fd) { +@@ -32,7 +32,7 @@ void ScopedFDCloseTraits::Free(int fd) { int ret = IGNORE_EINTR(close(fd)); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_APPLE) || \ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_functional_unretained__traits.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_functional_unretained__traits.h index 6888a713aa1a..8374300b070d 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_functional_unretained__traits.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_functional_unretained__traits.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/functional/unretained_traits.h.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/base/functional/unretained_traits.h.orig 2024-03-22 08:19:40 UTC +++ src/3rdparty/chromium/base/functional/unretained_traits.h -@@ -99,7 +99,7 @@ struct SupportsUnretainedImpl { +@@ -93,7 +93,7 @@ struct SupportsUnretainedImpl { // official builds, and then in non-test code as well. #if defined(FORCE_UNRETAINED_COMPLETENESS_CHECKS_FOR_TESTS) || \ (!defined(UNIT_TEST) && !defined(OFFICIAL_BUILD) && \ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_i18n_icu__util.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_i18n_icu__util.cc index 21180842fd45..1f0efe7dec51 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_i18n_icu__util.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_i18n_icu__util.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/i18n/icu_util.cc.orig 2024-07-03 01:14:49 UTC +--- src/3rdparty/chromium/base/i18n/icu_util.cc.orig 2025-02-21 12:29:33 UTC +++ src/3rdparty/chromium/base/i18n/icu_util.cc -@@ -51,7 +51,7 @@ +@@ -52,7 +52,7 @@ #include "third_party/icu/source/common/unicode/unistr.h" #endif @@ -9,7 +9,7 @@ BUILDFLAG(IS_CHROMEOS) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)) #include "third_party/icu/source/i18n/unicode/timezone.h" #endif -@@ -349,7 +349,7 @@ void InitializeIcuTimeZone() { +@@ -332,7 +332,7 @@ void InitializeIcuTimeZone() { FuchsiaIntlProfileWatcher::GetPrimaryTimeZoneIdForIcuInitialization(); icu::TimeZone::adoptDefault( icu::TimeZone::createTimeZone(icu::UnicodeString::fromUTF8(zone_id))); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_linux__util.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_linux__util.cc index 4a1abf1e0a4d..d53a58671d7a 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_linux__util.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_linux__util.cc @@ -1,14 +1,6 @@ ---- src/3rdparty/chromium/base/linux_util.cc.orig 2023-12-10 06:10:27 UTC +--- src/3rdparty/chromium/base/linux_util.cc.orig 2024-05-21 18:07:39 UTC +++ src/3rdparty/chromium/base/linux_util.cc -@@ -15,6 +15,7 @@ - - #include - #include -+#include - - #include "base/base_export.h" - #include "base/files/dir_reader_posix.h" -@@ -153,10 +154,14 @@ void SetLinuxDistro(const std::string& distro) { +@@ -154,10 +154,14 @@ void SetLinuxDistro(const std::string& distro) { } bool GetThreadsForProcess(pid_t pid, std::vector* tids) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_memory_discardable__memory.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_memory_discardable__memory.cc index 8c4175412515..e546de79d949 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_memory_discardable__memory.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_memory_discardable__memory.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/base/memory/discardable_memory.cc.orig 2022-11-30 08:12:58 UTC +--- src/3rdparty/chromium/base/memory/discardable_memory.cc.orig 2024-09-30 07:45:04 UTC +++ src/3rdparty/chromium/base/memory/discardable_memory.cc @@ -26,7 +26,7 @@ BASE_FEATURE(kMadvFreeDiscardableMemory, base::FEATURE_DISABLED_BY_DEFAULT); @@ -9,7 +9,7 @@ BASE_FEATURE(kDiscardableMemoryBackingTrial, "DiscardableMemoryBackingTrial", base::FEATURE_DISABLED_BY_DEFAULT); -@@ -52,7 +52,7 @@ const base::FeatureParam +@@ -39,7 +39,7 @@ BASE_FEATURE(kDiscardableMemoryBackingTrial, namespace { @@ -18,7 +18,7 @@ DiscardableMemoryBacking GetBackingForFieldTrial() { DiscardableMemoryTrialGroup trial_group = -@@ -71,7 +71,7 @@ DiscardableMemoryBacking GetBackingForFieldTrial() { +@@ -58,7 +58,7 @@ DiscardableMemoryBacking GetBackingForFieldTrial() { } // namespace @@ -27,7 +27,7 @@ // Probe capabilities of this device to determine whether we should participate // in the discardable memory backing trial. -@@ -101,7 +101,7 @@ DiscardableMemory::DiscardableMemory() = default; +@@ -88,7 +88,7 @@ DiscardableMemory::DiscardableMemory() = default; DiscardableMemory::~DiscardableMemory() = default; DiscardableMemoryBacking GetDiscardableMemoryBacking() { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_memory_discardable__memory__internal.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_memory_discardable__memory__internal.h index 6448b063189b..b6ab089f204e 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_memory_discardable__memory__internal.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_memory_discardable__memory__internal.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/memory/discardable_memory_internal.h.orig 2022-02-28 16:54:41 UTC +--- src/3rdparty/chromium/base/memory/discardable_memory_internal.h.orig 2024-09-30 07:45:04 UTC +++ src/3rdparty/chromium/base/memory/discardable_memory_internal.h -@@ -10,7 +10,7 @@ +@@ -12,7 +12,7 @@ #include "base/metrics/field_trial_params.h" #include "build/build_config.h" diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_memory_madv__free__discardable__memory__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_memory_madv__free__discardable__memory__posix.cc index 65ff5cfba392..671729a68d2e 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_memory_madv__free__discardable__memory__posix.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_memory_madv__free__discardable__memory__posix.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/memory/madv_free_discardable_memory_posix.cc.orig 2023-05-31 08:12:17 UTC +--- src/3rdparty/chromium/base/memory/madv_free_discardable_memory_posix.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/base/memory/madv_free_discardable_memory_posix.cc -@@ -306,6 +306,10 @@ void MadvFreeDiscardableMemoryPosix::SetKeepMemoryForT +@@ -310,6 +310,10 @@ void MadvFreeDiscardableMemoryPosix::SetKeepMemoryForT bool MadvFreeDiscardableMemoryPosix::IsResident() const { DFAKE_SCOPED_RECURSIVE_LOCK(thread_collision_warner_); @@ -11,7 +11,7 @@ #if BUILDFLAG(IS_APPLE) std::vector vec(allocated_pages_); #else -@@ -321,6 +325,7 @@ bool MadvFreeDiscardableMemoryPosix::IsResident() cons +@@ -325,6 +329,7 @@ bool MadvFreeDiscardableMemoryPosix::IsResident() cons return false; } return true; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_memory_platform__shared__memory__region.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_memory_platform__shared__memory__region.h index 30ea9baa2090..374baa4ef15c 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_memory_platform__shared__memory__region.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_memory_platform__shared__memory__region.h @@ -1,15 +1,15 @@ ---- src/3rdparty/chromium/base/memory/platform_shared_memory_region.h.orig 2023-07-16 15:47:57 UTC +--- src/3rdparty/chromium/base/memory/platform_shared_memory_region.h.orig 2024-04-19 13:02:56 UTC +++ src/3rdparty/chromium/base/memory/platform_shared_memory_region.h -@@ -16,7 +16,7 @@ - - #include +@@ -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 }; @@ -18,7 +18,7 @@ // 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/qt6-webengine/files/patch-src_3rdparty_chromium_base_memory_protected__memory.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_memory_protected__memory.h new file mode 100644 index 000000000000..53c605f89aa9 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_memory_protected__memory.h @@ -0,0 +1,44 @@ +--- src/3rdparty/chromium/base/memory/protected_memory.h.orig 2024-10-22 08:31:56 UTC ++++ src/3rdparty/chromium/base/memory/protected_memory.h +@@ -119,12 +119,12 @@ __declspec(selectany) char __stop_protected_memory; + + #define DECLARE_PROTECTED_DATA constinit + #define DEFINE_PROTECTED_DATA constinit __declspec(allocate("prot$mem")) +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) + // This value is used to align the writers variable. That variable needs to be + // aligned to ensure that the protected memory section starts on a page + // boundary. + #if (PA_BUILDFLAG(IS_ANDROID) && PA_BUILDFLAG(PA_ARCH_CPU_64_BITS)) || \ +- (PA_BUILDFLAG(IS_LINUX) && PA_BUILDFLAG(PA_ARCH_CPU_ARM64)) ++ ((PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_BSD)) && PA_BUILDFLAG(PA_ARCH_CPU_ARM64)) + // arm64 supports 4kb, 16kb, and 64kb pages. Set to the largest of 64kb as that + // will guarantee the section is page aligned regardless of the choice. + inline constexpr int kProtectedMemoryAlignment = 65536; +@@ -339,7 +339,7 @@ class BASE_EXPORT AutoWritableMemoryBase { + // where an attacker could overwrite it with a large value and invoke code + // that constructs and destructs an AutoWritableMemory. After such a call + // protected memory would still be set writable because writers > 0. +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) + // On Linux, the protected memory section is not automatically page aligned. + // This means that attempts to reset the protected memory region to readonly + // will set some of the preceding section that is on the same page readonly +@@ -353,7 +353,7 @@ class BASE_EXPORT AutoWritableMemoryBase { + #endif + static inline size_t writers GUARDED_BY(writers_lock()) = 0; + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) + // On Linux, there is no guarantee the section following the protected + // memory section is page aligned. This can result in attempts to change + // the access permissions of the end of the protected memory section +@@ -411,7 +411,7 @@ class BASE_EXPORT AutoWritableMemoryInitializer + // the variable to something large before the section was read-only. + WriterData::writers = 0; + CHECK(SetProtectedSectionReadOnly()); +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) + // Set the protected_memory_section_buffer to true to ensure the buffer + // section is created. If a variable is declared but not used the memory + // section won't be created. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_memory_protected__memory__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_memory_protected__memory__posix.cc new file mode 100644 index 000000000000..3b7ae7170a9d --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_memory_protected__memory__posix.cc @@ -0,0 +1,20 @@ +--- src/3rdparty/chromium/base/memory/protected_memory_posix.cc.orig 2024-10-22 08:31:56 UTC ++++ src/3rdparty/chromium/base/memory/protected_memory_posix.cc +@@ -6,7 +6,7 @@ + + #include + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) + #include + #endif // BUILDFLAG(IS_LINUX) + +@@ -34,7 +34,7 @@ bool SetMemory(void* start, void* end, int prot) { + } // namespace + + namespace internal { +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) + void CheckMemoryReadOnly(const void* ptr) { + const uintptr_t page_start = + bits::AlignDown(reinterpret_cast(ptr), GetPageSize()); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_message__loop_message__pump__epoll.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_message__loop_message__pump__epoll.cc new file mode 100644 index 000000000000..15e0a2880760 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_message__loop_message__pump__epoll.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/base/message_loop/message_pump_epoll.cc.orig 2024-10-22 08:31:56 UTC ++++ src/3rdparty/chromium/base/message_loop/message_pump_epoll.cc +@@ -42,7 +42,7 @@ std::atomic_bool g_use_batched_version = false; + std::atomic_bool g_use_poll = false; + + constexpr std::pair kEpollToPollEvents[] = { +- {EPOLLIN, POLLIN}, {EPOLLOUT, POLLOUT}, {EPOLLRDHUP, POLLRDHUP}, ++ {EPOLLIN, POLLIN}, {EPOLLOUT, POLLOUT}, + {EPOLLPRI, POLLPRI}, {EPOLLERR, POLLERR}, {EPOLLHUP, POLLHUP}}; + + void SetEventsForPoll(const uint32_t epoll_events, struct pollfd* poll_entry) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_message__loop_message__pump__epoll.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_message__loop_message__pump__epoll.h new file mode 100644 index 000000000000..8fcfda985316 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_message__loop_message__pump__epoll.h @@ -0,0 +1,14 @@ +--- src/3rdparty/chromium/base/message_loop/message_pump_epoll.h.orig 2024-10-22 08:31:56 UTC ++++ src/3rdparty/chromium/base/message_loop/message_pump_epoll.h +@@ -51,7 +51,11 @@ namespace base { + // every call, don't do it when we have too many FDs. + BASE_FEATURE(kUsePollForMessagePumpEpoll, + "UsePollForMessagePumpEpoll", ++#if BUILDFLAG(IS_BSD) ++ base::FEATURE_ENABLED_BY_DEFAULT); ++#else + base::FEATURE_DISABLED_BY_DEFAULT); ++#endif + + // A MessagePump implementation suitable for I/O message loops on Linux-based + // systems with epoll API support. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_native__library__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_native__library__posix.cc index c73d57bb3323..93238786b383 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_native__library__posix.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_native__library__posix.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/native_library_posix.cc.orig 2022-05-19 14:06:27 UTC +--- src/3rdparty/chromium/base/native_library_posix.cc.orig 2024-08-26 12:06:38 UTC +++ src/3rdparty/chromium/base/native_library_posix.cc -@@ -33,7 +33,7 @@ NativeLibrary LoadNativeLibraryWithOptions(const FileP +@@ -34,7 +34,7 @@ NativeLibrary LoadNativeLibraryWithOptions(const FileP // http://crbug.com/17943, http://crbug.com/17557, http://crbug.com/36892, // and http://crbug.com/40794. int flags = RTLD_LAZY; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_posix_file__descriptor__shuffle.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_posix_file__descriptor__shuffle.h new file mode 100644 index 000000000000..7a46b4188cc7 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_posix_file__descriptor__shuffle.h @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/base/posix/file_descriptor_shuffle.h.orig 2024-10-22 08:31:56 UTC ++++ src/3rdparty/chromium/base/posix/file_descriptor_shuffle.h +@@ -26,6 +26,8 @@ + #include "base/base_export.h" + #include "base/compiler_specific.h" + ++#undef close ++ + namespace base { + + // A Delegate which performs the actions required to perform an injective diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_posix_sysctl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_posix_sysctl.cc new file mode 100644 index 000000000000..7d5759301125 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_posix_sysctl.cc @@ -0,0 +1,10 @@ +--- src/3rdparty/chromium/base/posix/sysctl.cc.orig 2023-12-17 20:01:00 UTC ++++ src/3rdparty/chromium/base/posix/sysctl.cc +@@ -4,6 +4,7 @@ + + #include "base/posix/sysctl.h" + ++#include + #include + + #include diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_posix_unix__domain__socket.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_posix_unix__domain__socket.cc index 555f62b3f294..b6927dc6ad07 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_posix_unix__domain__socket.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_posix_unix__domain__socket.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/posix/unix_domain_socket.cc.orig 2022-08-31 12:19:35 UTC +--- src/3rdparty/chromium/base/posix/unix_domain_socket.cc.orig 2024-06-17 12:56:06 UTC +++ src/3rdparty/chromium/base/posix/unix_domain_socket.cc -@@ -51,7 +51,7 @@ bool CreateSocketPair(ScopedFD* one, ScopedFD* two) { +@@ -56,7 +56,7 @@ bool CreateSocketPair(ScopedFD* one, ScopedFD* two) { // static bool UnixDomainSocket::EnableReceiveProcessId(int fd) { @@ -9,7 +9,25 @@ const int enable = 1; return setsockopt(fd, SOL_SOCKET, SO_PASSCRED, &enable, sizeof(enable)) == 0; #else -@@ -149,7 +149,7 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd, +@@ -82,7 +82,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(control_len); + #else + msg.msg_controllen = control_len; +@@ -90,7 +90,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(CMSG_LEN(sizeof(int) * fds.size())); + #else + cmsg->cmsg_len = CMSG_LEN(sizeof(int) * fds.size()); +@@ -154,7 +154,7 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd, const size_t kControlBufferSize = CMSG_SPACE(sizeof(int) * kMaxFileDescriptors) @@ -18,7 +36,7 @@ // macOS does not support ucred. // macOS supports xucred, but this structure is insufficient. + CMSG_SPACE(sizeof(struct ucred)) -@@ -177,7 +177,7 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd, +@@ -182,7 +182,7 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd, wire_fds = reinterpret_cast(CMSG_DATA(cmsg)); wire_fds_len = payload_len / sizeof(int); } @@ -27,7 +45,7 @@ // macOS does not support SCM_CREDENTIALS. if (cmsg->cmsg_level == SOL_SOCKET && cmsg->cmsg_type == SCM_CREDENTIALS) { -@@ -211,6 +211,9 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd, +@@ -216,6 +216,9 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd, socklen_t pid_size = sizeof(pid); if (getsockopt(fd, SOL_LOCAL, LOCAL_PEERPID, &pid, &pid_size) != 0) pid = -1; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_internal__linux.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_internal__linux.h new file mode 100644 index 000000000000..05dd70e96c00 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_internal__linux.h @@ -0,0 +1,20 @@ +--- src/3rdparty/chromium/base/process/internal_linux.h.orig 2024-05-21 18:07:39 UTC ++++ src/3rdparty/chromium/base/process/internal_linux.h +@@ -140,6 +140,9 @@ TimeDelta ClockTicksToTimeDelta(int64_t clock_ticks); + // arguments to the lambda. + template + void ForEachProcessTask(base::ProcessHandle process, Lambda&& lambda) { ++#if BUILDFLAG(IS_BSD) ++ return; ++#else + // Iterate through the different threads tracked in /proc//task. + FilePath fd_path = GetProcPidDir(process).Append("task"); + +@@ -159,6 +162,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/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_kill.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_kill.h index a4232aa1b790..a215df6ca76f 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_kill.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_kill.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/process/kill.h.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/base/process/kill.h.orig 2024-06-17 12:56:06 UTC +++ src/3rdparty/chromium/base/process/kill.h -@@ -121,7 +121,7 @@ BASE_EXPORT TerminationStatus GetTerminationStatus(Pro +@@ -123,7 +123,7 @@ BASE_EXPORT TerminationStatus GetTerminationStatus(Pro BASE_EXPORT TerminationStatus GetKnownDeadTerminationStatus( ProcessHandle handle, int* exit_code); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_launch.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_launch.h index a744c9a96f61..a5003c3ff20a 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_launch.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_launch.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/process/launch.h.orig 2023-04-28 17:01:32 UTC +--- src/3rdparty/chromium/base/process/launch.h.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/base/process/launch.h -@@ -200,7 +200,7 @@ struct BASE_EXPORT LaunchOptions { +@@ -237,7 +237,7 @@ struct BASE_EXPORT LaunchOptions { bool clear_environment = false; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_launch__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_launch__posix.cc index 42de8e181ceb..54e4c77bf396 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_launch__posix.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_launch__posix.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/process/launch_posix.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/base/process/launch_posix.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/base/process/launch_posix.cc -@@ -61,6 +61,9 @@ +@@ -67,6 +67,9 @@ #error "macOS should use launch_mac.cc" #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_memory__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_memory__linux.cc index 960f4534a3ca..5cb2bba4120b 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_memory__linux.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_memory__linux.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/base/process/memory_linux.cc.orig 2024-01-30 07:53:34 UTC +--- src/3rdparty/chromium/base/process/memory_linux.cc.orig 2024-07-30 11:12:21 UTC +++ src/3rdparty/chromium/base/process/memory_linux.cc @@ -28,6 +28,7 @@ void __libc_free(void*); @@ -24,7 +24,7 @@ std::set_new_handler(&ReleaseReservationOrTerminate); // If we're using glibc's allocator, the above functions will override @@ -51,8 +54,10 @@ void EnableTerminationOnOutOfMemory() { - #if BUILDFLAG(USE_ALLOCATOR_SHIM) + #if PA_BUILDFLAG(USE_ALLOCATOR_SHIM) allocator_shim::SetCallNewHandlerOnMallocFailure(true); #endif +#endif @@ -34,11 +34,11 @@ // 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 -@@ -112,6 +117,7 @@ bool AdjustOOMScoreHelper::AdjustOOMScore(ProcessId pr +@@ -110,6 +115,7 @@ bool AdjustOOMScoreHelper::AdjustOOMScore(ProcessId pr bool AdjustOOMScore(ProcessId process, int score) { return AdjustOOMScoreHelper::AdjustOOMScore(process, score); } +#endif bool UncheckedMalloc(size_t size, void** result) { - #if BUILDFLAG(USE_ALLOCATOR_SHIM) + #if PA_BUILDFLAG(USE_ALLOCATOR_SHIM) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__handle__freebsd.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__handle__freebsd.cc index 5dce7a9d1395..7955f1506b36 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__handle__freebsd.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__handle__freebsd.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/base/process/process_handle_freebsd.cc.orig 2023-11-03 10:09:45 UTC +--- src/3rdparty/chromium/base/process/process_handle_freebsd.cc.orig 2024-04-19 13:02:56 UTC +++ src/3rdparty/chromium/base/process/process_handle_freebsd.cc @@ -3,6 +3,7 @@ // found in the LICENSE file. @@ -8,7 +8,7 @@ #include #include -@@ -19,10 +20,13 @@ namespace base { +@@ -20,10 +21,13 @@ namespace base { ProcessId GetParentProcessId(ProcessHandle process) { struct kinfo_proc info; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__handle__openbsd.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__handle__openbsd.cc index 0df34cb4a047..ea674c1ef515 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__handle__openbsd.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__handle__openbsd.cc @@ -1,18 +1,22 @@ ---- src/3rdparty/chromium/base/process/process_handle_openbsd.cc.orig 2022-04-21 18:48:31 UTC +--- src/3rdparty/chromium/base/process/process_handle_openbsd.cc.orig 2024-04-19 13:02:56 UTC +++ src/3rdparty/chromium/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 ++#include +#include +#include ++#include #include #include #include -@@ -12,39 +15,59 @@ + ++#include ++ namespace base { ProcessId GetParentProcessId(ProcessHandle process) { @@ -26,18 +30,19 @@ 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((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: @@ -47,16 +52,20 @@ 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(); @@ -64,26 +73,61 @@ - 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(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(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/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics.cc index 95df631a5545..172c53d091da 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/base/process/process_metrics.cc.orig 2023-05-31 08:12:17 UTC +--- src/3rdparty/chromium/base/process/process_metrics.cc.orig 2024-05-21 18:07:39 UTC +++ src/3rdparty/chromium/base/process/process_metrics.cc @@ -17,7 +17,7 @@ namespace base { namespace { @@ -35,17 +35,12 @@ double ProcessMetrics::GetPlatformIndependentCPUUsage( TimeDelta cumulative_cpu) { TimeTicks time = TimeTicks::Now(); -@@ -126,7 +125,6 @@ double ProcessMetrics::GetPlatformIndependentCPUUsage( - double ProcessMetrics::GetPlatformIndependentCPUUsage() { - return GetPlatformIndependentCPUUsage(GetCumulativeCPUUsage()); +@@ -129,10 +128,9 @@ ProcessMetrics::GetPlatformIndependentCPUUsage() { + return GetPlatformIndependentCPUUsage(cpu_usage); + }); } -#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/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics.h index 1d56d25bb259..c3620d9ab69b 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/process/process_metrics.h.orig 2023-12-10 06:10:27 UTC +--- src/3rdparty/chromium/base/process/process_metrics.h.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/base/process/process_metrics.h -@@ -37,7 +37,7 @@ +@@ -38,7 +38,7 @@ #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ @@ -9,16 +9,16 @@ #include #include #include -@@ -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 { +@@ -113,7 +113,7 @@ class BASE_EXPORT ProcessMetrics { // convenience wrapper for CreateProcessMetrics(). static std::unique_ptr CreateCurrentProcessMetrics(); @@ -27,8 +27,8 @@ // 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) +@@ -147,7 +147,7 @@ class BASE_EXPORT ProcessMetrics { + base::expected GetCumulativeCPUUsage(); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ - BUILDFLAG(IS_AIX) @@ -36,7 +36,7 @@ // 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 -@@ -219,7 +219,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -192,7 +192,7 @@ class BASE_EXPORT ProcessMetrics { int GetOpenFdSoftLimit() const; #endif // BUILDFLAG(IS_POSIX) @@ -45,7 +45,7 @@ // Bytes of swap as reported by /proc/[pid]/status. uint64_t GetVmSwapBytes() const; -@@ -240,7 +240,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -213,7 +213,7 @@ class BASE_EXPORT ProcessMetrics { #endif // !BUILDFLAG(IS_MAC) #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -54,7 +54,7 @@ int CalculateIdleWakeupsPerSecond(uint64_t absolute_idle_wakeups); #endif #if BUILDFLAG(IS_APPLE) -@@ -262,9 +262,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -235,12 +235,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_; @@ -62,18 +62,13 @@ TimeDelta last_cumulative_cpu_; -#endif - #if BUILDFLAG(IS_WIN) - TimeTicks last_cpu_time_for_precise_cpu_usage_; -@@ -272,7 +270,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_; -@@ -313,7 +311,7 @@ BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_de +@@ -281,7 +279,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) || \ @@ -82,7 +77,7 @@ // Data about system-wide memory consumption. Values are in KB. Available on // Windows, Mac, Linux, Android and Chrome OS. // -@@ -348,7 +346,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -316,7 +314,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ @@ -91,7 +86,7 @@ // This provides an estimate of available memory as described here: // https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=34e431b0ae398fc54ea69ff85ec700722c9da773 // NOTE: this is ONLY valid in kernels 3.14 and up. Its value will always -@@ -363,7 +361,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -331,7 +329,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { #endif #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -100,7 +95,7 @@ int buffers = 0; int cached = 0; int active_anon = 0; -@@ -400,7 +398,7 @@ BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoK +@@ -368,7 +366,7 @@ BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoK // BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ @@ -109,7 +104,7 @@ // Parse the data found in /proc//stat and return the sum of the // CPU-related ticks. Returns -1 on parse error. // Exposed for testing. -@@ -588,7 +586,7 @@ class BASE_EXPORT SystemMetrics { +@@ -563,7 +561,7 @@ class BASE_EXPORT SystemMetrics { FRIEND_TEST_ALL_PREFIXES(SystemMetricsTest, SystemMetrics); size_t committed_memory_; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics__freebsd.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics__freebsd.cc index 8f5186c3a203..dcd0e2e90543 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics__freebsd.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics__freebsd.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/process/process_metrics_freebsd.cc.orig 2023-03-09 06:31:50 UTC +--- src/3rdparty/chromium/base/process/process_metrics_freebsd.cc.orig 2024-10-23 07:00:35 UTC +++ src/3rdparty/chromium/base/process/process_metrics_freebsd.cc -@@ -3,20 +3,39 @@ +@@ -3,43 +3,58 @@ // found in the LICENSE file. #include "base/process/process_metrics.h" @@ -17,7 +17,6 @@ +#include + #include "base/memory/ptr_util.h" - #include "base/process/process_metrics_iocounters.h" +#include "base/values.h" namespace base { @@ -26,28 +25,30 @@ + 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::CreateProcessMetrics( -@@ -24,22 +43,19 @@ std::unique_ptr ProcessMetrics::Create + ProcessHandle process) { return WrapUnique(new ProcessMetrics(process)); } --double ProcessMetrics::GetPlatformIndependentCPUUsage() { -+TimeDelta ProcessMetrics::GetCumulativeCPUUsage() { +-base::expected +-ProcessMetrics::GetPlatformIndependentCPUUsage() { ++base::expected ++ProcessMetrics::GetCumulativeCPUUsage() { struct kinfo_proc info; - int mib[] = {CTL_KERN, KERN_PROC, KERN_PROC_PID, process_}; - size_t length = sizeof(info); @@ -57,22 +58,22 @@ + 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 base::unexpected(ProcessCPUUsageError::kSystemError); ++ return base::ok(TimeDelta()); -- return (info.ki_pctcpu / FSCALE) * 100.0; -+ return Microseconds(info.ki_runtime); +- return base::ok(double{info.ki_pctcpu} / FSCALE * 100.0); ++ return base::ok(Microseconds(info.ki_runtime)); } --TimeDelta ProcessMetrics::GetCumulativeCPUUsage() { +-base::expected +-ProcessMetrics::GetCumulativeCPUUsage() { - NOTREACHED(); -- return TimeDelta(); -} - - 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; +@@ -61,6 +76,230 @@ size_t GetSystemCommitCharge() { pagesize = getpagesize(); return mem_total - (mem_free*pagesize) - (mem_inactive*pagesize); @@ -171,7 +172,7 @@ + kvm_close(kd); + return 0; + } -+ ++ + size_t rss; + + if (nproc > 0) { @@ -197,7 +198,7 @@ + kvm_close(kd); + return 0; + } -+ ++ + size_t swrss; + + if (nproc > 0) { @@ -247,7 +248,7 @@ + +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(reads)); @@ -263,7 +264,7 @@ + res.Set("weighted_io_time", static_cast(weighted_io_time)); + + NOTIMPLEMENTED(); -+ ++ + return res; +} + diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics__openbsd.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics__openbsd.cc index 2a620697c102..e174db973827 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics__openbsd.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics__openbsd.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/process/process_metrics_openbsd.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/base/process/process_metrics_openbsd.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/base/process/process_metrics_openbsd.cc -@@ -6,14 +6,23 @@ +@@ -6,74 +6,50 @@ #include #include @@ -12,24 +12,18 @@ +#include + #include "base/memory/ptr_util.h" - #include "base/process/process_metrics_iocounters.h" + #include "base/types/expected.h" +#include "base/values.h" +#include "base/notreached.h" namespace base { -+ProcessMetrics::ProcessMetrics(ProcessHandle process) -+ : process_(process) {} -+ - // static - std::unique_ptr ProcessMetrics::CreateProcessMetrics( - ProcessHandle process) { -@@ -24,52 +33,26 @@ bool ProcessMetrics::GetIOCounters(IoCounters* io_coun - return false; - } +-namespace { ++ProcessMetrics::ProcessMetrics(ProcessHandle process) : process_(process) {} --static int GetProcessCPU(pid_t pid) { -+TimeDelta ProcessMetrics::GetCumulativeCPUUsage() { +-base::expected GetProcessCPU(pid_t pid) { ++base::expected ++ProcessMetrics::GetCumulativeCPUUsage() { struct kinfo_proc info; - size_t length; - int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, pid, @@ -37,43 +31,55 @@ + 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 base::unexpected(ProcessCPUUsageError::kSystemError); +- } + 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 base::unexpected(ProcessCPUUsageError::kSystemError); + } -- return info.p_pctcpu; --} +- return base::ok(info.p_pctcpu); + tv.tv_sec = info.p_rtime_sec; + tv.tv_usec = info.p_rtime_usec; ++ ++ return base::ok(Microseconds(TimeValToMicroseconds(tv))); + } --double ProcessMetrics::GetPlatformIndependentCPUUsage() { +-} // namespace +- + // static + std::unique_ptr ProcessMetrics::CreateProcessMetrics( + ProcessHandle process) { + return WrapUnique(new ProcessMetrics(process)); + } + +-base::expected +-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 base::ok(0.0); - } - -- int cpu = GetProcessCPU(process_); +- const base::expected cpu = GetProcessCPU(process_); +- if (!cpu.has_value()) { +- return base::unexpected(cpu.error()); +- } - - last_cpu_time_ = time; -- double percentage = static_cast((cpu * 100.0) / FSCALE); +- return base::ok(double{cpu.value()} / FSCALE * 100.0); +-} - -- return percentage; -+ return Microseconds(TimeValToMicroseconds(tv)); - } - --TimeDelta ProcessMetrics::GetCumulativeCPUUsage() { +-base::expected +-ProcessMetrics::GetCumulativeCPUUsage() { - NOTREACHED(); -- return TimeDelta(); -} - -ProcessMetrics::ProcessMetrics(ProcessHandle process) @@ -87,7 +93,7 @@ struct vmtotal vmtotal; unsigned long mem_total, mem_free, mem_inactive; size_t len = sizeof(vmtotal); -@@ -81,9 +64,136 @@ size_t GetSystemCommitCharge() { +@@ -85,9 +61,136 @@ size_t GetSystemCommitCharge() { mem_free = vmtotal.t_free; mem_inactive = vmtotal.t_vm - vmtotal.t_avm; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__posix.cc index f7da874a37ff..34cf2ffe2a1f 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__posix.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__posix.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/base/process/process_posix.cc.orig 2023-09-13 12:11:42 UTC +--- src/3rdparty/chromium/base/process/process_posix.cc.orig 2024-05-21 18:07:39 UTC +++ src/3rdparty/chromium/base/process/process_posix.cc @@ -23,10 +23,15 @@ #include "base/trace_event/base_tracing.h" @@ -17,16 +17,16 @@ #if BUILDFLAG(CLANG_PROFILING) #include "base/test/clang_profiling.h" #endif -@@ -93,7 +98,7 @@ bool WaitpidWithTimeout(base::ProcessHandle handle, - return ret_pid > 0; +@@ -99,7 +104,7 @@ bool WaitpidWithTimeout(base::ProcessHandle handle, } + #endif -#if BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) // Using kqueue on Mac so that we can wait on non-child processes. // We can't use kqueues on child processes because we need to reap // our own children using wait. -@@ -198,7 +203,7 @@ bool WaitForExitWithTimeoutImpl(base::ProcessHandle ha +@@ -376,7 +381,7 @@ bool Process::WaitForExitWithTimeoutImpl(base::Process const bool exited = (parent_pid < 0); if (!exited && parent_pid != our_pid) { @@ -35,7 +35,7 @@ // On Mac we can wait on non child processes. return WaitForSingleNonChildProcess(handle, timeout); #else -@@ -387,7 +392,56 @@ void Process::Exited(int exit_code) const { +@@ -413,7 +418,56 @@ void Process::Exited(int exit_code) const { int Process::GetOSPriority() const { DCHECK(IsValid()); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_profiler_module__cache.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_profiler_module__cache.cc index a9b3706d0869..362e3cc344d3 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_profiler_module__cache.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_profiler_module__cache.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/profiler/module_cache.cc.orig 2023-12-10 06:10:27 UTC +--- src/3rdparty/chromium/base/profiler/module_cache.cc.orig 2024-04-19 13:02:56 UTC +++ src/3rdparty/chromium/base/profiler/module_cache.cc -@@ -37,7 +37,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/qt6-webengine/files/patch-src_3rdparty_chromium_base_profiler_sampling__profiler__thread__token.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_profiler_sampling__profiler__thread__token.cc index 37c6158abd0e..965bc8835737 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_profiler_sampling__profiler__thread__token.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_profiler_sampling__profiler__thread__token.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/base/profiler/sampling_profiler_thread_token.cc.orig 2023-02-08 09:03:45 UTC +--- src/3rdparty/chromium/base/profiler/sampling_profiler_thread_token.cc.orig 2024-04-19 13:02:56 UTC +++ src/3rdparty/chromium/base/profiler/sampling_profiler_thread_token.cc @@ -6,7 +6,7 @@ @@ -15,6 +15,6 @@ return {id, pthread_self()}; -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - absl::optional maybe_stack_base = + std::optional maybe_stack_base = GetThreadStackBaseAddress(id, pthread_self()); return {id, maybe_stack_base}; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_profiler_sampling__profiler__thread__token.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_profiler_sampling__profiler__thread__token.h index 1197b0cac097..80572813c435 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_profiler_sampling__profiler__thread__token.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_profiler_sampling__profiler__thread__token.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/profiler/sampling_profiler_thread_token.h.orig 2023-02-08 09:03:45 UTC +--- src/3rdparty/chromium/base/profiler/sampling_profiler_thread_token.h.orig 2024-04-19 13:02:56 UTC +++ src/3rdparty/chromium/base/profiler/sampling_profiler_thread_token.h -@@ -12,7 +12,7 @@ +@@ -13,7 +13,7 @@ #if BUILDFLAG(IS_ANDROID) #include @@ -9,7 +9,7 @@ #include #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/qt6-webengine/files/patch-src_3rdparty_chromium_base_profiler_stack__base__address__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_profiler_stack__base__address__posix.cc index 86354ac4bb69..6a38a1e521d8 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_profiler_stack__base__address__posix.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_profiler_stack__base__address__posix.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/base/profiler/stack_base_address_posix.cc.orig 2023-02-08 16:09:26 UTC +--- src/3rdparty/chromium/base/profiler/stack_base_address_posix.cc.orig 2024-04-19 13:02:56 UTC +++ src/3rdparty/chromium/base/profiler/stack_base_address_posix.cc @@ -17,6 +17,10 @@ #include "base/files/scoped_file.h" @@ -11,7 +11,7 @@ #if BUILDFLAG(IS_CHROMEOS) extern "C" void* __libc_stack_end; #endif -@@ -45,7 +49,21 @@ absl::optional GetAndroidMainThreadStackBas +@@ -45,7 +49,21 @@ std::optional GetAndroidMainThreadStackBase #if !BUILDFLAG(IS_LINUX) uintptr_t GetThreadStackBaseAddressImpl(pthread_t pthread_id) { @@ -48,3 +48,12 @@ const uintptr_t base_address = reinterpret_cast(address) + size; return base_address; } +@@ -80,7 +100,7 @@ std::optional 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(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/qt6-webengine/files/patch-src_3rdparty_chromium_base_profiler_stack__sampling__profiler__test__util.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_profiler_stack__sampling__profiler__test__util.cc index aefe2a163bd5..5f7bc802415a 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_profiler_stack__sampling__profiler__test__util.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_profiler_stack__sampling__profiler__test__util.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/profiler/stack_sampling_profiler_test_util.cc.orig 2023-04-28 17:01:32 UTC +--- src/3rdparty/chromium/base/profiler/stack_sampling_profiler_test_util.cc.orig 2024-06-17 12:56:06 UTC +++ src/3rdparty/chromium/base/profiler/stack_sampling_profiler_test_util.cc -@@ -36,7 +36,7 @@ +@@ -42,7 +42,7 @@ // Fortunately, it provides _alloca, which functions identically. #include #define alloca _alloca diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_profiler_thread__delegate__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_profiler_thread__delegate__posix.cc index ea57e9cf2177..0389fddac958 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_profiler_thread__delegate__posix.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_profiler_thread__delegate__posix.cc @@ -1,18 +1,18 @@ ---- src/3rdparty/chromium/base/profiler/thread_delegate_posix.cc.orig 2022-10-24 13:33:33 UTC +--- src/3rdparty/chromium/base/profiler/thread_delegate_posix.cc.orig 2024-06-17 12:56:06 UTC +++ src/3rdparty/chromium/base/profiler/thread_delegate_posix.cc -@@ -13,7 +13,7 @@ +@@ -19,7 +19,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 { +@@ -28,7 +28,7 @@ namespace base { std::unique_ptr ThreadDelegatePosix::Create( SamplingProfilerThreadToken thread_token) { - absl::optional base_address; + std::optional 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/qt6-webengine/files/patch-src_3rdparty_chromium_base_rand__util.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_rand__util.h index 4ce613055bd6..dbaa0747aaf6 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_rand__util.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_rand__util.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/rand_util.h.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/base/rand_util.h.orig 2024-06-17 12:56:06 UTC +++ src/3rdparty/chromium/base/rand_util.h -@@ -149,7 +149,7 @@ void RandomShuffle(Itr first, Itr last) { +@@ -147,7 +147,7 @@ void RandomShuffle(Itr first, Itr last) { std::shuffle(first, last, RandomBitGenerator()); } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_rand__util__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_rand__util__posix.cc index 471cf59c095a..be02544e9606 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_rand__util__posix.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_rand__util__posix.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/rand_util_posix.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/base/rand_util_posix.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/base/rand_util_posix.cc -@@ -23,7 +23,7 @@ +@@ -28,7 +28,7 @@ #include "base/time/time.h" #include "build/build_config.h" @@ -8,8 +8,8 @@ +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD) #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. -@@ -40,6 +40,7 @@ namespace base { + // TODO(crbug.com/40641285): Waiting for this header to appear in the iOS SDK. +@@ -44,6 +44,7 @@ namespace base { namespace { @@ -17,7 +17,7 @@ #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 { +@@ -68,10 +69,11 @@ class URandomFd { private: const int fd_; }; @@ -33,12 +33,12 @@ @@ -177,6 +179,7 @@ bool UseBoringSSLForRandBytes() { namespace { - void RandBytes(span output, bool avoid_allocation) { + void RandBytesInternal(span 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()) { -@@ -215,6 +218,9 @@ void RandBytes(span output, bool avoid_alloca +@@ -213,6 +216,9 @@ void RandBytesInternal(span output, bool avoi const int urandom_fd = GetUrandomFD(); const bool success = ReadFromFD(urandom_fd, as_writable_chars(output)); CHECK(success); @@ -48,8 +48,8 @@ } } // namespace -@@ -239,9 +245,11 @@ void RandBytes(void* output, size_t output_length) { - RandBytes(make_span(reinterpret_cast(output), output_length)); +@@ -232,9 +238,11 @@ void RandBytes(span output) { + RandBytesInternal(output, /*avoid_allocation=*/false); } +#if !BUILDFLAG(IS_BSD) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_synchronization_lock__impl.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_synchronization_lock__impl.h index fd4ad388e446..5fc6aab99637 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_synchronization_lock__impl.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_synchronization_lock__impl.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/synchronization/lock_impl.h.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/base/synchronization/lock_impl.h.orig 2024-08-26 12:06:38 UTC +++ src/3rdparty/chromium/base/synchronization/lock_impl.h -@@ -106,6 +106,10 @@ void LockImpl::Unlock() { +@@ -109,6 +109,10 @@ void LockImpl::Unlock() { } #elif BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA) @@ -11,7 +11,7 @@ #if DCHECK_IS_ON() BASE_EXPORT void dcheck_trylock_result(int rv); -@@ -126,6 +130,9 @@ void LockImpl::Unlock() { +@@ -129,6 +133,9 @@ void LockImpl::Unlock() { dcheck_unlock_result(rv); #endif } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_syslog__logging.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_syslog__logging.cc index 34f268efc1b1..615919546f5c 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_syslog__logging.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_syslog__logging.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/syslog_logging.cc.orig 2022-02-28 16:54:41 UTC +--- src/3rdparty/chromium/base/syslog_logging.cc.orig 2024-03-22 08:19:40 UTC +++ src/3rdparty/chromium/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" @@ -9,7 +9,7 @@ // defines LOG_INFO, LOG_WARNING macros that could conflict with // base::LOG_INFO, base::LOG_WARNING. #include -@@ -147,7 +147,7 @@ EventLogMessage::~EventLogMessage() { +@@ -149,7 +149,7 @@ EventLogMessage::~EventLogMessage() { if (user_sid != nullptr) ::LocalFree(user_sid); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info.cc index 5d87ae9d6091..ac1f7067e5dd 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/system/sys_info.cc.orig 2023-12-10 06:10:27 UTC +--- src/3rdparty/chromium/base/system/sys_info.cc.orig 2024-08-26 12:06:38 UTC +++ src/3rdparty/chromium/base/system/sys_info.cc -@@ -225,7 +225,7 @@ std::string SysInfo::HardwareModelName() { +@@ -223,7 +223,7 @@ std::string SysInfo::HardwareModelName() { #endif void SysInfo::GetHardwareInfo(base::OnceCallback callback) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info.h index 6a387650cccf..3e344184962a 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/system/sys_info.h.orig 2024-01-30 07:53:34 UTC +--- src/3rdparty/chromium/base/system/sys_info.h.orig 2024-05-21 18:07:39 UTC +++ src/3rdparty/chromium/base/system/sys_info.h -@@ -318,6 +318,8 @@ class BASE_EXPORT SysInfo { +@@ -325,6 +325,8 @@ class BASE_EXPORT SysInfo { static void ResetCpuSecurityMitigationsEnabledForTesting(); #endif @@ -9,7 +9,7 @@ private: friend class test::ScopedAmountOfPhysicalMemoryOverride; FRIEND_TEST_ALL_PREFIXES(SysInfoTest, AmountOfAvailablePhysicalMemory); -@@ -330,7 +332,7 @@ class BASE_EXPORT SysInfo { +@@ -337,7 +339,7 @@ class BASE_EXPORT SysInfo { static HardwareInfo GetHardwareInfoSync(); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info__freebsd.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info__freebsd.cc index d90e079eddc5..f9d08851eea0 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info__freebsd.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info__freebsd.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/system/sys_info_freebsd.cc.orig 2022-09-01 17:22:07 UTC +--- src/3rdparty/chromium/base/system/sys_info_freebsd.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/base/system/sys_info_freebsd.cc -@@ -9,30 +9,106 @@ +@@ -9,28 +9,103 @@ #include #include "base/notreached.h" @@ -21,7 +21,7 @@ + } + return ncpu; +} -+ ++ +uint64_t SysInfo::AmountOfPhysicalMemoryImpl() { + int pages, page_size, r = 0; size_t size = sizeof(pages); @@ -31,12 +31,11 @@ + + if (r == 0) + r = sysctlbyname("vm.stats.vm.v_page_count", &pages, &size, NULL, 0); -+ if (r == 0) ++ if (r == 0) + r = sysctlbyname("vm.stats.vm.v_page_size", &page_size, &size, NULL, 0); + + if (r == -1) { NOTREACHED(); - return 0; } - return static_cast(pages) * page_size; + @@ -48,7 +47,7 @@ + unsigned int pgfree, pginact, pgcache; + size_t size = sizeof(page_size); + size_t szpg = sizeof(pgfree); -+ ++ + if (r == 0) + r = sysctlbyname("vm.stats.vm.v_page_size", &page_size, &size, NULL, 0); + if (r == 0) @@ -94,9 +93,7 @@ + if (sysctlbyname("kern.ipc.shmmax", &limit, &size, NULL, 0) < 0) { NOTREACHED(); - return 0; } -+ return static_cast(limit); +} + diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info__openbsd.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info__openbsd.cc index ce417f051022..12f3543c4f3f 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info__openbsd.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info__openbsd.cc @@ -1,14 +1,6 @@ ---- src/3rdparty/chromium/base/system/sys_info_openbsd.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/base/system/sys_info_openbsd.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/base/system/sys_info_openbsd.cc -@@ -3,7 +3,6 @@ - // found in the LICENSE file. - - #include "base/system/sys_info.h" -- - #include - #include - #include -@@ -12,6 +11,7 @@ +@@ -12,6 +12,7 @@ #include "base/notreached.h" #include "base/posix/sysctl.h" @@ -16,7 +8,7 @@ namespace { -@@ -27,9 +27,14 @@ uint64_t AmountOfMemory(int pages_name) { +@@ -27,9 +28,14 @@ uint64_t AmountOfMemory(int pages_name) { namespace base { @@ -32,7 +24,7 @@ int ncpu; size_t size = sizeof(ncpu); if (sysctl(mib, std::size(mib), &ncpu, &size, NULL, 0) < 0) { -@@ -41,10 +46,26 @@ int SysInfo::NumberOfProcessors() { +@@ -40,10 +46,26 @@ int SysInfo::NumberOfProcessors() { // static uint64_t SysInfo::AmountOfPhysicalMemoryImpl() { @@ -47,12 +39,12 @@ +std::string SysInfo::CPUModelName() { + int mib[] = {CTL_HW, HW_MODEL}; + size_t len = std::size(cpumodel); -+ ++ + if (cpumodel[0] == '\0') { + if (sysctl(mib, std::size(mib), cpumodel, &len, NULL, 0) < 0) + return std::string(); + } -+ ++ + return std::string(cpumodel, len - 1); +} + @@ -60,7 +52,7 @@ uint64_t SysInfo::AmountOfAvailablePhysicalMemoryImpl() { // We should add inactive file-backed memory also but there is no such // information from OpenBSD unfortunately. -@@ -56,16 +77,28 @@ uint64_t SysInfo::MaxSharedMemorySize() { +@@ -55,15 +77,27 @@ uint64_t SysInfo::MaxSharedMemorySize() { int mib[] = {CTL_KERN, KERN_SHMINFO, KERN_SHMINFO_SHMMAX}; size_t limit; size_t size = sizeof(limit); @@ -69,7 +61,6 @@ + goto out; if (sysctl(mib, std::size(mib), &limit, &size, NULL, 0) < 0) { NOTREACHED(); - return 0; } - return static_cast(limit); + shmmax = static_cast(limit); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info__posix.cc index acb43f21eb86..9811092045dd 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info__posix.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info__posix.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/base/system/sys_info_posix.cc.orig 2023-12-10 06:10:27 UTC +--- src/3rdparty/chromium/base/system/sys_info_posix.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/base/system/sys_info_posix.cc @@ -117,7 +117,7 @@ bool GetDiskSpaceInfo(const base::FilePath& path, @@ -9,7 +9,7 @@ // static int SysInfo::NumberOfProcessors() { #if BUILDFLAG(IS_MAC) -@@ -174,7 +174,7 @@ int SysInfo::NumberOfProcessors() { +@@ -173,7 +173,7 @@ int SysInfo::NumberOfProcessors() { return cached_num_cpus; } @@ -18,7 +18,7 @@ // static uint64_t SysInfo::AmountOfVirtualMemory() { -@@ -264,6 +264,8 @@ std::string SysInfo::OperatingSystemArchitecture() { +@@ -256,6 +256,8 @@ std::string SysInfo::OperatingSystemArchitecture() { arch = "x86"; } else if (arch == "amd64") { arch = "x86_64"; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_test_test__file__util__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_test_test__file__util__posix.cc index c2fb6bd5a8ec..03b322a72227 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_test_test__file__util__posix.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_test_test__file__util__posix.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/test/test_file_util_posix.cc.orig 2022-02-28 16:54:41 UTC +--- src/3rdparty/chromium/base/test/test_file_util_posix.cc.orig 2024-06-17 12:56:06 UTC +++ src/3rdparty/chromium/base/test/test_file_util_posix.cc -@@ -88,7 +88,7 @@ void SyncPageCacheToDisk() { +@@ -91,7 +91,7 @@ void SyncPageCacheToDisk() { } #if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_APPLE) && \ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_threading_hang__watcher.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_threading_hang__watcher.cc index 62a5b20ce6c5..1acb784c5b8a 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_threading_hang__watcher.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_threading_hang__watcher.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/threading/hang_watcher.cc.orig 2023-10-11 18:22:24 UTC +--- src/3rdparty/chromium/base/threading/hang_watcher.cc.orig 2024-07-30 11:12:21 UTC +++ src/3rdparty/chromium/base/threading/hang_watcher.cc -@@ -331,7 +331,7 @@ void HangWatcher::InitializeOnMainThread(ProcessType p +@@ -354,7 +354,7 @@ void HangWatcher::InitializeOnMainThread(ProcessType p bool enable_hang_watcher = base::FeatureList::IsEnabled(kEnableHangWatcher); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_threading_platform__thread.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_threading_platform__thread.h new file mode 100644 index 000000000000..5dccba34816d --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_threading_platform__thread.h @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/base/threading/platform_thread.h.orig 2024-06-17 12:56:06 UTC ++++ src/3rdparty/chromium/base/threading/platform_thread.h +@@ -49,6 +49,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/qt6-webengine/files/patch-src_3rdparty_chromium_base_threading_platform__thread__bsd.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_threading_platform__thread__bsd.cc index d2ea66bf3ea5..c3f93d6fc250 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_threading_platform__thread__bsd.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_threading_platform__thread__bsd.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/base/threading/platform_thread_bsd.cc.orig 2023-09-13 12:11:42 UTC +--- src/3rdparty/chromium/base/threading/platform_thread_bsd.cc.orig 2024-04-19 13:02:56 UTC +++ src/3rdparty/chromium/base/threading/platform_thread_bsd.cc @@ -0,0 +1,31 @@ +// Copyright 2023 The Chromium Authors @@ -20,9 +20,9 @@ + return false; +} + -+absl::optional ++std::optional +GetCurrentThreadPriorityForPlatformForTest() { -+ return absl::nullopt; ++ return std::nullopt; +} +} // namespace internal + diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_threading_platform__thread__internal__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_threading_platform__thread__internal__posix.cc index 7feb2dec502e..33df077009ca 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_threading_platform__thread__internal__posix.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_threading_platform__thread__internal__posix.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/base/threading/platform_thread_internal_posix.cc.orig 2023-09-13 12:11:42 UTC +--- src/3rdparty/chromium/base/threading/platform_thread_internal_posix.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/base/threading/platform_thread_internal_posix.cc @@ -41,7 +41,7 @@ ThreadPriorityForTest NiceValueToThreadPriorityForTest } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_threading_platform__thread__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_threading_platform__thread__posix.cc index 39a3f3cb2e0f..d7047788d294 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_threading_platform__thread__posix.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_threading_platform__thread__posix.cc @@ -1,13 +1,12 @@ ---- src/3rdparty/chromium/base/threading/platform_thread_posix.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/base/threading/platform_thread_posix.cc.orig 2024-06-17 12:56:06 UTC +++ src/3rdparty/chromium/base/threading/platform_thread_posix.cc -@@ -78,12 +78,12 @@ void* ThreadFunc(void* params) { +@@ -77,11 +77,11 @@ void* ThreadFunc(void* params) { if (!thread_params->joinable) base::DisallowSingleton(); --#if BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && BUILDFLAG(USE_STARSCAN) -+#if BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && BUILDFLAG(USE_STARSCAN) && !BUILDFLAG(IS_BSD) - partition_alloc::internal::PCScan::NotifyThreadCreated( - partition_alloc::internal::GetStackPointer()); +-#if PA_BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) ++#if PA_BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && !BUILDFLAG(IS_BSD) + partition_alloc::internal::StackTopRegistry::Get().NotifyThreadCreated(); #endif -#if !BUILDFLAG(IS_NACL) @@ -15,7 +14,16 @@ #if BUILDFLAG(IS_APPLE) PlatformThread::SetCurrentThreadRealtimePeriodValue( delegate->GetRealtimePeriod()); -@@ -357,7 +357,7 @@ void PlatformThreadBase::Detach(PlatformThreadHandle t +@@ -265,6 +265,8 @@ PlatformThreadId PlatformThreadBase::CurrentId() { + return reinterpret_cast(pthread_self()); + #elif BUILDFLAG(IS_POSIX) && BUILDFLAG(IS_AIX) + return pthread_self(); ++#elif BUILDFLAG(IS_BSD) ++ return reinterpret_cast(pthread_self()); + #elif BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_AIX) + return reinterpret_cast(pthread_self()); + #endif +@@ -355,7 +357,7 @@ void PlatformThreadBase::Detach(PlatformThreadHandle t // static bool PlatformThreadBase::CanChangeThreadType(ThreadType from, ThreadType to) { @@ -24,7 +32,7 @@ return false; #else if (from >= to) { -@@ -378,6 +378,9 @@ void SetCurrentThreadTypeImpl(ThreadType thread_type, +@@ -376,6 +378,9 @@ void SetCurrentThreadTypeImpl(ThreadType thread_type, MessagePumpType pump_type_hint) { #if BUILDFLAG(IS_NACL) NOTIMPLEMENTED(); @@ -34,7 +42,7 @@ #else if (internal::SetCurrentThreadTypeForPlatform(thread_type, pump_type_hint)) return; -@@ -400,7 +403,7 @@ void SetCurrentThreadTypeImpl(ThreadType thread_type, +@@ -398,7 +403,7 @@ void SetCurrentThreadTypeImpl(ThreadType thread_type, // static ThreadPriorityForTest PlatformThreadBase::GetCurrentThreadPriorityForTest() { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_trace__event_malloc__dump__provider.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_trace__event_malloc__dump__provider.cc index feb1cc8aef43..9d1fe42fd514 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_trace__event_malloc__dump__provider.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_trace__event_malloc__dump__provider.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc.orig 2024-08-26 12:06:38 UTC +++ src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc -@@ -25,6 +25,8 @@ +@@ -28,6 +28,8 @@ #if BUILDFLAG(IS_APPLE) #include @@ -9,16 +9,16 @@ #else #include #endif -@@ -182,7 +184,7 @@ void ReportAppleAllocStats(size_t* total_virtual_size, +@@ -178,7 +180,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) && \ + #if (PA_BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && BUILDFLAG(IS_ANDROID)) || \ + (!PA_BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && !BUILDFLAG(IS_WIN) && \ - !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_FUCHSIA)) + !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_BSD)) void ReportMallinfoStats(ProcessMemoryDump* pmd, size_t* total_virtual_size, size_t* resident_size, -@@ -353,6 +355,9 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDump +@@ -368,6 +370,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/qt6-webengine/files/patch-src_3rdparty_chromium_base_trace__event_memory__dump__manager.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_trace__event_memory__dump__manager.cc index 650f145f5d7c..4e330ba0b584 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_trace__event_memory__dump__manager.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_trace__event_memory__dump__manager.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/trace_event/memory_dump_manager.cc.orig 2022-03-25 21:59:56 UTC +--- src/3rdparty/chromium/base/trace_event/memory_dump_manager.cc.orig 2024-09-30 07:45:04 UTC +++ src/3rdparty/chromium/base/trace_event/memory_dump_manager.cc -@@ -82,7 +82,7 @@ const char* const MemoryDumpManager::kSystemAllocatorP +@@ -83,7 +83,7 @@ const char* const MemoryDumpManager::kSystemAllocatorP #if defined(MALLOC_MEMORY_TRACING_SUPPORTED) MallocDumpProvider::kAllocatedObjects; #else diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_trace__event_process__memory__dump.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_trace__event_process__memory__dump.cc index 788383fa3e2c..6c95ad6303ba 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_trace__event_process__memory__dump.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_trace__event_process__memory__dump.cc @@ -1,20 +1,20 @@ ---- src/3rdparty/chromium/base/trace_event/process_memory_dump.cc.orig 2022-09-24 10:57:32 UTC +--- src/3rdparty/chromium/base/trace_event/process_memory_dump.cc.orig 2024-08-26 12:06:38 UTC +++ src/3rdparty/chromium/base/trace_event/process_memory_dump.cc -@@ -112,7 +112,7 @@ absl::optional ProcessMemoryDump::CountResiden +@@ -120,7 +120,7 @@ std::optional ProcessMemoryDump::CountResident #if BUILDFLAG(IS_WIN) - std::unique_ptr vec( - new PSAPI_WORKING_SET_EX_INFORMATION[max_vec_size]); + auto vec = + base::HeapArray::WithSize(max_vec_size); -#elif BUILDFLAG(IS_APPLE) +#elif BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD) - std::unique_ptr vec(new char[max_vec_size]); + auto vec = base::HeapArray::WithSize(max_vec_size); #elif BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA) - std::unique_ptr vec(new unsigned char[max_vec_size]); -@@ -134,7 +134,7 @@ absl::optional ProcessMemoryDump::CountResiden + auto vec = base::HeapArray::WithSize(max_vec_size); +@@ -143,7 +143,7 @@ std::optional ProcessMemoryDump::CountResident for (size_t i = 0; i < page_count; i++) resident_page_count += vec[i].VirtualAttributes.Valid; -#elif BUILDFLAG(IS_FUCHSIA) +#elif BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - // TODO(crbug.com/851760): Implement counting resident bytes. + // TODO(crbug.com/42050620): Implement counting resident bytes. // For now, log and avoid unused variable warnings. NOTIMPLEMENTED_LOG_ONCE(); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_BUILD.gn index b1a4a3cee529..fa15cd774237 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_BUILD.gn @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/build/config/BUILD.gn.orig 2024-07-03 01:14:49 UTC +--- src/3rdparty/chromium/build/config/BUILD.gn.orig 2025-02-21 12:29:33 UTC +++ src/3rdparty/chromium/build/config/BUILD.gn -@@ -218,6 +218,10 @@ config("default_libs") { +@@ -217,6 +217,10 @@ config("default_libs") { # Targets should choose to explicitly link frameworks they require. Since # linking can have run-time side effects, nothing should be listed here. libs = [] diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_BUILDCONFIG.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_BUILDCONFIG.gn index a363b506a353..e667084ffa83 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_BUILDCONFIG.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_BUILDCONFIG.gn @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/build/config/BUILDCONFIG.gn.orig 2024-07-03 01:14:49 UTC +--- src/3rdparty/chromium/build/config/BUILDCONFIG.gn.orig 2025-02-21 12:29:33 UTC +++ src/3rdparty/chromium/build/config/BUILDCONFIG.gn @@ -136,7 +136,8 @@ declare_args() { is_official_build = false @@ -10,7 +10,7 @@ (current_cpu != "s390x" && current_cpu != "s390" && current_cpu != "ppc64" && current_cpu != "ppc" && current_cpu != "mips" && current_cpu != "mips64" && -@@ -235,6 +236,10 @@ if (host_toolchain == "") { +@@ -244,6 +245,10 @@ if (host_toolchain == "") { host_toolchain = "//build/toolchain/aix:$host_cpu" } else if (host_os == "zos") { host_toolchain = "//build/toolchain/zos:$host_cpu" @@ -21,7 +21,7 @@ } else { assert(false, "Unsupported host_os: $host_os") } -@@ -278,6 +283,8 @@ if (target_os == "android") { +@@ -289,6 +294,8 @@ if (target_os == "android") { _default_toolchain = "//build/toolchain/aix:$target_cpu" } else if (target_os == "zos") { _default_toolchain = "//build/toolchain/zos:$target_cpu" @@ -30,7 +30,7 @@ } else { assert(false, "Unsupported target_os: $target_os") } -@@ -312,7 +319,11 @@ is_ios = current_os == "ios" +@@ -323,7 +330,11 @@ is_ios = current_os == "ios" is_chromeos = current_os == "chromeos" is_fuchsia = current_os == "fuchsia" is_ios = current_os == "ios" diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_clang_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_clang_BUILD.gn new file mode 100644 index 000000000000..4d8d73dc7891 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_clang_BUILD.gn @@ -0,0 +1,16 @@ +--- src/3rdparty/chromium/build/config/clang/BUILD.gn.orig 2024-10-22 08:31:56 UTC ++++ src/3rdparty/chromium/build/config/clang/BUILD.gn +@@ -236,7 +236,12 @@ template("clang_lib") { + + # Adds a dependency on the Clang runtime library clang_rt.builtins. + clang_lib("compiler_builtins") { +- if (is_mac) { ++ if (is_bsd) { ++ # Since there's no Rust in the toolchain, there's no concern that we'll use ++ # the Rust stdlib's intrinsics here. ++ # ++ # Don't define libname which makes this target do nothing. ++ } else if (is_mac) { + libname = "osx" + } else if (is_ios) { + if (target_environment == "simulator") { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_compiler_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_compiler_BUILD.gn index 0d429b73c061..67a497605164 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_compiler_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_compiler_BUILD.gn @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/build/config/compiler/BUILD.gn.orig 2024-07-03 01:14:49 UTC +--- src/3rdparty/chromium/build/config/compiler/BUILD.gn.orig 2025-02-21 12:29:33 UTC +++ src/3rdparty/chromium/build/config/compiler/BUILD.gn -@@ -210,7 +210,7 @@ declare_args() { +@@ -205,7 +205,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. @@ -9,7 +9,7 @@ } declare_args() { -@@ -274,13 +274,16 @@ config("no_unresolved_symbols") { +@@ -262,13 +262,16 @@ config("no_unresolved_symbols") { # 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") { @@ -22,12 +22,12 @@ ] } + if (current_cpu == "x86" && is_openbsd) { -+ ldflags = [ "-Wl,-z,notext" ] ++ ldflags = [ "-Wl,-z,notext", "-Wl,--strip-all" ] + } } # compiler --------------------------------------------------------------------- -@@ -568,6 +571,10 @@ config("compiler") { +@@ -556,6 +559,10 @@ config("compiler") { } } @@ -38,7 +38,7 @@ # Linux-specific compiler flags setup. # ------------------------------------ if (use_gold) { -@@ -1232,7 +1239,7 @@ config("compiler_cpu_abi") { +@@ -1287,7 +1294,7 @@ config("compiler_cpu_abi") { ] } } else if (current_cpu == "arm") { @@ -47,7 +47,7 @@ !(is_chromeos_lacros && is_chromeos_device)) { cflags += [ "--target=arm-linux-gnueabihf" ] ldflags += [ "--target=arm-linux-gnueabihf" ] -@@ -1250,7 +1257,7 @@ config("compiler_cpu_abi") { +@@ -1305,7 +1312,7 @@ config("compiler_cpu_abi") { cflags += [ "-mtune=$arm_tune" ] } } else if (current_cpu == "arm64") { @@ -56,7 +56,7 @@ !(is_chromeos_lacros && is_chromeos_device)) { cflags += [ "--target=aarch64-linux-gnu" ] ldflags += [ "--target=aarch64-linux-gnu" ] -@@ -1585,7 +1592,7 @@ config("compiler_deterministic") { +@@ -1640,7 +1647,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. @@ -65,39 +65,45 @@ # TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here. cflags += [ "-Xclang", -@@ -1637,7 +1644,7 @@ config("clang_revision") { +@@ -1698,7 +1705,7 @@ config("clang_revision") { } config("clang_revision") { -- if (is_clang && clang_base_path == default_clang_base_path) { -+ if (is_clang && !is_bsd && clang_base_path == default_clang_base_path) { +- if (is_clang && clang_base_path == default_clang_base_path && ++ if (is_clang && !is_bsd && clang_base_path == default_clang_base_path && + current_os != "zos") { update_args = [ "--print-revision", - "--verify-version=$clang_version", -@@ -2102,12 +2109,9 @@ config("default_warnings") { +@@ -2198,9 +2205,6 @@ config("default_warnings") { - # TODO(crbug.com/1494809): Evaluate and possibly enable. + # TODO(crbug.com/40286317): Evaluate and possibly enable. "-Wno-vla-extension", - -- # TODO(https://crbug.com/1490607): Fix and re-enable. +- # TODO(crbug.com/40284799): Fix and re-enable. - "-Wno-thread-safety-reference-return", ] + cflags_cc += [ +@@ -2208,17 +2212,11 @@ config("default_warnings") { + "-Wenum-compare-conditional", + ] + - if (!is_nacl) { -+ if (!is_nacl && !is_bsd) { ++ if (!is_nacl && !is_openbsd) { cflags_cc += [ - # TODO(https://crbug.com/1513724): Fix and re-enable. + # TODO(crbug.com/41486292): Fix and re-enable. "-Wno-c++11-narrowing-const-reference", -@@ -2295,7 +2299,7 @@ config("no_chromium_code") { - # third-party libraries. - "-Wno-c++11-narrowing", - ] -- if (!is_nacl) { -+ if (!is_nacl && !is_freebsd) { - cflags += [ - # Disabled for similar reasons as -Wunused-variable. - "-Wno-unused-but-set-variable", -@@ -2832,7 +2836,7 @@ config("afdo") { + ] +- +- # TODO(crbug.com/344680447): Fix and re-enable. +- cflags_cc += [ "-Wno-missing-template-arg-list-after-template-kw" ] +- +- # TODO(crbug.com/356172342): Fix and re-enable. +- cflags_cc += [ "-Wno-dangling-assignment-gsl" ] + } + } + +@@ -2961,7 +2959,7 @@ config("afdo") { # There are some targeted places that AFDO regresses, so we provide a separate # config to allow AFDO to be disabled per-target. config("afdo") { @@ -106,7 +112,7 @@ cflags = [] if (clang_emit_debug_info_for_profiling) { # Add the following flags to generate debug info for profiling. -@@ -2859,7 +2863,7 @@ config("afdo") { +@@ -2988,7 +2986,7 @@ config("afdo") { cflags += [ "-Wno-backend-plugin" ] inputs = [ _clang_sample_profile ] } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_linux_pkg-config.py b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_linux_pkg-config.py index 53f55b9e38ed..61af0eb3382c 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_linux_pkg-config.py +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_linux_pkg-config.py @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/build/config/linux/pkg-config.py.orig 2024-07-03 01:14:49 UTC +--- src/3rdparty/chromium/build/config/linux/pkg-config.py.orig 2025-02-21 12:29:33 UTC +++ src/3rdparty/chromium/build/config/linux/pkg-config.py @@ -113,7 +113,7 @@ def main(): # If this is run on non-Linux platforms, just return nothing and indicate diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_ozone.gni b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_ozone.gni index 9acc98da34de..152b8564bc34 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_ozone.gni +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_ozone.gni @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/build/config/ozone.gni.orig 2024-07-03 01:14:49 UTC +--- src/3rdparty/chromium/build/config/ozone.gni.orig 2025-02-21 12:29:33 UTC +++ src/3rdparty/chromium/build/config/ozone.gni @@ -87,7 +87,15 @@ declare_args() { } else if (is_chromeos_lacros) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_rust.gni b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_rust.gni new file mode 100644 index 000000000000..9a3b922fdddf --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_rust.gni @@ -0,0 +1,13 @@ +--- src/3rdparty/chromium/build/config/rust.gni.orig 2024-10-22 08:31:56 UTC ++++ src/3rdparty/chromium/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/qt6-webengine/files/patch-src_3rdparty_chromium_build_linux_unbundle_icu.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_linux_unbundle_icu.gn index a53a8e58f942..84078a5ed5fb 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_linux_unbundle_icu.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_linux_unbundle_icu.gn @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/build/linux/unbundle/icu.gn.orig 2023-04-13 18:16:16 UTC +--- src/3rdparty/chromium/build/linux/unbundle/icu.gn.orig 2025-02-21 12:29:33 UTC +++ src/3rdparty/chromium/build/linux/unbundle/icu.gn @@ -17,6 +17,15 @@ config("icu_config") { "USING_SYSTEM_ICU=1", @@ -16,3 +16,12 @@ # U_EXPORT (defined in unicode/platform.h) is used to set public visibility # on classes through the U_COMMON_API and U_I18N_API macros (among others). # When linking against the system ICU library, we want its symbols to have +@@ -34,6 +43,8 @@ config("icu_config") { + # to define U_IMPORT to have the same value as U_EXPORT. For more details, + # please see: https://crbug.com/822820 + "U_IMPORT=U_EXPORT", ++ # Unbreak with icu 76 where private symbols are picked up ++ "U_HIDE_DRAFT_API", + ] + } + diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_rust_rust__bindgen.gni b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_rust_rust__bindgen.gni new file mode 100644 index 000000000000..ea8b6007a1c6 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_rust_rust__bindgen.gni @@ -0,0 +1,19 @@ +--- src/3rdparty/chromium/build/rust/rust_bindgen.gni.orig 2024-07-30 19:22:51 UTC ++++ src/3rdparty/chromium/build/rust/rust_bindgen.gni +@@ -11,14 +11,14 @@ if (is_win) { + import("//build/toolchain/win/win_toolchain_data.gni") + } + +-_bindgen_path = "${rust_bindgen_root}/bin/bindgen" ++_bindgen_path = "${LOCALBASE}/bin/bindgen" + if (host_os == "win") { + _bindgen_path = "${_bindgen_path}.exe" + } + + # On Windows, the libclang.dll is beside the bindgen.exe, otherwise it is in + # ../lib. +-_libclang_path = rust_bindgen_root ++_libclang_path = "${LOCALBASE}/llvm${MODCLANG_VERSION}" + if (host_os == "win") { + _libclang_path += "/bin" + } else { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_rust_std_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_rust_std_BUILD.gn new file mode 100644 index 000000000000..eb61b334e716 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_rust_std_BUILD.gn @@ -0,0 +1,10 @@ +--- src/3rdparty/chromium/build/rust/std/BUILD.gn.orig 2024-08-26 12:06:38 UTC ++++ src/3rdparty/chromium/build/rust/std/BUILD.gn +@@ -100,7 +100,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/qt6-webengine/files/patch-src_3rdparty_chromium_build_toolchain_gcc__toolchain.gni b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_toolchain_gcc__toolchain.gni index d7729787e2fa..5c9c6bb4b2c4 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_toolchain_gcc__toolchain.gni +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_toolchain_gcc__toolchain.gni @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/build/toolchain/gcc_toolchain.gni.orig 2024-07-03 01:14:49 UTC +--- src/3rdparty/chromium/build/toolchain/gcc_toolchain.gni.orig 2025-02-21 12:29:33 UTC +++ src/3rdparty/chromium/build/toolchain/gcc_toolchain.gni -@@ -53,6 +53,13 @@ if (enable_resource_allowlist_generation) { +@@ -56,6 +56,13 @@ if (enable_resource_allowlist_generation) { "enable_resource_allowlist_generation=true does not work for target_os=$target_os") } @@ -14,8 +14,8 @@ # This template defines a toolchain for something that works like gcc # (including clang). # -@@ -900,22 +907,12 @@ template("clang_toolchain") { - # use_gold too. +@@ -918,22 +925,12 @@ template("clang_toolchain") { + # actually just be doing a native compile. template("clang_toolchain") { gcc_toolchain(target_name) { - _path = "$clang_base_path/bin" diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_toolchain_toolchain.gni b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_toolchain_toolchain.gni index fffdf3103a89..0671e4638f36 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_toolchain_toolchain.gni +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_toolchain_toolchain.gni @@ -1,10 +1,10 @@ ---- src/3rdparty/chromium/build/toolchain/toolchain.gni.orig 2023-11-03 10:09:45 UTC +--- src/3rdparty/chromium/build/toolchain/toolchain.gni.orig 2024-08-26 12:06:38 UTC +++ src/3rdparty/chromium/build/toolchain/toolchain.gni @@ -72,7 +72,7 @@ if (host_os == "mac") { host_shlib_extension = ".dylib" } else if (host_os == "win") { host_shlib_extension = ".dll" --} else if (host_os == "linux" || host_os == "aix") { +-} else if (host_os == "linux" || host_os == "aix" || host_os == "zos") { +} else if (is_posix) { host_shlib_extension = ".so" } else { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_cc_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_cc_BUILD.gn deleted file mode 100644 index c3442f05bde9..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_cc_BUILD.gn +++ /dev/null @@ -1,19 +0,0 @@ ---- src/3rdparty/chromium/cc/BUILD.gn.orig 2024-02-23 21:04:38 UTC -+++ src/3rdparty/chromium/cc/BUILD.gn -@@ -678,7 +678,7 @@ cc_test_static_library("test_support") { - if (enable_vulkan) { - deps += [ "//gpu/vulkan/init" ] - } -- if (!is_android) { -+ if (!is_android && !is_bsd) { - data_deps = [ "//third_party/mesa_headers" ] - } - if (skia_use_dawn) { -@@ -938,7 +938,6 @@ cc_test("cc_unittests") { - data = [ "//components/test/data/viz/" ] - data_deps = [ - "//testing/buildbot/filters:cc_unittests_filters", -- "//third_party/mesa_headers", - ] - - if (is_android && enable_chrome_android_internal) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_cc_base_features.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_cc_base_features.cc index d3eec63f01aa..4bbc524ecd38 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_cc_base_features.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_cc_base_features.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/cc/base/features.cc.orig 2024-07-03 01:14:49 UTC +--- src/3rdparty/chromium/cc/base/features.cc.orig 2025-02-21 12:29:33 UTC +++ src/3rdparty/chromium/cc/base/features.cc -@@ -89,7 +89,7 @@ BASE_FEATURE(kNormalPriorityImageDecoding, +@@ -83,7 +83,7 @@ const base::FeatureParam kDeferImplInvalidationFr // Note that kUseDMSAAForTiles only controls vulkan launch on android. We will // be using a separate flag to control the launch on GL. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_BUILD.gn index 412f381805dd..5fc8b88311c8 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_BUILD.gn @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/chrome/browser/BUILD.gn.orig 2024-07-03 01:14:49 UTC +--- src/3rdparty/chromium/chrome/browser/BUILD.gn.orig 2025-02-21 12:29:33 UTC +++ src/3rdparty/chromium/chrome/browser/BUILD.gn -@@ -6399,6 +6399,13 @@ static_library("browser") { +@@ -6897,6 +6897,13 @@ static_library("browser") { } } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_accessibility_page__colors.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_accessibility_page__colors.cc new file mode 100644 index 000000000000..2e2ee97b0530 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_accessibility_page__colors.cc @@ -0,0 +1,20 @@ +--- src/3rdparty/chromium/chrome/browser/accessibility/page_colors.cc.orig 2024-08-26 12:06:38 UTC ++++ src/3rdparty/chromium/chrome/browser/accessibility/page_colors.cc +@@ -12,7 +12,7 @@ + #include "components/sync_preferences/pref_service_syncable.h" + #include "ui/native_theme/native_theme.h" + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "ui/linux/linux_ui.h" + #include "ui/linux/linux_ui_factory.h" + #endif // BUILDFLAG(IS_LINUX) +@@ -55,7 +55,7 @@ void PageColors::Init() { + + void PageColors::OnPageColorsChanged() { + auto* native_theme = ui::NativeTheme::GetInstanceForNativeUi(); +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Allow the Linux native theme to update its state for page colors. + if (auto* linux_ui_theme = ui::GetDefaultLinuxUiTheme()) { + if (auto* linux_native_theme = linux_ui_theme->GetNativeTheme()) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_accessibility_pdf__ocr__controller.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_accessibility_pdf__ocr__controller.cc deleted file mode 100644 index 7ca2a45a6474..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_accessibility_pdf__ocr__controller.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/chrome/browser/accessibility/pdf_ocr_controller.cc.orig 2024-01-30 07:53:34 UTC -+++ src/3rdparty/chromium/chrome/browser/accessibility/pdf_ocr_controller.cc -@@ -86,7 +86,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/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_custom__handlers_chrome__protocol__handler__registry__delegate.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_custom__handlers_chrome__protocol__handler__registry__delegate.cc index 598bdbbfeb4f..9f060444cb6f 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_custom__handlers_chrome__protocol__handler__registry__delegate.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_custom__handlers_chrome__protocol__handler__registry__delegate.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/chrome/browser/custom_handlers/chrome_protocol_handler_registry_delegate.cc.orig 2024-07-03 01:14:49 UTC +--- src/3rdparty/chromium/chrome/browser/custom_handlers/chrome_protocol_handler_registry_delegate.cc.orig 2025-02-21 12:29:33 UTC +++ src/3rdparty/chromium/chrome/browser/custom_handlers/chrome_protocol_handler_registry_delegate.cc @@ -77,7 +77,7 @@ bool ChromeProtocolHandlerRegistryDelegate::ShouldRemo // If true default protocol handlers will be removed if the OS level diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_BUILD.gn index 1b7b8992c403..2fa01266e632 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_BUILD.gn @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/chrome/browser/extensions/BUILD.gn.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/chrome/browser/extensions/BUILD.gn.orig 2025-02-21 12:29:33 UTC +++ src/3rdparty/chromium/chrome/browser/extensions/BUILD.gn -@@ -1380,6 +1380,10 @@ static_library("extensions") { +@@ -1496,6 +1496,10 @@ source_set("extensions") { deps += [ "//chrome/services/printing/public/mojom" ] } @@ -8,6 +8,6 @@ + sources -= [ "api/image_writer_private/removable_storage_provider_linux.cc" ] + } + - if (enable_service_discovery) { - sources += [ - "api/mdns/mdns_api.cc", + if (enable_pdf) { + deps += [ + "//chrome/browser/pdf", diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_api__browser__context__keyed__service__factories.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_api__browser__context__keyed__service__factories.cc index aca216dad4b2..1a422f554fc7 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_api__browser__context__keyed__service__factories.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_api__browser__context__keyed__service__factories.cc @@ -1,7 +1,7 @@ ---- src/3rdparty/chromium/chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc.orig 2024-01-30 07:53:34 UTC +--- src/3rdparty/chromium/chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc -@@ -44,7 +44,7 @@ - #include "extensions/browser/api/networking_private/networking_private_delegate_factory.h" +@@ -41,7 +41,7 @@ + #include "pdf/buildflags.h" #include "printing/buildflags/buildflags.h" -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) @@ -9,7 +9,7 @@ #include "chrome/browser/extensions/api/system_indicator/system_indicator_manager_factory.h" #endif -@@ -127,7 +127,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt +@@ -117,7 +117,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt extensions::SettingsPrivateEventRouterFactory::GetInstance(); extensions::SettingsOverridesAPI::GetFactoryInstance(); extensions::SidePanelService::GetFactoryInstance(); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc index 567d9a7b848c..b9cda5cb8a80 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc -@@ -32,7 +32,7 @@ +@@ -41,7 +41,7 @@ #include "components/reporting/util/statusor.h" #endif @@ -9,7 +9,7 @@ #include #include "base/strings/string_util.h" -@@ -149,7 +149,7 @@ api::enterprise_reporting_private::ContextInfo ToConte +@@ -158,7 +158,7 @@ api::enterprise_reporting_private::ContextInfo ToConte return info; } @@ -18,7 +18,7 @@ device_signals::SignalsAggregationRequest CreateAggregationRequest( device_signals::SignalName signal_name) { -@@ -210,7 +210,7 @@ EnterpriseReportingPrivateGetDeviceIdFunction:: +@@ -220,7 +220,7 @@ EnterpriseReportingPrivateGetDeviceIdFunction:: // getPersistentSecret @@ -27,7 +27,7 @@ EnterpriseReportingPrivateGetPersistentSecretFunction:: EnterpriseReportingPrivateGetPersistentSecretFunction() = default; -@@ -636,7 +636,7 @@ void EnterpriseReportingPrivateEnqueueRecordFunction:: +@@ -646,7 +646,7 @@ void EnterpriseReportingPrivateEnqueueRecordFunction:: } #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_management_chrome__management__api__delegate.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_management_chrome__management__api__delegate.cc new file mode 100644 index 000000000000..bca4b2e07a27 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_management_chrome__management__api__delegate.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/chrome/browser/extensions/api/management/chrome_management_api_delegate.cc.orig 2024-08-26 12:06:38 UTC ++++ src/3rdparty/chromium/chrome/browser/extensions/api/management/chrome_management_api_delegate.cc +@@ -417,7 +417,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/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_messaging_native__process__launcher__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_messaging_launch__context__posix.cc similarity index 62% rename from www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_messaging_native__process__launcher__posix.cc rename to www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_messaging_launch__context__posix.cc index c3ae9c1184ad..0e6aff89ad56 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_messaging_native__process__launcher__posix.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_messaging_launch__context__posix.cc @@ -1,8 +1,8 @@ ---- src/3rdparty/chromium/chrome/browser/extensions/api/messaging/native_process_launcher_posix.cc.orig 2023-12-10 06:10:27 UTC -+++ src/3rdparty/chromium/chrome/browser/extensions/api/messaging/native_process_launcher_posix.cc -@@ -84,7 +84,7 @@ bool NativeProcessLauncher::LaunchNativeProcess( +--- src/3rdparty/chromium/chrome/browser/extensions/api/messaging/launch_context_posix.cc.orig 2024-08-26 12:06:38 UTC ++++ src/3rdparty/chromium/chrome/browser/extensions/api/messaging/launch_context_posix.cc +@@ -86,7 +86,7 @@ std::optional LaunchConte - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // TODO(crbug.com/40118868): 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) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc index 06f5c7f7d562..03b9e87a6b56 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc -@@ -600,7 +600,7 @@ void PasswordsPrivateDelegateImpl::OnFetchingFamilyMem +@@ -636,7 +636,7 @@ void PasswordsPrivateDelegateImpl::OnFetchingFamilyMem } void PasswordsPrivateDelegateImpl::OsReauthTimeoutCall() { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc index 9cdec9b58afa..c1243e116c1e 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc.orig 2023-12-10 06:10:27 UTC +--- src/3rdparty/chromium/chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc -@@ -279,7 +279,9 @@ bool ChromeRuntimeAPIDelegate::GetPlatformInfo(Platfor +@@ -288,7 +288,9 @@ bool ChromeRuntimeAPIDelegate::GetPlatformInfo(Platfor } else if (strcmp(os, "linux") == 0) { info->os = extensions::api::runtime::PlatformOs::kLinux; } else if (strcmp(os, "openbsd") == 0) { @@ -8,6 +8,6 @@ + info->os = extensions::api::runtime::PlatformOs::kLinux; + } else if (strcmp(os, "freebsd") == 0) { + info->os = extensions::api::runtime::PlatformOs::kLinux; - } else if (strcmp(os, "fuchsia") == 0) { - info->os = extensions::api::runtime::PlatformOs::kFuchsia; } else { + NOTREACHED_IN_MIGRATION() << "Platform not supported: " << os; + return false; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_settings__private_prefs__util.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_settings__private_prefs__util.cc index 6b104fcfb5e2..8fed39fd2ab8 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_settings__private_prefs__util.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_settings__private_prefs__util.cc @@ -1,7 +1,16 @@ ---- src/3rdparty/chromium/chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2024-01-30 07:53:34 UTC +--- src/3rdparty/chromium/chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/chrome/browser/extensions/api/settings_private/prefs_util.cc -@@ -196,7 +196,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist - (*s_allowlist)[::prefs::kSidePanelHorizontalAlignment] = +@@ -193,7 +193,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist + (*s_allowlist)[autofill::prefs::kAutofillPaymentCardBenefits] = + settings_api::PrefType::kBoolean; + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + (*s_allowlist)[autofill::prefs::kAutofillPredictionImprovementsEnabled] = + settings_api::PrefType::kBoolean; + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || +@@ -211,7 +211,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist + (*s_allowlist)[tab_groups::prefs::kAutoPinNewTabGroups] = settings_api::PrefType::kBoolean; -#if BUILDFLAG(IS_LINUX) @@ -9,9 +18,9 @@ (*s_allowlist)[::prefs::kUseCustomChromeFrame] = settings_api::PrefType::kBoolean; #endif -@@ -205,7 +205,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist - // Appearance settings. +@@ -223,7 +223,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist (*s_allowlist)[::prefs::kCurrentThemeID] = settings_api::PrefType::kString; + (*s_allowlist)[::prefs::kPinnedActions] = settings_api::PrefType::kList; (*s_allowlist)[::prefs::kPolicyThemeColor] = settings_api::PrefType::kNumber; -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_tabs_tabs__api.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_tabs_tabs__api.cc index 24a102a0d330..85e4aefd33d1 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_tabs_tabs__api.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_tabs_tabs__api.cc @@ -1,9 +1,9 @@ ---- src/3rdparty/chromium/chrome/browser/extensions/api/tabs/tabs_api.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/chrome/browser/extensions/api/tabs/tabs_api.cc.orig 2024-10-26 13:10:01 UTC +++ src/3rdparty/chromium/chrome/browser/extensions/api/tabs/tabs_api.cc -@@ -836,7 +836,7 @@ ExtensionFunction::ResponseAction WindowsCreateFunctio +@@ -886,7 +886,7 @@ ExtensionFunction::ResponseAction WindowsCreateFunctio // minimized. - // TODO(crbug.com/1410400): Remove this workaround when linux is fixed. - // TODO(crbug.com/1410400): Find a fix for wayland as well. + // TODO(crbug.com/40254339): Remove this workaround when linux is fixed. + // TODO(crbug.com/40254339): Find a fix for wayland as well. -#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) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc index 4a5d4fa716e4..f459415887ce 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc.orig 2024-07-03 01:14:49 UTC +--- src/3rdparty/chromium/chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc.orig 2025-02-21 12:29:33 UTC +++ src/3rdparty/chromium/chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc @@ -31,7 +31,7 @@ #include "extensions/browser/process_manager.h" diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_webstore__private_webstore__private__api.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_webstore__private_webstore__private__api.cc index b24ae865bc22..791801ea899c 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_webstore__private_webstore__private__api.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_webstore__private_webstore__private__api.cc @@ -1,9 +1,9 @@ ---- src/3rdparty/chromium/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc.orig 2024-01-30 07:53:34 UTC +--- src/3rdparty/chromium/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc.orig 2024-09-30 07:45:04 UTC +++ src/3rdparty/chromium/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc -@@ -904,7 +904,7 @@ void WebstorePrivateBeginInstallWithManifest3Function: - RequestExtensionApproval(contents); - return; - } +@@ -915,7 +915,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/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_gcm_gcm__profile__service__factory.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_gcm_gcm__profile__service__factory.cc index e6211b58db81..7144dc3e806d 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_gcm_gcm__profile__service__factory.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_gcm_gcm__profile__service__factory.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/chrome/browser/gcm/gcm_profile_service_factory.cc.orig 2024-07-03 01:14:49 UTC +--- src/3rdparty/chromium/chrome/browser/gcm/gcm_profile_service_factory.cc.orig 2025-02-21 12:29:33 UTC +++ src/3rdparty/chromium/chrome/browser/gcm/gcm_profile_service_factory.cc @@ -91,7 +91,7 @@ GCMProfileService* GCMProfileServiceFactory::GetForPro // static @@ -9,7 +9,7 @@ // On desktop, incognito profiles are checked with IsIncognitoProfile(). // It's possible for non-incognito profiles to also be off-the-record. bool is_profile_supported = -@@ -131,7 +131,7 @@ KeyedService* GCMProfileServiceFactory::BuildServiceIn +@@ -134,7 +134,7 @@ KeyedService* GCMProfileServiceFactory::BuildServiceIn KeyedService* GCMProfileServiceFactory::BuildServiceInstanceFor( content::BrowserContext* context) const { Profile* profile = Profile::FromBrowserContext(context); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_gcm_instance__id_instance__id__profile__service__factory.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_gcm_instance__id_instance__id__profile__service__factory.cc index de8d94187879..d1c67ace1cc3 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_gcm_instance__id_instance__id__profile__service__factory.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_gcm_instance__id_instance__id__profile__service__factory.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/chrome/browser/gcm/instance_id/instance_id_profile_service_factory.cc.orig 2023-09-13 12:11:42 UTC +--- src/3rdparty/chromium/chrome/browser/gcm/instance_id/instance_id_profile_service_factory.cc.orig 2024-08-26 12:06:38 UTC +++ src/3rdparty/chromium/chrome/browser/gcm/instance_id/instance_id_profile_service_factory.cc @@ -16,7 +16,7 @@ namespace instance_id { // static @@ -9,7 +9,7 @@ // On desktop, the guest profile is actually the primary OTR profile of // the "regular" guest profile. The regular guest profile is never used // directly by users. Also, user are not able to create child OTR profiles -@@ -61,7 +61,7 @@ InstanceIDProfileServiceFactory::~InstanceIDProfileSer +@@ -64,7 +64,7 @@ InstanceIDProfileServiceFactory::~InstanceIDProfileSer KeyedService* InstanceIDProfileServiceFactory::BuildServiceInstanceFor( content::BrowserContext* context) const { Profile* profile = Profile::FromBrowserContext(context); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_router_discovery_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_router_discovery_BUILD.gn index c660a6a343b8..32a51a1c8207 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_router_discovery_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_router_discovery_BUILD.gn @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/chrome/browser/media/router/discovery/BUILD.gn.orig 2023-12-10 06:10:27 UTC +--- src/3rdparty/chromium/chrome/browser/media/router/discovery/BUILD.gn.orig 2024-06-17 12:56:06 UTC +++ src/3rdparty/chromium/chrome/browser/media/router/discovery/BUILD.gn -@@ -81,7 +81,7 @@ static_library("discovery") { +@@ -82,7 +82,7 @@ static_library("discovery") { ] configs += [ "//build/config/compiler:wexit_time_destructors" ] diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_webrtc_capture__policy__utils.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_webrtc_capture__policy__utils.cc deleted file mode 100644 index 19760cc6adbc..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_webrtc_capture__policy__utils.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- src/3rdparty/chromium/chrome/browser/media/webrtc/capture_policy_utils.cc.orig 2023-12-10 06:10:27 UTC -+++ src/3rdparty/chromium/chrome/browser/media/webrtc/capture_policy_utils.cc -@@ -140,7 +140,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry - } - - bool IsGetAllScreensMediaAllowedForAnySite(content::BrowserContext* context) { --#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - Profile* profile = Profile::FromBrowserContext(context); - if (!profile) { - return false; -@@ -175,7 +175,7 @@ bool IsGetAllScreensMediaAllowedForAnySite(content::Br - - bool IsGetAllScreensMediaAllowed(content::BrowserContext* context, - const GURL& url) { --#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - Profile* profile = Profile::FromBrowserContext(context); - if (!profile) { - return false; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_webrtc_desktop__media__picker__controller.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_webrtc_desktop__media__picker__controller.cc index 95eaf29010fc..477cdf3526ec 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_webrtc_desktop__media__picker__controller.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_webrtc_desktop__media__picker__controller.cc @@ -1,9 +1,9 @@ ---- src/3rdparty/chromium/chrome/browser/media/webrtc/desktop_media_picker_controller.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/chrome/browser/media/webrtc/desktop_media_picker_controller.cc.orig 2024-06-17 12:56:06 UTC +++ src/3rdparty/chromium/chrome/browser/media/webrtc/desktop_media_picker_controller.cc -@@ -92,7 +92,7 @@ bool DesktopMediaPickerController::IsSystemAudioCaptur - } else { - return base::FeatureList::IsEnabled(media::kMacLoopbackAudioForScreenShare); - } +@@ -89,7 +89,7 @@ bool DesktopMediaPickerController::IsSystemAudioCaptur + #if BUILDFLAG(IS_MAC) + return request_source == Params::RequestSource::kCast || + base::FeatureList::IsEnabled(media::kMacLoopbackAudioForScreenShare); -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) if (request_source == Params::RequestSource::kCast) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_webrtc_webrtc__log__uploader.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_webrtc_webrtc__log__uploader.cc index 9361e33fba2a..4676a7325540 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_webrtc_webrtc__log__uploader.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_webrtc_webrtc__log__uploader.cc @@ -1,8 +1,8 @@ ---- src/3rdparty/chromium/chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig 2024-07-03 01:14:49 UTC +--- src/3rdparty/chromium/chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig 2025-02-21 12:29:33 UTC +++ src/3rdparty/chromium/chrome/browser/media/webrtc/webrtc_log_uploader.cc -@@ -102,7 +102,7 @@ std::string GetLogUploadProduct() { +@@ -110,7 +110,7 @@ std::string GetLogUploadProduct() { const char product[] = "Chrome_Mac"; - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // TODO(crbug.com/40118868): 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) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_webrtc_webrtc__logging__controller.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_webrtc_webrtc__logging__controller.cc index a772a13eb6f6..e28f79ea9fea 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_webrtc_webrtc__logging__controller.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_webrtc_webrtc__logging__controller.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/chrome/browser/media/webrtc/webrtc_logging_controller.cc.orig 2024-10-02 15:40:01 UTC +--- src/3rdparty/chromium/chrome/browser/media/webrtc/webrtc_logging_controller.cc.orig 2025-02-21 12:29:33 UTC +++ src/3rdparty/chromium/chrome/browser/media/webrtc/webrtc_logging_controller.cc @@ -25,10 +25,10 @@ #include "components/webrtc_logging/browser/text_log_list.h" @@ -30,4 +30,4 @@ +#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) void WebRtcLoggingController::OnRtpPacket( - std::unique_ptr packet_header, + base::HeapArray packet_header, diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_webrtc_webrtc__logging__controller.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_webrtc_webrtc__logging__controller.h index 5aee58293cb8..02204f578dbd 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_webrtc_webrtc__logging__controller.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_webrtc_webrtc__logging__controller.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/chrome/browser/media/webrtc/webrtc_logging_controller.h.orig 2024-07-03 01:14:49 UTC +--- src/3rdparty/chromium/chrome/browser/media/webrtc/webrtc_logging_controller.h.orig 2025-02-21 12:29:33 UTC +++ src/3rdparty/chromium/chrome/browser/media/webrtc/webrtc_logging_controller.h @@ -137,7 +137,7 @@ class WebRtcLoggingController size_t web_app_id, diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_net_profile__network__context__service.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_net_profile__network__context__service.cc new file mode 100644 index 000000000000..b943e9eb2068 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_net_profile__network__context__service.cc @@ -0,0 +1,29 @@ +--- src/3rdparty/chromium/chrome/browser/net/profile_network_context_service.cc.orig 2024-10-22 08:31:56 UTC ++++ src/3rdparty/chromium/chrome/browser/net/profile_network_context_service.cc +@@ -140,7 +140,7 @@ + #include "chromeos/startup/browser_params_proxy.h" + #endif + +-#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/client_certificates/certificate_provisioning_service_factory.h" + #include "components/enterprise/client_certificates/core/certificate_provisioning_service.h" + #include "components/enterprise/client_certificates/core/client_certificates_service.h" +@@ -260,7 +260,7 @@ void UpdateCookieSettings(Profile* profile, ContentSet + }); + } + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + std::unique_ptr GetWrappedCertStore( + Profile* profile, + std::unique_ptr platform_store) { +@@ -986,7 +986,7 @@ ProfileNetworkContextService::CreateClientCertStore() + store = std::make_unique( + std::move(certificate_provider), cert_db_initializer, std::move(store)); + #endif // BUILDFLAG(IS_CHROMEOS_LACROS) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + return GetWrappedCertStore(profile_, std::move(store)); + #else + return store; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_net_system__network__context__manager.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_net_system__network__context__manager.cc index 70f074c8e5eb..2833c9ab340b 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_net_system__network__context__manager.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_net_system__network__context__manager.cc @@ -1,15 +1,15 @@ ---- src/3rdparty/chromium/chrome/browser/net/system_network_context_manager.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/chrome/browser/net/system_network_context_manager.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/chrome/browser/net/system_network_context_manager.cc -@@ -92,7 +92,7 @@ +@@ -102,7 +102,7 @@ - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // TODO(crbug.com/40118868): 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/branded_strings.h" #include "ui/base/l10n/l10n_util.h" -@@ -137,7 +137,7 @@ SystemNetworkContextManager* g_system_network_context_ +@@ -146,7 +146,7 @@ SystemNetworkContextManager* g_system_network_context_ // received a failed launch for a sandboxed network service. bool g_previously_failed_to_launch_sandboxed_service = false; @@ -18,7 +18,7 @@ // Whether kerberos library loading will work in the network service due to the // sandbox. bool g_network_service_will_allow_gssapi_library_load = false; -@@ -145,7 +145,7 @@ bool g_network_service_will_allow_gssapi_library_load +@@ -154,7 +154,7 @@ bool g_network_service_will_allow_gssapi_library_load const char* kGssapiDesiredPref = #if BUILDFLAG(IS_CHROMEOS) prefs::kKerberosEnabled; @@ -27,7 +27,7 @@ prefs::kReceivedHttpAuthNegotiateHeader; #endif #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -@@ -191,7 +191,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut +@@ -200,7 +200,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut auth_dynamic_params->basic_over_http_enabled = local_state->GetBoolean(prefs::kBasicAuthOverHttpEnabled); @@ -36,7 +36,7 @@ auth_dynamic_params->delegate_by_kdc_policy = local_state->GetBoolean(prefs::kAuthNegotiateDelegateByKdcPolicy); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) -@@ -206,7 +206,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut +@@ -215,7 +215,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut local_state->GetString(prefs::kAuthAndroidNegotiateAccountType); #endif // BUILDFLAG(IS_ANDROID) @@ -45,7 +45,7 @@ auth_dynamic_params->allow_gssapi_library_load = local_state->GetBoolean(kGssapiDesiredPref); #endif // BUILDFLAG(IS_CHROMEOS) -@@ -216,7 +216,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut +@@ -225,7 +225,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut void OnNewHttpAuthDynamicParams( network::mojom::HttpAuthDynamicParamsPtr& params) { @@ -54,7 +54,7 @@ // 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 -@@ -258,11 +258,11 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal() +@@ -267,11 +267,11 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal() if (g_previously_failed_to_launch_sandboxed_service) { return NetworkSandboxState::kDisabledBecauseOfFailedLaunch; } @@ -68,7 +68,7 @@ // 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 || -@@ -278,7 +278,7 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal() +@@ -287,7 +287,7 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal() } #endif // BUILDFLAG(IS_WIN) @@ -77,7 +77,7 @@ if (local_state && local_state->HasPrefPath(prefs::kNetworkServiceSandboxEnabled)) { return local_state->GetBoolean(prefs::kNetworkServiceSandboxEnabled) -@@ -508,7 +508,7 @@ void SystemNetworkContextManager::DeleteInstance() { +@@ -517,7 +517,7 @@ void SystemNetworkContextManager::DeleteInstance() { g_system_network_context_manager = nullptr; } @@ -86,7 +86,7 @@ SystemNetworkContextManager::GssapiLibraryLoadObserver:: GssapiLibraryLoadObserver(SystemNetworkContextManager* owner) : owner_(owner) {} -@@ -566,7 +566,7 @@ SystemNetworkContextManager::SystemNetworkContextManag +@@ -575,7 +575,7 @@ SystemNetworkContextManager::SystemNetworkContextManag pref_change_registrar_.Add(prefs::kAllHttpAuthSchemesAllowedForOrigins, auth_pref_callback); @@ -95,7 +95,7 @@ pref_change_registrar_.Add(prefs::kAuthNegotiateDelegateByKdcPolicy, auth_pref_callback); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) -@@ -580,7 +580,7 @@ SystemNetworkContextManager::SystemNetworkContextManag +@@ -589,7 +589,7 @@ SystemNetworkContextManager::SystemNetworkContextManag auth_pref_callback); #endif // BUILDFLAG(IS_ANDROID) @@ -104,16 +104,7 @@ pref_change_registrar_.Add(kGssapiDesiredPref, auth_pref_callback); #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -@@ -606,7 +606,7 @@ SystemNetworkContextManager::SystemNetworkContextManag - #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) - pref_change_registrar_.Add( - prefs::kEnforceLocalAnchorConstraintsEnabled, - base::BindRepeating(&SystemNetworkContextManager:: -@@ -661,7 +661,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe +@@ -660,7 +660,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe registry->RegisterBooleanPref(prefs::kKerberosEnabled, false); #endif // BUILDFLAG(IS_CHROMEOS_LACROS) @@ -122,16 +113,7 @@ registry->RegisterBooleanPref(prefs::kAuthNegotiateDelegateByKdcPolicy, false); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) -@@ -685,7 +685,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, -@@ -694,11 +694,11 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe +@@ -685,11 +685,11 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe registry->RegisterListPref(prefs::kExplicitlyAllowedNetworkPorts); @@ -145,7 +127,7 @@ registry->RegisterBooleanPref(prefs::kReceivedHttpAuthNegotiateHeader, false); #endif // BUILDFLAG(IS_LINUX) -@@ -751,7 +751,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea +@@ -742,7 +742,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea OnNewHttpAuthDynamicParams(http_auth_dynamic_params); network_service->ConfigureHttpAuthPrefs(std::move(http_auth_dynamic_params)); @@ -154,7 +136,7 @@ gssapi_library_loader_observer_.Install(network_service); #endif // BUILDFLAG(IS_LINUX) -@@ -954,7 +954,7 @@ bool SystemNetworkContextManager::IsNetworkSandboxEnab +@@ -969,7 +969,7 @@ bool SystemNetworkContextManager::IsNetworkSandboxEnab break; } @@ -163,12 +145,3 @@ if (!enabled) { g_network_service_will_allow_gssapi_library_load = true; } -@@ -1040,7 +1040,7 @@ void SystemNetworkContextManager::UpdateExplicitlyAllo - } - - #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) - void SystemNetworkContextManager::UpdateEnforceLocalAnchorConstraintsEnabled() { - const PrefService::Preference* enforce_local_anchor_constraints_enabled_pref = - local_state_->FindPreference( diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_net_system__network__context__manager.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_net_system__network__context__manager.h index 5e74471c6180..1f4c663c5ab9 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_net_system__network__context__manager.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_net_system__network__context__manager.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/chrome/browser/net/system_network_context_manager.h.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/chrome/browser/net/system_network_context_manager.h.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/chrome/browser/net/system_network_context_manager.h -@@ -200,7 +200,7 @@ class SystemNetworkContextManager { +@@ -198,7 +198,7 @@ class SystemNetworkContextManager { class URLLoaderFactoryForSystem; class NetworkProcessLaunchWatcher; @@ -9,18 +9,9 @@ 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) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) - // Applies the current value of the kEnforceLocalAnchorConstraintsEnabled - // pref to the enforcement state. - void UpdateEnforceLocalAnchorConstraintsEnabled(); -@@ -284,7 +284,7 @@ class SystemNetworkContextManager { - - static std::optional certificate_transparency_enabled_for_testing_; +@@ -279,7 +279,7 @@ class SystemNetworkContextManager { + std::unique_ptr network_annotation_monitor_; + #endif // BUILDFLAG(IS_CHROMEOS) -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_prefs_browser__prefs.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_prefs_browser__prefs.cc index 5007be764387..c92bad6fa9a6 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_prefs_browser__prefs.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_prefs_browser__prefs.cc @@ -1,6 +1,15 @@ ---- src/3rdparty/chromium/chrome/browser/prefs/browser_prefs.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/chrome/browser/prefs/browser_prefs.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/chrome/browser/prefs/browser_prefs.cc -@@ -486,18 +486,18 @@ +@@ -313,7 +313,7 @@ + #include "components/user_notes/user_notes_prefs.h" + #endif // BUILDFLAG(IS_ANDROID) + +-#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/webui/whats_new/whats_new_ui.h" + #endif + +@@ -491,18 +491,18 @@ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +18,7 @@ #include "components/device_signals/core/browser/pref_names.h" // nogncheck due to crbug.com/1125897 #endif - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // TODO(crbug.com/40118868): 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) || \ @@ -18,11 +27,11 @@ #endif -#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_BSD) #include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h" #endif -@@ -529,7 +529,7 @@ +@@ -537,7 +537,7 @@ #include "chrome/browser/sessions/session_service_log.h" #endif @@ -31,25 +40,25 @@ #include "ui/color/system_theme.h" #endif -@@ -567,7 +567,7 @@ const char kPluginsPluginsList[] = "plugins.plugins_li - const char kPluginsShowDetails[] = "plugins.show_details"; +@@ -1678,7 +1678,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) + on_device_translation::RegisterLocalStatePrefs(registry); + #endif // BUILDFLAG(IS_ANDROID) - // 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) + WhatsNewUI::RegisterLocalStatePrefs(registry); + #endif -@@ -972,7 +972,7 @@ const char kBorealisVmTokenHash[] = "borealis.vm_token - // key). - void RegisterLocalStatePrefsForMigration(PrefRegistrySimple* registry) { - // 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) +@@ -1854,7 +1854,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) + #endif // BUILDFLAG(ENABLE_PDF) + + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ +- BUILDFLAG(IS_ANDROID) ++ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) + registry->RegisterBooleanPref(prefs::kChromeForTestingAllowed, true); + #endif -@@ -1986,12 +1986,12 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync +@@ -2213,12 +2213,12 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -64,12 +73,3 @@ browser_switcher::BrowserSwitcherPrefs::RegisterProfilePrefs(registry); enterprise_signin::RegisterProfilePrefs(registry); #endif -@@ -2121,7 +2121,7 @@ void MigrateObsoleteLocalStatePrefs(PrefService* local - // Please don't delete the preceding line. It is used by PRESUBMIT.py. - - // 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) - diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_prefs_pref__service__incognito__allowlist.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_prefs_pref__service__incognito__allowlist.cc index 30ddf9a2ebc9..f97e4522c338 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_prefs_pref__service__incognito__allowlist.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_prefs_pref__service__incognito__allowlist.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/chrome/browser/prefs/pref_service_incognito_allowlist.cc.orig 2023-08-17 07:33:31 UTC +--- src/3rdparty/chromium/chrome/browser/prefs/pref_service_incognito_allowlist.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/chrome/browser/prefs/pref_service_incognito_allowlist.cc -@@ -168,7 +168,7 @@ const char* const kPersistentPrefNames[] = { +@@ -198,7 +198,7 @@ const char* const kPersistentPrefNames[] = { prefs::kShowFullscreenToolbar, #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_printing_print__backend__service__manager.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_printing_print__backend__service__manager.cc index 37674cc233bf..4250dad18aec 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_printing_print__backend__service__manager.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_printing_print__backend__service__manager.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/chrome/browser/printing/print_backend_service_manager.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/chrome/browser/printing/print_backend_service_manager.cc.orig 2024-08-26 12:06:38 UTC +++ src/3rdparty/chromium/chrome/browser/printing/print_backend_service_manager.cc -@@ -34,7 +34,7 @@ +@@ -36,7 +36,7 @@ #include "printing/printing_context.h" #include "printing/printing_features.h" @@ -9,7 +9,7 @@ #include "content/public/common/content_switches.h" #endif -@@ -853,7 +853,7 @@ PrintBackendServiceManager::GetServiceFromBundle( +@@ -877,7 +877,7 @@ PrintBackendServiceManager::GetServiceFromBundle( host.BindNewPipeAndPassReceiver(), content::ServiceProcessHost::Options() .WithDisplayName(IDS_UTILITY_PROCESS_PRINT_BACKEND_SERVICE_NAME) @@ -18,7 +18,7 @@ .WithExtraCommandLineSwitches({switches::kMessageLoopTypeUi}) #endif .Pass()); -@@ -1026,7 +1026,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate +@@ -1054,7 +1054,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate return kNoClientsRegisteredResetOnIdleTimeout; case ClientType::kQueryWithUi: diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_printing_printer__query.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_printing_printer__query.cc index 253ca5a4c0b5..da0f35eb9b61 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_printing_printer__query.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_printing_printer__query.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/chrome/browser/printing/printer_query.cc.orig 2024-07-03 01:14:49 UTC +--- src/3rdparty/chromium/chrome/browser/printing/printer_query.cc.orig 2025-02-21 12:29:33 UTC +++ src/3rdparty/chromium/chrome/browser/printing/printer_query.cc @@ -361,7 +361,7 @@ void PrinterQuery::UpdatePrintSettings(base::Value::Di crash_key = std::make_unique( diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_about_about__ui.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_about_about__ui.cc new file mode 100644 index 000000000000..1290583933ef --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_about_about__ui.cc @@ -0,0 +1,29 @@ +--- src/3rdparty/chromium/chrome/browser/ui/webui/about/about_ui.cc.orig 2024-09-30 07:45:04 UTC ++++ src/3rdparty/chromium/chrome/browser/ui/webui/about/about_ui.cc +@@ -596,7 +596,7 @@ std::string ChromeURLs(content::BrowserContext* browse + return html; + } + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OPENBSD) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + std::string AboutLinuxProxyConfig() { + std::string data; + AppendHeader(&data, +@@ -629,7 +629,7 @@ TermsUIConfig::TermsUIConfig() + : AboutUIConfigBase(chrome::kChromeUITermsHost) {} + #endif + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OPENBSD) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + LinuxProxyConfigUI::LinuxProxyConfigUI() + : AboutUIConfigBase(chrome::kChromeUILinuxProxyConfigHost) {} + #endif +@@ -681,7 +681,7 @@ void AboutUIHTMLSource::StartDataRequest( + response = + ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(idr); + } +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OPENBSD) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + } else if (source_name_ == chrome::kChromeUILinuxProxyConfigHost) { + response = AboutLinuxProxyConfig(); + #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_about_about__ui.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_about_about__ui.h new file mode 100644 index 000000000000..44ade82d960c --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_about_about__ui.h @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/chrome/browser/ui/webui/about/about_ui.h.orig 2024-09-30 07:45:04 UTC ++++ src/3rdparty/chromium/chrome/browser/ui/webui/about/about_ui.h +@@ -50,7 +50,7 @@ class TermsUIConfig : public AboutUIConfigBase { + }; + #endif + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OPENBSD) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + // chrome://linux-proxy-config + class LinuxProxyConfigUI : public AboutUIConfigBase { + public: diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_app__home_app__home__page__handler.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_app__home_app__home__page__handler.cc index 29cd78786851..6eb342ea16f1 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_app__home_app__home__page__handler.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_app__home_app__home__page__handler.cc @@ -1,20 +1,11 @@ ---- src/3rdparty/chromium/chrome/browser/ui/webui/app_home/app_home_page_handler.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/chrome/browser/ui/webui/app_home/app_home_page_handler.cc.orig 2024-09-30 07:45:04 UTC +++ src/3rdparty/chromium/chrome/browser/ui/webui/app_home/app_home_page_handler.cc -@@ -386,7 +386,7 @@ app_home::mojom::AppInfoPtr AppHomePageHandler::Create +@@ -62,7 +62,7 @@ + #include "ui/base/window_open_disposition_utils.h" + #include "url/gurl.h" - bool deprecated_app = false; - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - auto* context = extension_system_->extension_service()->GetBrowserContext(); - deprecated_app = - extensions::IsExtensionUnsupportedDeprecatedApp(context, extension->id()); -@@ -450,7 +450,7 @@ void AppHomePageHandler::FillExtensionInfoList( - } +-static_assert(BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)); ++static_assert(BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)); - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - auto* context = extension_system_->extension_service()->GetBrowserContext(); - const bool is_deprecated_app = - extensions::IsExtensionUnsupportedDeprecatedApp(context, + using content::WebUI; + using extensions::Extension; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_app__home_app__home__page__handler.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_app__home_app__home__page__handler.h new file mode 100644 index 000000000000..8ba652f39610 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_app__home_app__home__page__handler.h @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/chrome/browser/ui/webui/app_home/app_home_page_handler.h.orig 2024-07-30 11:12:21 UTC ++++ src/3rdparty/chromium/chrome/browser/ui/webui/app_home/app_home_page_handler.h +@@ -24,7 +24,7 @@ + #include "mojo/public/cpp/bindings/receiver.h" + #include "mojo/public/cpp/bindings/remote.h" + +-static_assert(BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)); ++static_assert(BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)); + + class ExtensionEnableFlow; + diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_certificate__manager_certificate__manager__handler.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_certificate__manager_certificate__manager__handler.cc new file mode 100644 index 000000000000..9b41c8c72527 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_certificate__manager_certificate__manager__handler.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/chrome/browser/ui/webui/certificate_manager/certificate_manager_handler.cc.orig 2024-10-22 08:31:56 UTC ++++ src/3rdparty/chromium/chrome/browser/ui/webui/certificate_manager/certificate_manager_handler.cc +@@ -154,7 +154,7 @@ CertificateManagerPageHandler::GetCertSource( + "distrusted_certs", + cert_verifier::mojom::CertificateTrust::kDistrusted); + break; +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + case certificate_manager_v2::mojom::CertificateSource:: + kProvisionedClientCert: + source_ptr = CreateProvisionedClientCertSource(profile_); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_certificate__manager_client__cert__sources.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_certificate__manager_client__cert__sources.cc new file mode 100644 index 000000000000..6d069fbd5dcd --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_certificate__manager_client__cert__sources.cc @@ -0,0 +1,29 @@ +--- src/3rdparty/chromium/chrome/browser/ui/webui/certificate_manager/client_cert_sources.cc.orig 2024-10-22 08:31:56 UTC ++++ src/3rdparty/chromium/chrome/browser/ui/webui/certificate_manager/client_cert_sources.cc +@@ -43,7 +43,7 @@ + #include "net/ssl/client_cert_store_mac.h" + #endif // BUILDFLAG(IS_MAC) + +-#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/client_certificates/certificate_provisioning_service_factory.h" + #include "components/enterprise/client_certificates/core/certificate_provisioning_service.h" + #include "components/enterprise/client_certificates/core/client_certificates_service.h" +@@ -191,7 +191,7 @@ std::unique_ptr CreatePlatformC + #endif + } + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // ClientCertStore implementation that always returns an empty list. The + // CertificateProvisioningService implementation expects to wrap a platform + // cert store, but here we only want to get results from the provisioning +@@ -673,7 +673,7 @@ CreatePlatformClientCertSource( + #endif + } + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + std::unique_ptr + CreateProvisionedClientCertSource(Profile* profile) { + return std::make_unique( diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_certificate__manager_client__cert__sources.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_certificate__manager_client__cert__sources.h new file mode 100644 index 000000000000..be43fb7575a4 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_certificate__manager_client__cert__sources.h @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/chrome/browser/ui/webui/certificate_manager/client_cert_sources.h.orig 2024-10-22 08:31:56 UTC ++++ src/3rdparty/chromium/chrome/browser/ui/webui/certificate_manager/client_cert_sources.h +@@ -18,7 +18,7 @@ CreatePlatformClientCertSource( + remote_client, + 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) + std::unique_ptr + CreateProvisionedClientCertSource(Profile* profile); + #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_chrome__web__ui__configs.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_chrome__web__ui__configs.cc new file mode 100644 index 000000000000..f1461941c8ca --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_chrome__web__ui__configs.cc @@ -0,0 +1,33 @@ +--- src/3rdparty/chromium/chrome/browser/ui/webui/chrome_web_ui_configs.cc.orig 2024-10-22 08:31:56 UTC ++++ src/3rdparty/chromium/chrome/browser/ui/webui/chrome_web_ui_configs.cc +@@ -77,7 +77,7 @@ + #include "chrome/browser/ui/webui/certificate_manager/certificate_manager_ui.h" + #endif // BUILDFLAG(CHROME_ROOT_STORE_CERT_MANAGEMENT_UI) + +-#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/webui/whats_new/whats_new_ui.h" + #endif + +@@ -148,10 +148,10 @@ void RegisterChromeWebUIConfigs() { + map.AddWebUIConfig(std::make_unique()); + #endif // !BUILDFLAG(IS_ANDROID) + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OPENBSD) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + map.AddWebUIConfig(std::make_unique()); + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || +- // BUILDFLAG(IS_OPENBSD) ++ // BUILDFLAG(IS_BSD) + + #if BUILDFLAG(ENABLE_EXTENSIONS) + map.AddWebUIConfig(std::make_unique()); +@@ -165,7 +165,7 @@ void RegisterChromeWebUIConfigs() { + map.AddWebUIConfig(std::make_unique()); + #endif // BUILDFLAG(CHROME_ROOT_STORE_CERT_MANAGEMENT_UI) + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + map.AddWebUIConfig(std::make_unique()); + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) + diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc index ae50e55da1ac..9c0165a41ec0 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2024-07-03 01:14:49 UTC +--- src/3rdparty/chromium/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2025-02-21 12:29:33 UTC +++ src/3rdparty/chromium/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -@@ -212,7 +212,7 @@ +@@ -180,7 +180,7 @@ #include "chrome/browser/ui/webui/chromeos/chrome_url_disabled/chrome_url_disabled_ui.h" #endif @@ -9,12 +9,13 @@ #include "chrome/browser/ui/webui/webui_js_error/webui_js_error_ui.h" #endif -@@ -238,17 +238,17 @@ +@@ -205,22 +205,22 @@ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #include "chrome/browser/ui/webui/commerce/product_specifications_ui.h" #include "chrome/browser/ui/webui/discards/discards_ui.h" #endif @@ -30,16 +31,12 @@ #include "chrome/browser/ui/webui/connectors_internals/connectors_internals_ui.h" #endif -@@ -406,7 +406,7 @@ bool IsAboutUI(const GURL& url) { - #if !BUILDFLAG(IS_ANDROID) - || url.host_piece() == chrome::kChromeUITermsHost - #endif --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OPENBSD) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - || url.host_piece() == chrome::kChromeUILinuxProxyConfigHost +-#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/webui/whats_new/whats_new_ui.h" #endif - #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -657,7 +657,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we + +@@ -510,7 +510,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we if (url.host_piece() == chrome::kChromeUIMobileSetupHost) return &NewWebUI; #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -48,7 +45,7 @@ if (url.host_piece() == chrome::kChromeUIWebUIJsErrorHost) return &NewWebUI; #endif -@@ -713,7 +713,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -562,7 +562,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we if (url.host_piece() == chrome::kChromeUINaClHost) return &NewWebUI; #endif @@ -57,7 +54,7 @@ defined(TOOLKIT_VIEWS)) || \ defined(USE_AURA) if (url.host_piece() == chrome::kChromeUITabModalConfirmDialogHost) -@@ -776,27 +776,27 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -605,26 +605,26 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we } #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -84,9 +81,26 @@ if (url.host_piece() == chrome::kChromeUIBrowserSwitchHost) return &NewWebUI; #endif - #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 (url.host_piece() == chrome::kChromeUIWebAppSettingsHost) return &NewWebUI; #endif +@@ -860,7 +860,7 @@ base::RefCountedMemory* ChromeWebUIControllerFactory:: + if (page_url.host_piece() == chrome::kChromeUINewTabPageHost) + return NewTabPageUI::GetFaviconResourceBytes(scale_factor); + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (page_url.host_piece() == chrome::kChromeUIWhatsNewHost) + return WhatsNewUI::GetFaviconResourceBytes(scale_factor); + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +@@ -888,7 +888,7 @@ base::RefCountedMemory* ChromeWebUIControllerFactory:: + return ManagementUI::GetFaviconResourceBytes(scale_factor); + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + if (page_url.host_piece() == commerce::kChromeUICompareHost) { + return commerce::ProductSpecificationsUI::GetFaviconResourceBytes( + scale_factor); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_connectors__internals_device__trust__utils.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_connectors__internals_device__trust__utils.cc index 9b297761ef5b..bbace5704e7a 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_connectors__internals_device__trust__utils.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_connectors__internals_device__trust__utils.cc @@ -1,15 +1,15 @@ ---- src/3rdparty/chromium/chrome/browser/ui/webui/connectors_internals/device_trust_utils.cc.orig 2023-11-03 10:09:45 UTC +--- src/3rdparty/chromium/chrome/browser/ui/webui/connectors_internals/device_trust_utils.cc.orig 2024-05-21 18:07:39 UTC +++ src/3rdparty/chromium/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" -@@ -29,7 +29,7 @@ namespace utils { +@@ -38,7 +38,7 @@ namespace enterprise_connectors::utils { namespace { @@ -18,7 +18,7 @@ connectors_internals::mojom::KeyTrustLevel ParseTrustLevel( BPKUR::KeyTrustLevel trust_level) { -@@ -97,7 +97,7 @@ connectors_internals::mojom::Int32ValuePtr ToMojomValu +@@ -173,7 +173,7 @@ connectors_internals::mojom::CertificateMetadataPtr Co } // namespace connectors_internals::mojom::KeyInfoPtr GetKeyInfo() { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_internals_user__education_user__education__internals__page__handler__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_internals_user__education_user__education__internals__page__handler__impl.cc new file mode 100644 index 000000000000..0aa838e04d56 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_internals_user__education_user__education__internals__page__handler__impl.cc @@ -0,0 +1,29 @@ +--- src/3rdparty/chromium/chrome/browser/ui/webui/internals/user_education/user_education_internals_page_handler_impl.cc.orig 2024-09-30 07:45:04 UTC ++++ src/3rdparty/chromium/chrome/browser/ui/webui/internals/user_education/user_education_internals_page_handler_impl.cc +@@ -41,7 +41,7 @@ + #include "ui/base/l10n/l10n_util.h" + #include "ui/base/webui/resource_path.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_navigator.h" + #include "chrome/browser/ui/browser_navigator_params.h" + #include "net/base/url_util.h" +@@ -81,7 +81,7 @@ user_education::NewBadgeRegistry* GetNewBadgeRegistry( + } + + whats_new::WhatsNewRegistry* GetWhatsNewRegistry() { +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + return g_browser_process->GetFeatures()->whats_new_registry(); + #else + return nullptr; +@@ -765,7 +765,7 @@ void UserEducationInternalsPageHandlerImpl::ClearWhats + } + + void UserEducationInternalsPageHandlerImpl::LaunchWhatsNewStaging() { +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + GURL url = net::AppendQueryParameter(GURL(chrome::kChromeUIWhatsNewURL), + "staging", "true"); + NavigateParams params(profile_, url, ui::PAGE_TRANSITION_TYPED); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_interstitials_interstitial__ui.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_interstitials_interstitial__ui.cc new file mode 100644 index 000000000000..b8979bbf590b --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_interstitials_interstitial__ui.cc @@ -0,0 +1,29 @@ +--- src/3rdparty/chromium/chrome/browser/ui/webui/interstitials/interstitial_ui.cc.orig 2024-10-22 08:31:56 UTC ++++ src/3rdparty/chromium/chrome/browser/ui/webui/interstitials/interstitial_ui.cc +@@ -71,7 +71,7 @@ + #include "components/security_interstitials/content/captive_portal_blocking_page.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/supervised_user/supervised_user_verification_controller_client.h" + #include "chrome/browser/supervised_user/supervised_user_verification_page.h" + #endif +@@ -378,7 +378,7 @@ std::unique_ptr CreateEnterpriseWa + kRequestUrl)); + } + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + std::unique_ptr + CreateSupervisedUserVerificationPage(content::WebContents* web_contents, + bool is_main_frame) { +@@ -594,7 +594,7 @@ void InterstitialHTMLSource::StartDataRequest( + interstitial_delegate = CreateInsecureFormPage(web_contents); + } else if (path_without_query == "/https_only") { + interstitial_delegate = CreateHttpsOnlyModePage(web_contents); +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + } else if (path_without_query == "/supervised-user-verify") { + interstitial_delegate = CreateSupervisedUserVerificationPage( + web_contents, /*is_main_frame=*/true); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_management_management__ui.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_management_management__ui.cc index 625962408a07..9d62e01b2499 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_management_management__ui.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_management_management__ui.cc @@ -1,8 +1,8 @@ ---- src/3rdparty/chromium/chrome/browser/ui/webui/management/management_ui.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/chrome/browser/ui/webui/management/management_ui.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/chrome/browser/ui/webui/management/management_ui.cc -@@ -98,11 +98,11 @@ content::WebUIDataSource* CreateAndAddManagementUIHtml - {kManagementOnFileTransferVisibleData, +@@ -108,11 +108,11 @@ content::WebUIDataSource* CreateAndAddManagementUIHtml IDS_MANAGEMENT_FILE_TRANSFER_VISIBLE_DATA}, + {kManagementReportFileEvents, IDS_MANAGEMENT_REPORT_FILE_EVENTS}, #endif // BUILDFLAG(IS_CHROMEOS) -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_management_management__ui__constants.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_management_management__ui__constants.cc new file mode 100644 index 000000000000..44993364499e --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_management_management__ui__constants.cc @@ -0,0 +1,17 @@ +--- src/3rdparty/chromium/chrome/browser/ui/webui/management/management_ui_constants.cc.orig 2024-10-22 08:31:56 UTC ++++ src/3rdparty/chromium/chrome/browser/ui/webui/management/management_ui_constants.cc +@@ -88,12 +88,12 @@ const char kProfileReportingBrowser[] = "profileReport + const char kProfileReportingExtension[] = "profileReportingExtension"; + const char kProfileReportingPolicy[] = "profileReportingPolicy"; + +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + const char kManagementScreenCaptureEvent[] = "managementScreenCaptureEvent"; + const char kManagementScreenCaptureData[] = "managementScreenCaptureData"; + #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) + const char kManagementDeviceSignalsDisclosure[] = + "managementDeviceSignalsDisclosure"; + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_management_management__ui__constants.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_management_management__ui__constants.h new file mode 100644 index 000000000000..4817d104eec3 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_management_management__ui__constants.h @@ -0,0 +1,19 @@ +--- src/3rdparty/chromium/chrome/browser/ui/webui/management/management_ui_constants.h.orig 2024-06-17 12:56:06 UTC ++++ src/3rdparty/chromium/chrome/browser/ui/webui/management/management_ui_constants.h +@@ -8,14 +8,14 @@ + #include "build/build_config.h" + #include "build/chromeos_buildflags.h" + +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Constants defining the IDs for the localized strings sent to the page as + // load time data. + extern const char kManagementScreenCaptureEvent[]; + extern const char kManagementScreenCaptureData[]; + #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) + extern const char kManagementDeviceSignalsDisclosure[]; + #endif // #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) + diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_management_management__ui__handler.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_management_management__ui__handler.cc index ae0435c6ad9d..0134f25e6181 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_management_management__ui__handler.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_management_management__ui__handler.cc @@ -1,48 +1,24 @@ ---- src/3rdparty/chromium/chrome/browser/ui/webui/management/management_ui_handler.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/chrome/browser/ui/webui/management/management_ui_handler.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/chrome/browser/ui/webui/management/management_ui_handler.cc -@@ -95,7 +95,7 @@ - #include "components/policy/core/common/cloud/user_cloud_policy_manager.h" - #endif // BUILDFLAG(IS_CHROMEOS_ASH) +@@ -58,7 +58,7 @@ + #include "ui/base/l10n/l10n_util.h" + #include "ui/base/webui/web_ui_util.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/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) -@@ -191,12 +191,12 @@ enum class ReportingType { - kLegacyTech, - }; - --#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - const char kManagementScreenCaptureEvent[] = "managementScreenCaptureEvent"; - const char kManagementScreenCaptureData[] = "managementScreenCaptureData"; - #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) - const char kManagementDeviceSignalsDisclosure[] = - "managementDeviceSignalsDisclosure"; - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -830,7 +830,7 @@ void ManagementUIHandler::AddReportingInfo(base::Value - GetReportingTypeValue(report_definition.reporting_type)); - report_sources->Append(std::move(data)); +@@ -365,7 +365,7 @@ void ManagementUIHandler::AddReportingInfo(base::Value + report_sources->Append(std::move(data)); + } } -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Insert the device signals consent disclosure at the end of browser // reporting section. auto* user_permission_service = GetUserPermissionService(); -@@ -1118,7 +1118,7 @@ base::Value::Dict ManagementUIHandler::GetThreatProtec - kManagementOnPageVisitedVisibleData, &info); - } - --#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - if (capture_policy::IsGetAllScreensMediaAllowedForAnySite(profile)) { - AddThreatProtectionPermission(kManagementScreenCaptureEvent, - kManagementScreenCaptureData, &info); -@@ -1202,7 +1202,7 @@ policy::PolicyService* ManagementUIHandler::GetPolicyS +@@ -557,7 +557,7 @@ policy::PolicyService* ManagementUIHandler::GetPolicyS ->policy_service(); } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_management_management__ui__handler.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_management_management__ui__handler.h index 9be6ed9671dd..d86f8a499bb0 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_management_management__ui__handler.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_management_management__ui__handler.h @@ -1,24 +1,7 @@ ---- src/3rdparty/chromium/chrome/browser/ui/webui/management/management_ui_handler.h.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/chrome/browser/ui/webui/management/management_ui_handler.h.orig 2024-06-17 12:56:06 UTC +++ src/3rdparty/chromium/chrome/browser/ui/webui/management/management_ui_handler.h -@@ -24,14 +24,14 @@ - #include "extensions/common/extension_id.h" - #include "url/gurl.h" - --#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // Constants defining the IDs for the localized strings sent to the page as - // load time data. - extern const char kManagementScreenCaptureEvent[]; - extern const char kManagementScreenCaptureData[]; - #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) - extern const char kManagementDeviceSignalsDisclosure[]; - #endif // #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) - -@@ -119,7 +119,7 @@ class StatusCollector; - class SystemLogUploader; +@@ -31,7 +31,7 @@ namespace policy { + class PolicyService; } // namespace policy -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) @@ -26,7 +9,7 @@ namespace device_signals { class UserPermissionService; } // namespace device_signals -@@ -179,7 +179,7 @@ class ManagementUIHandler : public content::WebUIMessa +@@ -72,7 +72,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/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_ntp_app__launcher__handler.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_ntp_app__launcher__handler.cc deleted file mode 100644 index 0659f1c77c77..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_ntp_app__launcher__handler.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/chrome/browser/ui/webui/ntp/app_launcher_handler.cc.orig 2023-12-10 06:10:27 UTC -+++ src/3rdparty/chromium/chrome/browser/ui/webui/ntp/app_launcher_handler.cc -@@ -311,7 +311,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/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_password__manager_promo__cards__handler.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_password__manager_promo__cards__handler.cc index 1ba795ccc641..1a12df9eb539 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_password__manager_promo__cards__handler.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_password__manager_promo__cards__handler.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/chrome/browser/ui/webui/password_manager/promo_cards_handler.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/chrome/browser/ui/webui/password_manager/promo_cards_handler.cc.orig 2024-08-26 12:06:38 UTC +++ src/3rdparty/chromium/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" @@ -9,7 +9,7 @@ #include "chrome/browser/ui/webui/password_manager/promo_cards/relaunch_chrome_promo.h" #endif -@@ -71,7 +71,7 @@ std::vector> Ge +@@ -75,7 +75,7 @@ std::vector> Ge .get())); #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_password__manager_promo__cards_relaunch__chrome__promo.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_password__manager_promo__cards_relaunch__chrome__promo.cc new file mode 100644 index 000000000000..c113bb3b6b45 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_password__manager_promo__cards_relaunch__chrome__promo.cc @@ -0,0 +1,20 @@ +--- src/3rdparty/chromium/chrome/browser/ui/webui/password_manager/promo_cards/relaunch_chrome_promo.cc.orig 2024-02-23 21:04:38 UTC ++++ src/3rdparty/chromium/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/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_realbox_realbox__handler.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_searchbox_searchbox__handler.cc similarity index 51% rename from www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_realbox_realbox__handler.cc rename to www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_searchbox_searchbox__handler.cc index 88a561de6447..831ce017e9c7 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_realbox_realbox__handler.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_searchbox_searchbox__handler.cc @@ -1,24 +1,24 @@ ---- src/3rdparty/chromium/chrome/browser/ui/webui/realbox/realbox_handler.cc.orig 2024-02-23 21:04:38 UTC -+++ src/3rdparty/chromium/chrome/browser/ui/webui/realbox/realbox_handler.cc -@@ -148,7 +148,7 @@ const char* kMacShareIconResourceName = +--- src/3rdparty/chromium/chrome/browser/ui/webui/searchbox/searchbox_handler.cc.orig 2024-10-22 08:31:56 UTC ++++ src/3rdparty/chromium/chrome/browser/ui/webui/searchbox/searchbox_handler.cc +@@ -108,7 +108,7 @@ const char* kMacShareIconResourceName = #elif BUILDFLAG(IS_WIN) const char* kWinShareIconResourceName = - "//resources/cr_components/omnibox/icons/win_share.svg"; + "//resources/cr_components/searchbox/icons/win_share.svg"; -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) const char* kLinuxShareIconResourceName = - "//resources/cr_components/omnibox/icons/share.svg"; + "//resources/cr_components/searchbox/icons/share.svg"; #else -@@ -207,7 +207,7 @@ static void DefineChromeRefreshRealboxIcons() { +@@ -168,7 +168,7 @@ static void DefineChromeRefreshRealboxIcons() { #elif BUILDFLAG(IS_WIN) kWinShareIconResourceName = - "//resources/cr_components/omnibox/icons/win_share_cr23.svg"; + "//resources/cr_components/searchbox/icons/win_share_cr23.svg"; -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) kLinuxShareIconResourceName = - "//resources/cr_components/omnibox/icons/share_cr23.svg"; + "//resources/cr_components/searchbox/icons/share_cr23.svg"; #else -@@ -835,7 +835,7 @@ std::string RealboxHandler::PedalVectorIconToResourceN +@@ -645,7 +645,7 @@ std::string SearchboxHandler::ActionVectorIconToResour icon.name == omnibox::kShareWinChromeRefreshIcon.name) { return kWinShareIconResourceName; } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_settings_accessibility__main__handler.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_settings_accessibility__main__handler.cc deleted file mode 100644 index 0ecc38b0da90..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_settings_accessibility__main__handler.cc +++ /dev/null @@ -1,46 +0,0 @@ ---- src/3rdparty/chromium/chrome/browser/ui/webui/settings/accessibility_main_handler.cc.orig 2024-02-23 21:04:38 UTC -+++ src/3rdparty/chromium/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) - -@@ -39,7 +39,7 @@ void AccessibilityMainHandler::RegisterMessages() { - base::BindRepeating( - &AccessibilityMainHandler::HandleCheckAccessibilityImageLabels, - base::Unretained(this))); --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - web_ui()->RegisterMessageCallback( - "getScreenAiInstallState", - base::BindRepeating( -@@ -56,7 +56,7 @@ void AccessibilityMainHandler::OnJavascriptAllowed() { - base::Unretained(this))); - #endif // BUILDFLAG(IS_CHROMEOS_ASH) - --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - if (features::IsPdfOcrEnabled()) { - CHECK(!component_ready_observer_.IsObserving()); - component_ready_observer_.Observe( -@@ -70,14 +70,14 @@ void AccessibilityMainHandler::OnJavascriptDisallowed( - accessibility_subscription_ = {}; - #endif // BUILDFLAG(IS_CHROMEOS_ASH) - --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - if (features::IsPdfOcrEnabled()) { - component_ready_observer_.Reset(); - } - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) - } - --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - void AccessibilityMainHandler::DownloadProgressChanged(double progress) { - CHECK_GE(progress, 0.0); - CHECK_LE(progress, 1.0); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_settings_accessibility__main__handler.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_settings_accessibility__main__handler.h deleted file mode 100644 index 5092cad265c4..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_settings_accessibility__main__handler.h +++ /dev/null @@ -1,47 +0,0 @@ ---- src/3rdparty/chromium/chrome/browser/ui/webui/settings/accessibility_main_handler.h.orig 2024-02-23 21:04:38 UTC -+++ src/3rdparty/chromium/chrome/browser/ui/webui/settings/accessibility_main_handler.h -@@ -13,7 +13,7 @@ - #include "chrome/browser/ash/accessibility/accessibility_manager.h" - #endif // BUILDFLAG(IS_CHROMEOS_ASH) - --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - #include "base/scoped_observation.h" - #include "chrome/browser/screen_ai/screen_ai_install_state.h" - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) -@@ -24,7 +24,7 @@ namespace settings { - // chrome://settings/accessibility. - class AccessibilityMainHandler - : public ::settings::SettingsPageUIHandler --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - , - public screen_ai::ScreenAIInstallState::Observer - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) -@@ -40,7 +40,7 @@ class AccessibilityMainHandler - void OnJavascriptAllowed() override; - void OnJavascriptDisallowed() override; - --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - // screen_ai::ScreenAIInstallState::Observer: - void DownloadProgressChanged(double progress) override; - void StateChanged(screen_ai::ScreenAIInstallState::State state) override; -@@ -50,7 +50,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) - -@@ -63,7 +63,7 @@ class AccessibilityMainHandler - base::CallbackListSubscription accessibility_subscription_; - #endif // BUILDFLAG(IS_CHROMEOS_ASH) - --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - base::ScopedObservation - component_ready_observer_{this}; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_settings_appearance__handler.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_settings_appearance__handler.cc index 17580c061f6b..6e717d23d4e8 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_settings_appearance__handler.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_settings_appearance__handler.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/chrome/browser/ui/webui/settings/appearance_handler.cc.orig 2022-10-24 13:33:33 UTC +--- src/3rdparty/chromium/chrome/browser/ui/webui/settings/appearance_handler.cc.orig 2024-08-26 12:06:38 UTC +++ src/3rdparty/chromium/chrome/browser/ui/webui/settings/appearance_handler.cc -@@ -28,7 +28,7 @@ void AppearanceHandler::RegisterMessages() { +@@ -34,7 +34,7 @@ void AppearanceHandler::RegisterMessages() { "useDefaultTheme", base::BindRepeating(&AppearanceHandler::HandleUseTheme, base::Unretained(this), ui::SystemTheme::kDefault)); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc index eb1f59d15da9..ff18a411565b 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc @@ -1,7 +1,7 @@ ---- src/3rdparty/chromium/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -@@ -138,7 +138,7 @@ - #include "ash/webui/settings/public/constants/routes.mojom.h" +@@ -144,7 +144,7 @@ + #include "chrome/browser/ui/chrome_pages.h" #endif -#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS) @@ -9,7 +9,7 @@ #include "ui/display/screen.h" #endif -@@ -157,7 +157,7 @@ +@@ -163,7 +163,7 @@ #include "chrome/browser/ui/webui/certificate_manager_localized_strings_provider.h" #endif @@ -18,16 +18,7 @@ #include "ui/linux/linux_ui_factory.h" #include "ui/ozone/public/ozone_platform.h" #endif -@@ -265,7 +265,7 @@ void AddCommonStrings(content::WebUIDataSource* html_s - base::FeatureList::IsEnabled( - supervised_user::kClearingCookiesKeepsSupervisedUsersSignedIn)); - --#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; -@@ -295,7 +295,7 @@ void AddA11yStrings(content::WebUIDataSource* html_sou +@@ -287,7 +287,7 @@ void AddA11yStrings(content::WebUIDataSource* html_sou {"focusHighlightLabel", IDS_SETTINGS_ACCESSIBILITY_FOCUS_HIGHLIGHT_DESCRIPTION}, #endif @@ -36,27 +27,27 @@ {"overscrollHistoryNavigationTitle", IDS_SETTINGS_OVERSCROLL_HISTORY_NAVIGATION_TITLE}, {"overscrollHistoryNavigationSubtitle", -@@ -440,7 +440,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}, +@@ -412,7 +412,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht + {"uiFeatureAlignLeft", IDS_SETTINGS_UI_FEATURE_ALIGN_LEFT}, + {"uiFeatureAlignRight", IDS_SETTINGS_UI_FEATURE_ALIGN_RIGHT}, + {"resetToDefault", IDS_SETTINGS_RESET_TO_DEFAULT}, -#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}, -@@ -450,7 +450,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht - #else - {"resetToDefaultTheme", IDS_SETTINGS_RESET_TO_DEFAULT_THEME}, +@@ -420,7 +420,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht + {"classicTheme", IDS_SETTINGS_CLASSIC_THEME}, + {"useClassicTheme", IDS_SETTINGS_USE_CLASSIC_THEME}, #endif -#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS) +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CHROMEOS_LACROS) {"showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS}, #endif #if BUILDFLAG(IS_MAC) -@@ -475,7 +475,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -448,7 +448,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // TODO(crbug.com/40118868): 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_BSD)) && !BUILDFLAG(IS_CHROMEOS_LACROS) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_signin_profile__picker__handler.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_signin_profile__picker__handler.cc new file mode 100644 index 000000000000..36e6cd423191 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_signin_profile__picker__handler.cc @@ -0,0 +1,20 @@ +--- src/3rdparty/chromium/chrome/browser/ui/webui/signin/profile_picker_handler.cc.orig 2024-10-22 08:31:56 UTC ++++ src/3rdparty/chromium/chrome/browser/ui/webui/signin/profile_picker_handler.cc +@@ -209,7 +209,7 @@ base::Value::Dict CreateProfileEntry(const ProfileAttr + + if (AccountInfo::IsManaged(entry->GetHostedDomain())) { + profile_entry.Set("avatarBadge", "cr:domain"); +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + } else if (base::FeatureList::IsEnabled( + supervised_user::kShowKiteForSupervisedUsers) && + entry->IsSupervised()) { +@@ -1224,7 +1224,7 @@ void ProfilePickerHandler::BeginFirstWebContentsProfil + } + + void ProfilePickerHandler::MaybeUpdateGuestMode() { +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + if (!base::FeatureList::IsEnabled( + supervised_user::kHideGuestModeForSupervisedUsers)) { + return; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_channel__info.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_channel__info.h index 2c5c06693e34..13e2e0244d4d 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_channel__info.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_channel__info.h @@ -1,18 +1,20 @@ ---- src/3rdparty/chromium/chrome/common/channel_info.h.orig 2023-04-28 17:01:32 UTC +--- src/3rdparty/chromium/chrome/common/channel_info.h.orig 2024-06-17 12:56:06 UTC +++ src/3rdparty/chromium/chrome/common/channel_info.h -@@ -104,13 +104,13 @@ void ClearChannelForTesting(); +@@ -12,7 +12,7 @@ + #include "build/build_config.h" + #include "build/chromeos_buildflags.h" + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + namespace base { + class Environment; + } +@@ -100,7 +100,7 @@ void ClearChannelIdForTesting(); std::string GetChannelSuffixForDataDir(); #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) std::string GetChannelSuffixForExtraFlagsEnvVarName(); - #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) // Returns the channel-specific filename of the desktop shortcut used to launch - // the browser. - std::string GetDesktopName(base::Environment* env); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_channel__info__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_channel__info__posix.cc index e0d82654c4e1..a6d7b12c8479 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_channel__info__posix.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_channel__info__posix.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/chrome/common/channel_info_posix.cc.orig 2023-04-28 17:01:32 UTC +--- src/3rdparty/chromium/chrome/common/channel_info_posix.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/chrome/common/channel_info_posix.cc -@@ -92,7 +92,7 @@ std::string GetChannelSuffixForDataDir() { +@@ -95,7 +95,7 @@ std::string GetChannelSuffixForDataDir() { } } @@ -9,9 +9,9 @@ std::string GetChannelSuffixForExtraFlagsEnvVarName() { #if BUILDFLAG(GOOGLE_CHROME_BRANDING) const auto channel_state = GetChannelImpl(); -@@ -118,7 +118,7 @@ std::string GetChannelSuffixForExtraFlagsEnvVarName() +@@ -123,7 +123,7 @@ std::string GetChannelSuffixForExtraFlagsEnvVarName() - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // TODO(crbug.com/40118868): 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) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__features.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__features.cc index bae41e5f8dd9..a6e133375fa7 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__features.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__features.cc @@ -1,23 +1,15 @@ ---- src/3rdparty/chromium/chrome/common/chrome_features.cc.orig 2024-07-03 01:14:49 UTC +--- src/3rdparty/chromium/chrome/common/chrome_features.cc.orig 2025-02-21 12:29:33 UTC +++ src/3rdparty/chromium/chrome/common/chrome_features.cc -@@ -76,14 +76,14 @@ BASE_FEATURE(kAppShimNotificationAttribution, - - // Enables the built-in DNS resolver. - #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(kAsyncDns, "AsyncDns", base::FEATURE_ENABLED_BY_DEFAULT); - #else - BASE_FEATURE(kAsyncDns, "AsyncDns", base::FEATURE_DISABLED_BY_DEFAULT); - #endif +@@ -82,7 +82,7 @@ BASE_FEATURE(kUseAdHocSigningForWebAppShims, + #endif // BUILDFLAG(IS_MAC) #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) +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Enables or disables the Autofill survey triggered by opening a prompt to // save address info. BASE_FEATURE(kAutofillAddressSurvey, -@@ -101,7 +101,7 @@ BASE_FEATURE(kAutofillPasswordSurvey, +@@ -100,7 +100,7 @@ BASE_FEATURE(kAutofillPasswordSurvey, base::FEATURE_DISABLED_BY_DEFAULT); #endif @@ -26,7 +18,7 @@ // 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. -@@ -311,7 +311,7 @@ BASE_FEATURE(kDesktopPWAsEnforceWebAppSettingsPolicy, +@@ -266,7 +266,7 @@ BASE_FEATURE(kDesktopPWAsElidedExtensionsMenu, // Enables or disables Desktop PWAs to be auto-started on OS login. #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -35,43 +27,25 @@ BASE_FEATURE(kDesktopPWAsRunOnOsLogin, "DesktopPWAsRunOnOsLogin", base::FEATURE_ENABLED_BY_DEFAULT); -@@ -354,7 +354,7 @@ BASE_FEATURE(kDesktopPWAsTabStripSettings, +@@ -302,7 +302,7 @@ BASE_FEATURE(kDesktopPWAsTabStripSettings, + "DesktopPWAsTabStripSettings", base::FEATURE_DISABLED_BY_DEFAULT); - #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) // 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. -@@ -372,7 +372,7 @@ BASE_FEATURE(kDisruptiveNotificationPermissionRevocati - - // Enable DNS over HTTPS (DoH). - #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) - BASE_FEATURE(kDnsOverHttps, "DnsOverHttps", base::FEATURE_ENABLED_BY_DEFAULT); - #else - BASE_FEATURE(kDnsOverHttps, "DnsOverHttps", base::FEATURE_DISABLED_BY_DEFAULT); -@@ -387,7 +387,7 @@ const base::FeatureParam kDnsOverHttpsShowUiPara - const base::FeatureParam 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 - #else - false -@@ -954,7 +954,7 @@ BASE_FEATURE(kLacrosSharedComponentsDir, +@@ -874,7 +874,7 @@ BASE_FEATURE(kKAnonymityServiceStorage, + "KAnonymityServiceStorage", 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); -@@ -967,7 +967,7 @@ constexpr base::FeatureParam kLinuxLowMemoryMonit +@@ -887,7 +887,7 @@ constexpr base::FeatureParam kLinuxLowMemoryMonit &kLinuxLowMemoryMonitor, "critical_level", 255}; #endif // BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__features.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__features.h index a9909ba92779..84ef3b471376 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__features.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__features.h @@ -1,11 +1,11 @@ ---- src/3rdparty/chromium/chrome/common/chrome_features.h.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/chrome/common/chrome_features.h.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/chrome/common/chrome_features.h -@@ -60,13 +60,13 @@ BASE_DECLARE_FEATURE(kAppShimNotificationAttribution); - 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) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kAutofillAddressSurvey); COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kAutofillCardSurvey); COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kAutofillPasswordSurvey); @@ -16,25 +16,25 @@ COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kBackgroundModeAllowRestart); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -226,7 +226,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) +@@ -179,7 +179,7 @@ BASE_DECLARE_FEATURE(kDesktopPWAsPreventClose); + 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) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kChromeAppsDeprecation); - #endif - -@@ -567,7 +567,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) - BASE_DECLARE_FEATURE(kLacrosSharedComponentsDir); - #endif // BUILDFLAG(IS_CHROMEOS_ASH) + COMPONENT_EXPORT(CHROME_FEATURES) + BASE_DECLARE_FEATURE(kShortcutsNotApps); +@@ -512,7 +512,7 @@ BASE_DECLARE_FEATURE(kKAnonymityServiceOHTTPRequests); + COMPONENT_EXPORT(CHROME_FEATURES) + BASE_DECLARE_FEATURE(kKAnonymityServiceStorage); -#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 kLinuxLowMemoryMonitorModerateLevel; -@@ -575,7 +575,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) +@@ -520,7 +520,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) extern const base::FeatureParam kLinuxLowMemoryMonitorCriticalLevel; #endif // BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__paths.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__paths.cc index 149d9f6d5f84..6567eded1593 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__paths.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__paths.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/chrome/common/chrome_paths.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/chrome/common/chrome_paths.cc.orig 2024-06-17 12:56:06 UTC +++ src/3rdparty/chromium/chrome/common/chrome_paths.cc @@ -30,7 +30,7 @@ #include "base/apple/foundation_util.h" @@ -36,7 +36,7 @@ if (!GetUserDownloadsDirectorySafe(&cur)) { return false; } -@@ -539,7 +539,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -541,7 +541,7 @@ bool PathProvider(int key, base::FilePath* result) { return false; } break; @@ -45,7 +45,7 @@ case chrome::DIR_POLICY_FILES: { cur = base::FilePath(policy::kPolicyPath); break; -@@ -550,7 +550,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -552,7 +552,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 +54,7 @@ case chrome::DIR_USER_EXTERNAL_EXTENSIONS: { if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur)) { return false; -@@ -559,7 +559,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -561,7 +561,7 @@ bool PathProvider(int key, base::FilePath* result) { break; } #endif @@ -63,8 +63,8 @@ case chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS: { cur = base::FilePath(kFilepathSinglePrefExtensions); break; -@@ -607,7 +607,7 @@ bool PathProvider(int key, base::FilePath* result) { - #endif +@@ -599,7 +599,7 @@ bool PathProvider(int key, base::FilePath* result) { + break; #if BUILDFLAG(ENABLE_EXTENSIONS) && \ - (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)) @@ -72,7 +72,7 @@ case chrome::DIR_NATIVE_MESSAGING: #if BUILDFLAG(IS_MAC) #if BUILDFLAG(GOOGLE_CHROME_BRANDING) -@@ -621,6 +621,9 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -613,6 +613,9 @@ 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/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__switches.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__switches.cc index d95559d81be5..d438657b7ea2 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__switches.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__switches.cc @@ -1,11 +1,11 @@ ---- src/3rdparty/chromium/chrome/common/chrome_switches.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/chrome/common/chrome_switches.cc.orig 2024-09-30 07:45:04 UTC +++ src/3rdparty/chromium/chrome/common/chrome_switches.cc -@@ -865,14 +865,14 @@ const char kAllowNaClSocketAPI[] = "allow-nacl-socket- +@@ -886,14 +886,14 @@ const char kAllowNaClSocketAPI[] = "allow-nacl-socket- #endif #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) +- BUILDFLAG(IS_WIN) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) const char kEnableNewAppMenuIcon[] = "enable-new-app-menu-icon"; // Causes the browser to launch directly in guest mode. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__switches.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__switches.h index a7b5ecc41c53..7e17048e9752 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__switches.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__switches.h @@ -1,11 +1,11 @@ ---- src/3rdparty/chromium/chrome/common/chrome_switches.h.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/chrome/common/chrome_switches.h.orig 2024-09-30 07:45:04 UTC +++ src/3rdparty/chromium/chrome/common/chrome_switches.h -@@ -274,12 +274,12 @@ extern const char kAllowNaClSocketAPI[]; +@@ -275,12 +275,12 @@ extern const char kAllowNaClSocketAPI[]; #endif #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) +- BUILDFLAG(IS_WIN) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) extern const char kEnableNewAppMenuIcon[]; extern const char kGuest[]; #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_crash__keys.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_crash__keys.cc new file mode 100644 index 000000000000..83c56c2c5483 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_crash__keys.cc @@ -0,0 +1,28 @@ +--- src/3rdparty/chromium/chrome/common/crash_keys.cc.orig 2024-09-30 07:45:04 UTC ++++ src/3rdparty/chromium/chrome/common/crash_keys.cc +@@ -56,7 +56,9 @@ class CrashKeyWithName { + ~CrashKeyWithName() = delete; + + std::string_view Name() const { return name_; } ++#if BUILDFLAG(USE_CRASHPAD_ANNOTATION) + std::string_view Value() const { return crash_key_.value(); } ++#endif + void Clear() { crash_key_.Clear(); } + void Set(std::string_view value) { crash_key_.Set(value); } + +@@ -201,6 +203,7 @@ void AllocateCrashKeyInBrowserAndChildren(std::string_ + GetCommandLineStringAnnotations().emplace_back(std::string(key)).Set(value); + } + ++#if BUILDFLAG(USE_CRASHPAD_ANNOTATION) + void AppendStringAnnotationsCommandLineSwitch(base::CommandLine* command_line) { + std::string string_annotations; + for (const auto& crash_key : GetCommandLineStringAnnotations()) { +@@ -212,6 +215,7 @@ void AppendStringAnnotationsCommandLineSwitch(base::Co + } + command_line->AppendSwitchASCII(kStringAnnotationsSwitch, string_annotations); + } ++#endif + + void SetCrashKeysFromCommandLine(const base::CommandLine& command_line) { + SetStringAnnotations(command_line); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_extensions_permissions_chrome__permission__message__rules.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_extensions_permissions_chrome__permission__message__rules.cc index 1175f7751430..f3017668a0a4 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_extensions_permissions_chrome__permission__message__rules.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_extensions_permissions_chrome__permission__message__rules.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/chrome/common/extensions/permissions/chrome_permission_message_rules.cc.orig 2024-07-03 01:14:49 UTC +--- src/3rdparty/chromium/chrome/common/extensions/permissions/chrome_permission_message_rules.cc.orig 2025-02-21 12:29:33 UTC +++ src/3rdparty/chromium/chrome/common/extensions/permissions/chrome_permission_message_rules.cc @@ -287,7 +287,7 @@ int GetEnterpriseReportingPrivatePermissionMessageId() #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_media_cdm__registration.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_media_cdm__registration.cc index 6275e8892243..a9b6106b490e 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_media_cdm__registration.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_media_cdm__registration.cc @@ -1,21 +1,16 @@ ---- src/3rdparty/chromium/chrome/common/media/cdm_registration.cc.orig 2023-12-10 06:10:27 UTC +--- src/3rdparty/chromium/chrome/common/media/cdm_registration.cc.orig 2024-07-30 11:12:21 UTC +++ src/3rdparty/chromium/chrome/common/media/cdm_registration.cc -@@ -26,11 +26,11 @@ - +@@ -33,7 +33,7 @@ #if BUILDFLAG(ENABLE_WIDEVINE) + #include "components/cdm/common/cdm_manifest.h" #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 "base/native_library.h" + #include "chrome/common/chrome_paths.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) +@@ -86,7 +86,7 @@ void ReportLacrosUMA(LacrosBundledWidevine value) { + #if (BUILDFLAG(BUNDLE_WIDEVINE_CDM) || \ BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT)) && \ - (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) @@ -23,25 +18,25 @@ // Create a CdmInfo for a Widevine CDM, using |version|, |cdm_library_path|, and // |capability|. std::unique_ptr CreateWidevineCdmInfo( -@@ -101,7 +101,7 @@ std::unique_ptr CreateCdmInfoFromWid +@@ -131,7 +131,7 @@ std::unique_ptr 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)) + // sandbox. On Windows and Mac, CDM registration is handled by Component + // Update (as the CDM can be loaded only when needed). +@@ -185,7 +185,7 @@ std::unique_ptr GetAshBundledWidevin + #endif // BUILDFLAG(IS_CHROMEOS_LACROS) - #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* cd + } + + #if BUILDFLAG(ENABLE_WIDEVINE) && \ +- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) ++ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)) + std::vector GetSoftwareSecureWidevine() { + std::vector cdms; + AddSoftwareSecureWidevine(&cdms); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_media_cdm__registration.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_media_cdm__registration.h new file mode 100644 index 000000000000..7875329b6133 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_media_cdm__registration.h @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/chrome/common/media/cdm_registration.h.orig 2024-07-30 11:12:21 UTC ++++ src/3rdparty/chromium/chrome/common/media/cdm_registration.h +@@ -16,7 +16,7 @@ + void RegisterCdmInfo(std::vector* cdms); + + #if BUILDFLAG(ENABLE_WIDEVINE) && \ +- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) ++ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)) + // Returns the software secure Widevine CDM, if one exists. + std::vector GetSoftwareSecureWidevine(); + #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_media_component__widevine__cdm__hint__file__linux.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_media_component__widevine__cdm__hint__file__linux.h index c5be9ae3d7d6..ecbb3e4ee1c5 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_media_component__widevine__cdm__hint__file__linux.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_media_component__widevine__cdm__hint__file__linux.h @@ -1,8 +1,8 @@ ---- src/3rdparty/chromium/chrome/common/media/component_widevine_cdm_hint_file_linux.h.orig 2023-10-11 18:22:24 UTC +--- src/3rdparty/chromium/chrome/common/media/component_widevine_cdm_hint_file_linux.h.orig 2024-06-17 12:56:06 UTC +++ src/3rdparty/chromium/chrome/common/media/component_widevine_cdm_hint_file_linux.h -@@ -15,7 +15,7 @@ +@@ -17,7 +17,7 @@ - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // TODO(crbug.com/40118868): 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)) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_pref__names.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_pref__names.h index 802ced7357f5..d7e2fbba4bea 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_pref__names.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_pref__names.h @@ -1,15 +1,15 @@ ---- src/3rdparty/chromium/chrome/common/pref_names.h.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/chrome/common/pref_names.h.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/chrome/common/pref_names.h -@@ -1323,7 +1323,7 @@ inline constexpr char kUseAshProxy[] = "lacros.proxy.u +@@ -1379,7 +1379,7 @@ inline constexpr char kUseAshProxy[] = "lacros.proxy.u - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // TODO(crbug.com/40118868): 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 kSystemTheme[] = "extensions.theme.system_theme"; #endif -@@ -1449,7 +1449,7 @@ inline constexpr char kShowUpdatePromotionInfoBar[] = +@@ -1552,7 +1552,7 @@ inline constexpr char kShowUpdatePromotionInfoBar[] = "browser.show_update_promotion_info_bar"; #endif @@ -18,7 +18,7 @@ // 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"; -@@ -2001,7 +2001,7 @@ inline constexpr char kDownloadDefaultDirectory[] = +@@ -2159,7 +2159,7 @@ inline constexpr char kDownloadDefaultDirectory[] = inline constexpr char kDownloadDirUpgraded[] = "download.directory_upgrade"; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -27,7 +27,7 @@ inline constexpr char kOpenPdfDownloadInSystemReader[] = "download.open_pdf_in_system_reader"; #endif -@@ -2439,14 +2439,14 @@ inline constexpr char kMediaStorageIdSalt[] = "media.s +@@ -2602,14 +2602,14 @@ inline constexpr char kMediaStorageIdSalt[] = "media.s inline constexpr char kMediaCdmOriginData[] = "media.cdm.origin_data"; #endif // BUILDFLAG(IS_WIN) @@ -44,7 +44,7 @@ // Records whether the user has seen an HTTP auth "negotiate" header. inline constexpr char kReceivedHttpAuthNegotiateHeader[] = "net.received_http_auth_negotiate_headers"; -@@ -2524,7 +2524,7 @@ inline constexpr char kAmbientAuthenticationInPrivateM +@@ -2687,7 +2687,7 @@ inline constexpr char kAmbientAuthenticationInPrivateM inline constexpr char kBasicAuthOverHttpEnabled[] = "auth.basic_over_http_enabled"; @@ -53,7 +53,16 @@ // Boolean that specifies whether OK-AS-DELEGATE flag from KDC is respected // along with kAuthNegotiateDelegateAllowlist. inline constexpr char kAuthNegotiateDelegateByKdcPolicy[] = -@@ -3575,7 +3575,7 @@ inline constexpr char kFileOrDirectoryPickerWithoutGes +@@ -3228,7 +3228,7 @@ inline constexpr char kDeviceWeeklyScheduledSuspend[] + #endif // BUILDFLAG(IS_CHROMEOS) + + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ +- BUILDFLAG(IS_ANDROID) ++ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) + // Defines administrator-set availability of Chrome for Testing. + inline constexpr char kChromeForTestingAllowed[] = "chrome_for_testing.allowed"; + #endif +@@ -3824,7 +3824,7 @@ inline constexpr char kFileOrDirectoryPickerWithoutGes inline constexpr char kSandboxExternalProtocolBlocked[] = "profile.sandbox_external_protocol_blocked"; @@ -62,18 +71,18 @@ // Boolean that indicates if system notifications are allowed to be used in // place of Chrome notifications. inline constexpr char kAllowSystemNotifications[] = -@@ -3624,7 +3624,7 @@ inline constexpr char kCACertificateManagementAllowed[ +@@ -4094,7 +4094,7 @@ inline constexpr char kLensDesktopNTPSearchEnabled[] = + "policy.lens_desktop_ntp_search_enabled"; #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"; +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + // A dict mapping the edition name with the major version it was shown. + inline constexpr char kWhatsNewEditionUsed[] = "browser.whats_new.edition_used"; + // A list containing the features of each module in order of when they +@@ -4188,7 +4188,7 @@ inline constexpr char kPrintingOAuth2AuthorizationServ + "printing.oauth2_authorization_servers"; #endif -@@ -3938,7 +3938,7 @@ inline constexpr char kThrottleNonVisibleCrossOriginIf - inline constexpr char kNewBaseUrlInheritanceBehaviorAllowed[] = - "new_base_url_inheritance_behavior_allowed"; -#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_url__constants.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_url__constants.h index 67f7f933a38f..a460a23a4f85 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_url__constants.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_url__constants.h @@ -1,11 +1,11 @@ ---- src/3rdparty/chromium/chrome/common/url_constants.h.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/chrome/common/url_constants.h.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/chrome/common/url_constants.h -@@ -822,7 +822,7 @@ inline constexpr char kPhoneHubPermissionLearnMoreURL[ +@@ -929,7 +929,7 @@ inline constexpr char kOutdatedPluginLearnMoreURL[] = + inline constexpr char kPhoneHubPermissionLearnMoreURL[] = "https://support.google.com/chromebook?p=multidevice"; - #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) // "Learn more" URL for the chrome apps deprecation dialog. inline constexpr char kChromeAppsDeprecationLearnMoreURL[] = "https://support.google.com/chrome?p=chrome_app_deprecation"; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_webui__url__constants.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_webui__url__constants.cc index 5904de8051e2..6caf2edb74e6 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_webui__url__constants.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_webui__url__constants.cc @@ -1,68 +1,37 @@ ---- src/3rdparty/chromium/chrome/common/webui_url_constants.cc.orig 2024-07-03 01:14:49 UTC +--- src/3rdparty/chromium/chrome/common/webui_url_constants.cc.orig 2025-02-21 12:29:33 UTC +++ src/3rdparty/chromium/chrome/common/webui_url_constants.cc -@@ -511,18 +511,18 @@ const char kOsUIVersionURL[] = "os://version"; - const char kOsUIVersionURL[] = "os://version"; +@@ -212,21 +212,21 @@ base::span ChromeURLHosts() + kChromeUIAssistantOptInHost, #endif - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - const char kChromeUIWebUIJsErrorHost[] = "webuijserror"; - const char kChromeUIWebUIJsErrorURL[] = "chrome://webuijserror/"; - #endif - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS_ASH) + BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) - const char kChromeUIConnectorsInternalsHost[] = "connectors-internals"; + kChromeUIConnectorsInternalsHost, #endif - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - const char kChromeUIDiscardsHost[] = "discards"; - const char kChromeUIDiscardsURL[] = "chrome://discards/"; + kChromeUIDiscardsHost, + #endif +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + kChromeUIWebAppSettingsHost, #endif -@@ -537,14 +537,14 @@ const char kChromeUILinuxProxyConfigHost[] = "linux-pr + #if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_ANDROID) + kChromeUILinuxProxyConfigHost, #endif - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ - BUILDFLAG(IS_ANDROID) + BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) - const char kChromeUISandboxHost[] = "sandbox"; - #endif - - // 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) || \ -- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD) - const char kChromeUIBrowserSwitchHost[] = "browser-switch"; - const char kChromeUIBrowserSwitchURL[] = "chrome://browser-switch/"; - const char kChromeUIIntroHost[] = "intro"; -@@ -563,7 +563,7 @@ const char kChromeUIProfilePickerStartupQuery[] = "sta - const char kChromeUIProfilePickerStartupQuery[] = "startup"; - #endif - --#if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \ -+#if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && \ - defined(TOOLKIT_VIEWS)) || \ - defined(USE_AURA) - const char kChromeUITabModalConfirmDialogHost[] = "tab-modal-confirm-dialog"; -@@ -647,7 +647,7 @@ const char kCookiesSubPagePath[] = "/cookies"; - #endif - - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - const char kChromeUIWebAppSettingsURL[] = "chrome://app-settings/"; - const char kChromeUIWebAppSettingsHost[] = "app-settings"; + kChromeUISandboxHost, #endif -@@ -895,7 +895,7 @@ const char* const kChromeDebugURLs[] = { - blink::kChromeUIGpuJavaCrashURL, - kChromeUIJavaCrashURL, + #if BUILDFLAG(IS_WIN) +@@ -305,7 +305,7 @@ base::span ChromeDebugURLs() + blink::kChromeUIGpuJavaCrashURL, + kChromeUIJavaCrashURL, #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - kChromeUIWebUIJsErrorURL, + kChromeUIWebUIJsErrorURL, #endif - kChromeUIQuitURL, + kChromeUIQuitURL, diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_webui__url__constants.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_webui__url__constants.h index d618db9598da..9f430df4c710 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_webui__url__constants.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_webui__url__constants.h @@ -1,57 +1,56 @@ ---- src/3rdparty/chromium/chrome/common/webui_url_constants.h.orig 2024-07-03 01:14:49 UTC +--- src/3rdparty/chromium/chrome/common/webui_url_constants.h.orig 2025-02-21 12:29:33 UTC +++ src/3rdparty/chromium/chrome/common/webui_url_constants.h -@@ -430,24 +430,24 @@ extern const char kOsUIVersionURL[]; - extern const char kOsUIVersionURL[]; +@@ -584,24 +584,24 @@ inline constexpr char kOsUIVersionURL[] = "os://versio + inline constexpr char kOsUIVersionURL[] = "os://version"; #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - extern const char kChromeUIWebUIJsErrorHost[]; - extern const char kChromeUIWebUIJsErrorURL[]; + inline constexpr char kChromeUIWebUIJsErrorHost[] = "webuijserror"; + inline constexpr char kChromeUIWebUIJsErrorURL[] = "chrome://webuijserror/"; #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS_ASH) + BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) - extern const char kChromeUIConnectorsInternalsHost[]; + inline constexpr char kChromeUIConnectorsInternalsHost[] = + "connectors-internals"; #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) - extern const char kChromeUIDiscardsHost[]; - extern const char kChromeUIDiscardsURL[]; +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + inline constexpr char kChromeUIDiscardsHost[] = "discards"; + inline constexpr char kChromeUIDiscardsURL[] = "chrome://discards/"; #endif - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - extern const char kChromeUIWebAppSettingsURL[]; - extern const char kChromeUIWebAppSettingsHost[]; - #endif -@@ -462,14 +462,14 @@ extern const char kChromeUILinuxProxyConfigHost[]; +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + inline constexpr char kChromeUIWebAppSettingsHost[] = "app-settings"; + inline constexpr char kChromeUIWebAppSettingsURL[] = "chrome://app-settings/"; + inline constexpr char kChromeUIWhatsNewHost[] = "whats-new"; +@@ -613,13 +613,13 @@ inline constexpr char kChromeUILinuxProxyConfigHost[] #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ - BUILDFLAG(IS_ANDROID) + BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) - extern const char kChromeUISandboxHost[]; + inline constexpr char kChromeUISandboxHost[] = "sandbox"; #endif - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA) || \ -- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD) - extern const char kChromeUIBrowserSwitchHost[]; - extern const char kChromeUIBrowserSwitchURL[]; - extern const char kChromeUIIntroHost[]; -@@ -485,7 +485,7 @@ extern const char kChromeUIProfilePickerStartupQuery[] - extern const char kChromeUIProfilePickerStartupQuery[]; +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \ + (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) + inline constexpr char kChromeUIBrowserSwitchHost[] = "browser-switch"; + inline constexpr char kChromeUIBrowserSwitchURL[] = "chrome://browser-switch/"; +@@ -641,7 +641,7 @@ inline constexpr char kChromeUIProfilePickerUrl[] = "c + inline constexpr char kChromeUIProfilePickerUrl[] = "chrome://profile-picker/"; #endif -#if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \ +#if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && \ defined(TOOLKIT_VIEWS)) || \ defined(USE_AURA) - extern const char kChromeUITabModalConfirmDialogHost[]; + inline constexpr char kChromeUITabModalConfirmDialogHost[] = diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_renderer_chrome__render__frame__observer.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_renderer_chrome__render__frame__observer.cc deleted file mode 100644 index 81e5f33cbbed..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_renderer_chrome__render__frame__observer.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/chrome/renderer/chrome_render_frame_observer.cc.orig 2024-01-30 07:53:34 UTC -+++ src/3rdparty/chromium/chrome/renderer/chrome_render_frame_observer.cc -@@ -353,7 +353,7 @@ void ChromeRenderFrameObserver::WillDetach(blink::Deta - - void ChromeRenderFrameObserver::DraggableRegionsChanged() { - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - // Only the main frame is allowed to control draggable regions, to avoid other - // frames manipulate the regions in the browser process. - if (!render_frame()->IsMainFrame()) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_test_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_test_BUILD.gn deleted file mode 100644 index 2f7bbf9263f6..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_test_BUILD.gn +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/chrome/test/BUILD.gn.orig 2024-07-03 01:14:49 UTC -+++ src/3rdparty/chromium/chrome/test/BUILD.gn -@@ -11652,7 +11652,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/qt6-webengine/files/patch-src_3rdparty_chromium_components_autofill_core_browser_autofill__optimization__guide.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_autofill_core_browser_autofill__optimization__guide.cc new file mode 100644 index 000000000000..ee3e47fbb44b --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_autofill_core_browser_autofill__optimization__guide.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/components/autofill/core/browser/autofill_optimization_guide.cc.orig 2024-09-30 07:45:04 UTC ++++ src/3rdparty/chromium/components/autofill/core/browser/autofill_optimization_guide.cc +@@ -186,7 +186,7 @@ void AutofillOptimizationGuide::OnDidParseForm( + } + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + if (has_credit_card_field && + !personal_data_manager->payments_data_manager() + .GetServerCreditCards() diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_autofill_core_browser_payments__data__manager.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_autofill_core_browser_payments__data__manager.cc new file mode 100644 index 000000000000..022972f405a5 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_autofill_core_browser_payments__data__manager.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/components/autofill/core/browser/payments_data_manager.cc.orig 2024-10-22 08:31:56 UTC ++++ src/3rdparty/chromium/components/autofill/core/browser/payments_data_manager.cc +@@ -1054,7 +1054,7 @@ bool PaymentsDataManager::ShouldShowCardsFromAccountOp + // The feature is only for Linux, Windows, Mac, and Fuchsia. + // TODO(crbug.com/40118868): 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) || \ + BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_FUCHSIA) + // This option should only be shown for users that have not enabled the Sync + // Feature and that have server credit cards available. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_autofill_core_browser_personal__data__manager.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_autofill_core_browser_personal__data__manager.cc deleted file mode 100644 index 2f38a56af0ec..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_autofill_core_browser_personal__data__manager.cc +++ /dev/null @@ -1,12 +0,0 @@ ---- src/3rdparty/chromium/components/autofill/core/browser/personal_data_manager.cc.orig 2024-02-23 21:04:38 UTC -+++ src/3rdparty/chromium/components/autofill/core/browser/personal_data_manager.cc -@@ -2409,7 +2409,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) || \ -- BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_FUCHSIA) || \ -+ 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. - // TODO(crbug.com/1462552): Simplify once ConsentLevel::kSync and diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_autofill_core_common_autofill__payments__features.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_autofill_core_common_autofill__payments__features.cc index a79b6bbd561a..9cd1bbfd0832 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_autofill_core_common_autofill__payments__features.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_autofill_core_common_autofill__payments__features.cc @@ -1,8 +1,17 @@ ---- src/3rdparty/chromium/components/autofill/core/common/autofill_payments_features.cc.orig 2024-07-03 01:14:49 UTC +--- src/3rdparty/chromium/components/autofill/core/common/autofill_payments_features.cc.orig 2025-02-21 12:29:33 UTC +++ src/3rdparty/chromium/components/autofill/core/common/autofill_payments_features.cc -@@ -289,7 +289,7 @@ bool ShouldShowImprovedUserConsentForCreditCardSave() +@@ -8,7 +8,7 @@ namespace autofill::features { + + namespace autofill::features { + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \ + (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) + // When enabled, Chrome will extract the checkout amount from the checkout page + // of the allowlisted merchant websites. +@@ -330,7 +330,7 @@ bool ShouldShowImprovedUserConsentForCreditCardSave() bool ShouldShowImprovedUserConsentForCreditCardSave() { - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || \ +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD) || \ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_autofill_core_common_autofill__payments__features.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_autofill_core_common_autofill__payments__features.h new file mode 100644 index 000000000000..ab38da1dbce6 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_autofill_core_common_autofill__payments__features.h @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/components/autofill/core/common/autofill_payments_features.h.orig 2024-08-26 12:06:38 UTC ++++ src/3rdparty/chromium/components/autofill/core/common/autofill_payments_features.h +@@ -14,7 +14,7 @@ namespace autofill::features { + + // All features in alphabetical order. + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + COMPONENT_EXPORT(AUTOFILL) + BASE_DECLARE_FEATURE(kAutofillEnableAmountExtractionDesktop); + #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_autofill_core_common_autofill__prefs.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_autofill_core_common_autofill__prefs.cc new file mode 100644 index 000000000000..84574c561362 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_autofill_core_common_autofill__prefs.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/components/autofill/core/common/autofill_prefs.cc.orig 2024-10-22 08:31:56 UTC ++++ src/3rdparty/chromium/components/autofill/core/common/autofill_prefs.cc +@@ -118,7 +118,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync + #endif + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + registry->RegisterBooleanPref(prefs::kAutofillPredictionImprovementsEnabled, + false); + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_autofill_core_common_autofill__prefs.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_autofill_core_common_autofill__prefs.h new file mode 100644 index 000000000000..6fe5e319ce69 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_autofill_core_common_autofill__prefs.h @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/components/autofill/core/common/autofill_prefs.h.orig 2024-10-22 08:31:56 UTC ++++ src/3rdparty/chromium/components/autofill/core/common/autofill_prefs.h +@@ -73,7 +73,7 @@ inline constexpr char kAutofillPaymentCvcStorage[] = + inline constexpr char kAutofillPaymentCardBenefits[] = + "autofill.payment_card_benefits"; + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + // Boolean that controls improved autofill filling predictions. When enabled, + // the autofill functionality is enhanced with adopting user data to + // the form being filled in, which is triggered by the user via an extra diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_autofill_core_common_autofill__util.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_autofill_core_common_autofill__util.cc deleted file mode 100644 index ec562b672824..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_autofill_core_common_autofill__util.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/components/autofill/core/common/autofill_util.cc.orig 2024-02-23 21:04:38 UTC -+++ src/3rdparty/chromium/components/autofill/core/common/autofill_util.cc -@@ -130,7 +130,7 @@ bool SanitizedFieldIsEmpty(const std::u16string& value - - bool ShouldAutoselectFirstSuggestionOnArrowDown() { - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - return true; - #else - return false; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_commerce_core_commerce__feature__list.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_commerce_core_commerce__feature__list.cc index 69012a421e4d..c1eb7f78b63c 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_commerce_core_commerce__feature__list.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_commerce_core_commerce__feature__list.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/components/commerce/core/commerce_feature_list.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/components/commerce/core/commerce_feature_list.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/components/commerce/core/commerce_feature_list.cc -@@ -167,7 +167,7 @@ BASE_FEATURE(kPriceInsights, +@@ -168,7 +168,7 @@ BASE_FEATURE(kPriceInsights, "PriceInsights", base::FEATURE_DISABLED_BY_DEFAULT); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,16 @@ BASE_FEATURE(kPriceInsightsRegionLaunched, "PriceInsightsRegionLaunched", base::FEATURE_ENABLED_BY_DEFAULT); -@@ -240,7 +240,7 @@ BASE_FEATURE(kShoppingCollection, +@@ -246,7 +246,7 @@ const base::FeatureParam kDiscountOnShoppyPage{ + &kEnableDiscountInfoApi, kDiscountOnShoppyPageParam, false}; + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + BASE_FEATURE(kEnableDiscountInfoApiRegionLaunched, + "EnableDiscountInfoApiRegionLaunched", + base::FEATURE_ENABLED_BY_DEFAULT); +@@ -281,7 +281,7 @@ const base::FeatureParam kDeleteAllMerchantsOnCl BASE_FEATURE(kShoppingList, "ShoppingList", base::FEATURE_DISABLED_BY_DEFAULT); #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_constrained__window_constrained__window__views.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_constrained__window_constrained__window__views.cc new file mode 100644 index 000000000000..940819c6d055 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_constrained__window_constrained__window__views.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/components/constrained_window/constrained_window_views.cc.orig 2024-10-22 08:31:56 UTC ++++ src/3rdparty/chromium/components/constrained_window/constrained_window_views.cc +@@ -372,7 +372,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/qt6-webengine/files/patch-src_3rdparty_chromium_components_crash_core_app_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_crash_core_app_BUILD.gn index 2c7831ca85a6..18256b1dc1ad 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_crash_core_app_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_crash_core_app_BUILD.gn @@ -1,15 +1,6 @@ ---- src/3rdparty/chromium/components/crash/core/app/BUILD.gn.orig 2023-12-10 06:10:27 UTC +--- src/3rdparty/chromium/components/crash/core/app/BUILD.gn.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/components/crash/core/app/BUILD.gn -@@ -76,7 +76,7 @@ static_library("app") { - "crashpad.h", - ] - -- if (is_linux || is_chromeos) { -+ if ((is_linux || is_chromeos) && !is_bsd) { - sources += [ "crashpad_linux.cc" ] - } - -@@ -89,6 +89,10 @@ static_library("app") { +@@ -70,6 +70,10 @@ static_library("app") { ] } @@ -20,7 +11,16 @@ defines = [ "CRASH_IMPLEMENTATION" ] public_deps = [ ":lib" ] -@@ -117,7 +121,7 @@ static_library("app") { +@@ -83,7 +87,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" ] + } +@@ -103,7 +107,7 @@ static_library("app") { libs = [ "log" ] } @@ -29,7 +29,7 @@ deps += [ "//base:base_static", "//components/crash/core/common", -@@ -245,11 +249,6 @@ if (is_mac || is_android || is_linux || is_chromeos) { +@@ -233,11 +237,6 @@ if (is_mac || is_android || is_linux || is_chromeos) { # define custom UserStreamDataSources. executable("chrome_crashpad_handler") { sources = [ "chrome_crashpad_handler.cc" ] @@ -39,5 +39,5 @@ - "//third_party/crashpad/crashpad/handler", - ] - if (is_mac && (is_component_build || is_asan)) { + if (is_mac && (is_component_build || is_asan || is_ubsan_any)) { ldflags = [ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_device__signals_core_browser_user__permission__service__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_device__signals_core_browser_user__permission__service__impl.cc index 64bcd72f3ed5..2bd79f4c1c25 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_device__signals_core_browser_user__permission__service__impl.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_device__signals_core_browser_user__permission__service__impl.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/components/device_signals/core/browser/user_permission_service_impl.cc.orig 2023-10-11 18:22:24 UTC +--- src/3rdparty/chromium/components/device_signals/core/browser/user_permission_service_impl.cc.orig 2024-07-30 11:12:21 UTC +++ src/3rdparty/chromium/components/device_signals/core/browser/user_permission_service_impl.cc -@@ -92,7 +92,7 @@ bool UserPermissionServiceImpl::ShouldCollectConsent() +@@ -87,7 +87,7 @@ bool UserPermissionServiceImpl::ShouldCollectConsent() consent_required_by_dependent_policy; } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_device__signals_core_browser_user__permission__service__impl.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_device__signals_core_browser_user__permission__service__impl.h index d13ac5ce39bc..c92c830a39cf 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_device__signals_core_browser_user__permission__service__impl.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_device__signals_core_browser_user__permission__service__impl.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/components/device_signals/core/browser/user_permission_service_impl.h.orig 2023-07-16 15:47:57 UTC +--- src/3rdparty/chromium/components/device_signals/core/browser/user_permission_service_impl.h.orig 2024-07-30 11:12:21 UTC +++ src/3rdparty/chromium/components/device_signals/core/browser/user_permission_service_impl.h -@@ -39,7 +39,7 @@ class UserPermissionServiceImpl : public UserPermissio +@@ -38,7 +38,7 @@ class UserPermissionServiceImpl : public UserPermissio // UserPermissionService: bool ShouldCollectConsent() const override; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_discardable__memory_service_discardable__shared__memory__manager.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_discardable__memory_service_discardable__shared__memory__manager.cc index 6811eee84075..11ea03876dae 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_discardable__memory_service_discardable__shared__memory__manager.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_discardable__memory_service_discardable__shared__memory__manager.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/components/discardable_memory/service/discardable_shared_memory_manager.cc.orig 2023-12-10 06:10:27 UTC +--- src/3rdparty/chromium/components/discardable_memory/service/discardable_shared_memory_manager.cc.orig 2024-09-30 07:45:04 UTC +++ src/3rdparty/chromium/components/discardable_memory/service/discardable_shared_memory_manager.cc @@ -172,7 +172,7 @@ uint64_t GetDefaultMemoryLimit() { // Limits the number of FDs used to 32, assuming a 4MB allocation size. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_enterprise_watermarking_watermark.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_enterprise_watermarking_watermark.cc new file mode 100644 index 000000000000..b970439996cc --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_enterprise_watermarking_watermark.cc @@ -0,0 +1,20 @@ +--- src/3rdparty/chromium/components/enterprise/watermarking/watermark.cc.orig 2024-10-22 08:31:56 UTC ++++ src/3rdparty/chromium/components/enterprise/watermarking/watermark.cc +@@ -34,7 +34,7 @@ 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 @@ 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/qt6-webengine/files/patch-src_3rdparty_chromium_components_eye__dropper_eye__dropper__view.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_eye__dropper_eye__dropper__view.cc new file mode 100644 index 000000000000..ea603f929c8c --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_eye__dropper_eye__dropper__view.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/components/eye_dropper/eye_dropper_view.cc.orig 2024-09-30 07:45:04 UTC ++++ src/3rdparty/chromium/components/eye_dropper/eye_dropper_view.cc +@@ -203,7 +203,7 @@ EyeDropperView::EyeDropperView(gfx::NativeView parent, + // EyeDropper/WidgetDelegate. + set_owned_by_client(); + SetPreferredSize(GetSize()); +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Use TYPE_MENU for Linux to ensure that the eye dropper view is displayed + // above the color picker. + views::Widget::InitParams params( diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_feature__engagement_public_feature__configurations.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_feature__engagement_public_feature__configurations.cc index 25bc2e504c09..17792f8bf29b 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_feature__engagement_public_feature__configurations.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_feature__engagement_public_feature__configurations.cc @@ -1,24 +1,24 @@ ---- src/3rdparty/chromium/components/feature_engagement/public/feature_configurations.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/components/feature_engagement/public/feature_configurations.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/components/feature_engagement/public/feature_configurations.cc -@@ -48,7 +48,7 @@ FeatureConfig CreateAlwaysTriggerConfig(const base::Fe +@@ -95,7 +95,7 @@ std::optional CreateNewUserGestureInPro - absl::optional GetClientSideFeatureConfig( + std::optional 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 -@@ -67,7 +67,7 @@ absl::optional GetClientSideFeatureConf +@@ -114,7 +114,7 @@ std::optional 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 config = FeatureConfig(); + if (kIPHPasswordsManagementBubbleAfterSaveFeature.name == feature->name) { + std::optional config = FeatureConfig(); config->valid = true; -@@ -1530,7 +1530,8 @@ absl::optional GetClientSideFeatureConf +@@ -1641,7 +1641,8 @@ std::optional GetClientSideFeatureConfi #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -26,5 +26,5 @@ + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \ + BUILDFLAG(IS_BSD) - if (kIPHAutofillExternalAccountProfileSuggestionFeature.name == - feature->name) { + if (kIPHAutofillCreditCardBenefitFeature.name == feature->name) { + // Credit card benefit IPH is shown: diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_feature__engagement_public_feature__constants.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_feature__engagement_public_feature__constants.cc index 2f530474bd2f..97e187feeb43 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_feature__engagement_public_feature__constants.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_feature__engagement_public_feature__constants.cc @@ -1,29 +1,30 @@ ---- src/3rdparty/chromium/components/feature_engagement/public/feature_constants.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/components/feature_engagement/public/feature_constants.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/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(kIPHBatterySaverModeFeature, - "IPH_BatterySaverMode", - base::FEATURE_ENABLED_BY_DEFAULT); -@@ -610,7 +610,7 @@ constexpr base::FeatureParam kDefaultBrowserEligi - /*default_value=*/365}; + #if BUILDFLAG(GOOGLE_CHROME_BRANDING) + BASE_FEATURE(kEsbDownloadRowPromoFeature, + "EsbDownloadRowPromo", +@@ -639,7 +639,8 @@ BASE_FEATURE(kDefaultBrowserTriggerCriteriaExperiment, #endif // BUILDFLAG(IS_IOS) --#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_FEATURE(kIPHAutofillExternalAccountProfileSuggestionFeature, - "IPH_AutofillExternalAccountProfileSuggestion", -@@ -736,7 +736,7 @@ BASE_FEATURE(kIPHScalableIphGamingFeature, + #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) + BASE_FEATURE(kIPHAutofillCreditCardBenefitFeature, + "IPH_AutofillCreditCardBenefit", + base::FEATURE_DISABLED_BY_DEFAULT); +@@ -776,7 +777,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. + // 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/qt6-webengine/files/patch-src_3rdparty_chromium_components_feature__engagement_public_feature__constants.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_feature__engagement_public_feature__constants.h index 5307419b1a12..8c7fb5946d0a 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_feature__engagement_public_feature__constants.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_feature__engagement_public_feature__constants.h @@ -1,29 +1,30 @@ ---- src/3rdparty/chromium/components/feature_engagement/public/feature_constants.h.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/components/feature_engagement/public/feature_constants.h.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/components/feature_engagement/public/feature_constants.h -@@ -25,7 +25,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(kIPHBatterySaverModeFeature); - BASE_DECLARE_FEATURE(kIPHCompanionSidePanelFeature); - BASE_DECLARE_FEATURE(kIPHCompanionSidePanelRegionSearchFeature); -@@ -252,7 +252,7 @@ extern const base::FeatureParam - kDefaultBrowserEligibilitySlidingWindowParam; + #if BUILDFLAG(GOOGLE_CHROME_BRANDING) + BASE_DECLARE_FEATURE(kEsbDownloadRowPromoFeature); + #endif +@@ -258,7 +258,8 @@ BASE_DECLARE_FEATURE(kDefaultBrowserTriggerCriteriaExp #endif // BUILDFLAG(IS_IOS) --#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) + #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) + BASE_DECLARE_FEATURE(kIPHAutofillCreditCardBenefitFeature); + BASE_DECLARE_FEATURE(kIPHAutofillDisabledVirtualCardSuggestionFeature); BASE_DECLARE_FEATURE(kIPHAutofillExternalAccountProfileSuggestionFeature); - BASE_DECLARE_FEATURE(kIPHAutofillVirtualCardCVCSuggestionFeature); -@@ -300,7 +300,7 @@ BASE_DECLARE_FEATURE(kIPHScalableIphHelpAppBasedTenFea +@@ -309,7 +310,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); + BASE_DECLARE_FEATURE(kIPHToolbarManagementButtonFeature); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) - diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_feature__engagement_public_feature__list.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_feature__engagement_public_feature__list.cc index ae61a1f12f14..8ce5396aa65b 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_feature__engagement_public_feature__list.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_feature__engagement_public_feature__list.cc @@ -1,29 +1,30 @@ ---- src/3rdparty/chromium/components/feature_engagement/public/feature_list.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/components/feature_engagement/public/feature_list.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/components/feature_engagement/public/feature_list.cc -@@ -157,7 +157,7 @@ const base::Feature* const kAllFeatures[] = { - &kIPHiOSPromoStaySafeFeature, +@@ -165,7 +165,7 @@ const base::Feature* const kAllFeatures[] = { + &kIPHiOSLensOverlayEntrypointTipFeature, #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) - &kIPHBatterySaverModeFeature, - &kIPHCompanionSidePanelFeature, - &kIPHCompanionSidePanelRegionSearchFeature, -@@ -214,7 +214,7 @@ const base::Feature* const kAllFeatures[] = { - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || + #if BUILDFLAG(GOOGLE_CHROME_BRANDING) + &kEsbDownloadRowPromoFeature, + #endif +@@ -230,7 +230,8 @@ const base::Feature* const kAllFeatures[] = { // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) --#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) + #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) + &kIPHAutofillCreditCardBenefitFeature, + &kIPHAutofillDisabledVirtualCardSuggestionFeature, &kIPHAutofillExternalAccountProfileSuggestionFeature, - &kIPHAutofillVirtualCardCVCSuggestionFeature, -@@ -262,7 +262,7 @@ const base::Feature* const kAllFeatures[] = { +@@ -281,7 +282,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, + &kIPHToolbarManagementButtonFeature, #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) - diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_feature__engagement_public_feature__list.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_feature__engagement_public_feature__list.h index 640c3bcdada2..5270d24a7620 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_feature__engagement_public_feature__list.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_feature__engagement_public_feature__list.h @@ -1,24 +1,25 @@ ---- src/3rdparty/chromium/components/feature_engagement/public/feature_list.h.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/components/feature_engagement/public/feature_list.h.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/components/feature_engagement/public/feature_list.h -@@ -288,7 +288,7 @@ DEFINE_VARIATION_PARAM(kIPHiOSPromoStaySafeFeature, "I +@@ -288,7 +288,7 @@ DEFINE_VARIATION_PARAM(kIPHHomeCustomizationMenuFeatur #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(kIPHBatterySaverModeFeature, "IPH_BatterySaverMode"); - DEFINE_VARIATION_PARAM(kIPHCompanionSidePanelFeature, "IPH_CompanionSidePanel"); - DEFINE_VARIATION_PARAM(kIPHCompanionSidePanelRegionSearchFeature, -@@ -386,7 +386,7 @@ DEFINE_VARIATION_PARAM(kIPHBackNavigationMenuFeature, - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || + #if BUILDFLAG(GOOGLE_CHROME_BRANDING) + DEFINE_VARIATION_PARAM(kEsbDownloadRowPromoFeature, "EsbDownloadRowPromo"); + #endif +@@ -389,7 +389,8 @@ DEFINE_VARIATION_PARAM(kIPHTabGroupsSaveV2CloseGroupFe // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) --#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"); -@@ -470,7 +470,7 @@ DEFINE_VARIATION_PARAM(kIPHScalableIphHelpAppBasedTenF + #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) + DEFINE_VARIATION_PARAM(kIPHAutofillCreditCardBenefitFeature, + "IPH_AutofillCreditCardBenefit"); + +@@ -481,7 +482,7 @@ DEFINE_VARIATION_PARAM(kIPHScalableIphHelpAppBasedTenF DEFINE_VARIATION_PARAM(kIPHScalableIphGamingFeature, "IPH_ScalableIphGaming"); #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -26,31 +27,32 @@ +#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) -@@ -615,7 +615,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation - VARIATION_ENTRY(kIPHiOSPromoMadeForIOSFeature), - VARIATION_ENTRY(kIPHiOSPromoStaySafeFeature), + DEFINE_VARIATION_PARAM(kIPHToolbarManagementButtonFeature, +@@ -646,7 +647,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation + VARIATION_ENTRY(kIPHHomeCustomizationMenuFeature), + VARIATION_ENTRY(kIPHiOSLensOverlayEntrypointTipFeature), #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(kIPHBatterySaverModeFeature), VARIATION_ENTRY(kIPHCompanionSidePanelFeature), VARIATION_ENTRY(kIPHCompanionSidePanelRegionSearchFeature), -@@ -672,7 +672,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || +@@ -701,7 +702,8 @@ constexpr flags_ui::FeatureEntry::FeatureVariation // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) --#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) + #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) + VARIATION_ENTRY(kIPHAutofillCreditCardBenefitFeature), + VARIATION_ENTRY(kIPHAutofillDisabledVirtualCardSuggestionFeature), VARIATION_ENTRY(kIPHAutofillExternalAccountProfileSuggestionFeature), - VARIATION_ENTRY(kIPHAutofillVirtualCardCVCSuggestionFeature), -@@ -720,7 +720,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation +@@ -753,7 +755,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), + VARIATION_ENTRY(kIPHToolbarManagementButtonFeature), #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) - diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_flags__ui_flags__state.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_flags__ui_flags__state.cc index 4c38ab9ecbd8..9add38f973ef 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_flags__ui_flags__state.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_flags__ui_flags__state.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/components/flags_ui/flags_state.cc.orig 2023-09-13 12:11:42 UTC +--- src/3rdparty/chromium/components/flags_ui/flags_state.cc.orig 2024-09-30 07:45:04 UTC +++ src/3rdparty/chromium/components/flags_ui/flags_state.cc -@@ -741,7 +741,7 @@ unsigned short FlagsState::GetCurrentPlatform() { +@@ -755,7 +755,7 @@ unsigned short FlagsState::GetCurrentPlatform() { return kOsCrOS; #elif BUILDFLAG(IS_CHROMEOS_LACROS) return kOsLacros; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_gwp__asan_client_gwp__asan.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_gwp__asan_client_gwp__asan.cc index 69d4aa842e2e..27bcf84ab858 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_gwp__asan_client_gwp__asan.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_gwp__asan_client_gwp__asan.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/components/gwp_asan/client/gwp_asan.cc.orig 2024-01-30 07:53:34 UTC +--- src/3rdparty/chromium/components/gwp_asan/client/gwp_asan.cc.orig 2024-06-17 12:56:06 UTC +++ src/3rdparty/chromium/components/gwp_asan/client/gwp_asan.cc -@@ -70,7 +70,7 @@ namespace { +@@ -75,7 +75,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). diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_gwp__asan_client_gwp__asan__features.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_gwp__asan_client_gwp__asan__features.cc new file mode 100644 index 000000000000..e4e1feef289b --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_gwp__asan_client_gwp__asan__features.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/components/gwp_asan/client/gwp_asan_features.cc.orig 2024-01-30 07:53:34 UTC ++++ src/3rdparty/chromium/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/qt6-webengine/files/patch-src_3rdparty_chromium_components_gwp__asan_crash__handler_crash__analyzer.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_gwp__asan_crash__handler_crash__analyzer.cc index 2e677802856f..2f837207d73c 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_gwp__asan_crash__handler_crash__analyzer.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_gwp__asan_crash__handler_crash__analyzer.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/components/gwp_asan/crash_handler/crash_analyzer.cc.orig 2023-05-31 08:12:17 UTC +--- src/3rdparty/chromium/components/gwp_asan/crash_handler/crash_analyzer.cc.orig 2024-09-30 07:45:04 UTC +++ src/3rdparty/chromium/components/gwp_asan/crash_handler/crash_analyzer.cc -@@ -30,7 +30,7 @@ +@@ -35,7 +35,7 @@ #include "third_party/crashpad/crashpad/snapshot/process_snapshot.h" #include "third_party/crashpad/crashpad/util/process/process_memory.h" @@ -9,7 +9,7 @@ #include #elif BUILDFLAG(IS_APPLE) #include -@@ -90,7 +90,7 @@ bool CrashAnalyzer::GetExceptionInfo( +@@ -95,7 +95,7 @@ bool CrashAnalyzer::GetExceptionInfo( crashpad::VMAddress CrashAnalyzer::GetAccessAddress( const crashpad::ExceptionSnapshot& exception) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_live__caption_caption__util.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_live__caption_caption__util.cc index ce4ef2e65108..6756d682021c 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_live__caption_caption__util.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_live__caption_caption__util.cc @@ -1,15 +1,6 @@ ---- src/3rdparty/chromium/components/live_caption/caption_util.cc.orig 2023-07-16 15:47:57 UTC +--- src/3rdparty/chromium/components/live_caption/caption_util.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/components/live_caption/caption_util.cc -@@ -145,7 +145,7 @@ bool IsLiveCaptionFeatureSupported() { - return false; - #endif - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // Check if the CPU has the required instruction set to run the Speech - // On-Device API (SODA) library. - static bool has_sse41 = base::CPU().has_sse41(); -@@ -167,7 +167,7 @@ std::string GetCaptionSettingsUrl() { +@@ -139,7 +139,7 @@ std::string GetCaptionSettingsUrl() { return "chrome://os-settings/audioAndCaptions"; #endif // BUILDFLAG(IS_CHROMEOS) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_live__caption_caption__util.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_live__caption_caption__util.h index 8a704f098a16..577c1578c7b1 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_live__caption_caption__util.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_live__caption_caption__util.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/components/live_caption/caption_util.h.orig 2023-07-16 15:47:57 UTC +--- src/3rdparty/chromium/components/live_caption/caption_util.h.orig 2024-03-22 08:19:40 UTC +++ src/3rdparty/chromium/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/qt6-webengine/files/patch-src_3rdparty_chromium_components_media__router_common_media__source.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_media__router_common_media__source.cc index 7a008681696b..4c4610c1f1df 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_media__router_common_media__source.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_media__router_common_media__source.cc @@ -1,11 +1,11 @@ ---- src/3rdparty/chromium/components/media_router/common/media_source.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/components/media_router/common/media_source.cc.orig 2024-06-17 12:56:06 UTC +++ src/3rdparty/chromium/components/media_router/common/media_source.cc -@@ -59,7 +59,7 @@ bool IsSystemAudioCaptureSupported() { +@@ -57,7 +57,7 @@ bool IsSystemAudioCaptureSupported() { + if (!media::IsSystemLoopbackCaptureSupported()) { + return false; } - #if BUILDFLAG(IS_MAC) - return base::FeatureList::IsEnabled(media::kMacLoopbackAudioForCast); --#elif BUILDFLAG(IS_LINUX) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) return base::FeatureList::IsEnabled(media::kPulseaudioLoopbackForCast); #else return true; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_media__router_common_providers_cast_channel_enum__table.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_media__router_common_providers_cast_channel_enum__table.h new file mode 100644 index 000000000000..62f9326b6060 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_media__router_common_providers_cast_channel_enum__table.h @@ -0,0 +1,15 @@ +--- src/3rdparty/chromium/components/media_router/common/providers/cast/channel/enum_table.h.orig 2025-02-21 12:29:33 UTC ++++ src/3rdparty/chromium/components/media_router/common/providers/cast/channel/enum_table.h +@@ -368,7 +368,12 @@ class EnumTable { + + private: + #ifdef ARCH_CPU_64_BITS ++#ifdef __cpp_lib_hardware_interference_size + alignas(std::hardware_destructive_interference_size) ++#else ++ static constexpr std::size_t hardware_destructive_interference_size = 64; ++ alignas(hardware_destructive_interference_size) ++#endif + #endif + std::initializer_list data_; + bool is_sorted_; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_metrics_metrics__log.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_metrics_metrics__log.cc index f3babba05b53..55707f8b64c9 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_metrics_metrics__log.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_metrics_metrics__log.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/components/metrics/metrics_log.cc.orig 2024-01-30 07:53:34 UTC +--- src/3rdparty/chromium/components/metrics/metrics_log.cc.orig 2024-05-21 18:07:39 UTC +++ src/3rdparty/chromium/components/metrics/metrics_log.cc -@@ -53,7 +53,7 @@ +@@ -56,7 +56,7 @@ #include "base/win/current_module.h" #endif @@ -9,7 +9,7 @@ #include "base/environment.h" #include "base/nix/xdg_util.h" #endif -@@ -142,7 +142,7 @@ void RecordCurrentTime( +@@ -146,7 +146,7 @@ void RecordCurrentTime( } } @@ -18,7 +18,7 @@ metrics::SystemProfileProto::OS::XdgSessionType ToProtoSessionType( base::nix::SessionType session_type) { switch (session_type) { -@@ -393,7 +393,7 @@ void MetricsLog::RecordCoreSystemProfile( +@@ -415,7 +415,7 @@ void MetricsLog::RecordCoreSystemProfile( // OperatingSystemVersion refers to the ChromeOS release version. #if BUILDFLAG(IS_CHROMEOS_ASH) os->set_kernel_version(base::SysInfo::KernelVersion()); @@ -27,7 +27,7 @@ // Linux operating system version is copied over into kernel version to be // consistent. os->set_kernel_version(base::SysInfo::OperatingSystemVersion()); -@@ -410,7 +410,7 @@ void MetricsLog::RecordCoreSystemProfile( +@@ -432,7 +432,7 @@ void MetricsLog::RecordCoreSystemProfile( os->set_build_number(base::SysInfo::GetIOSBuildNumber()); #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_named__mojo__ipc__server_connection__info.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_named__mojo__ipc__server_connection__info.h index ed1281ea2ffb..1f6a776b0422 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_named__mojo__ipc__server_connection__info.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_named__mojo__ipc__server_connection__info.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/components/named_mojo_ipc_server/connection_info.h.orig 2023-02-08 09:03:45 UTC +--- src/3rdparty/chromium/components/named_mojo_ipc_server/connection_info.h.orig 2024-09-30 07:45:04 UTC +++ src/3rdparty/chromium/components/named_mojo_ipc_server/connection_info.h -@@ -13,7 +13,7 @@ +@@ -12,7 +12,7 @@ #include "base/win/scoped_handle.h" #elif BUILDFLAG(IS_MAC) #include @@ -9,9 +9,9 @@ #include #endif -@@ -32,7 +32,7 @@ struct ConnectionInfo { - absl::optional impersonation_token{}; - #elif BUILDFLAG(IS_MAC) +@@ -29,7 +29,7 @@ struct ConnectionInfo { + base::ProcessId pid{}; + #if BUILDFLAG(IS_MAC) audit_token_t audit_token{}; -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_named__mojo__ipc__server_named__mojo__ipc__server__client__util.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_named__mojo__ipc__server_named__mojo__ipc__server__client__util.cc index 1054198b46a2..70a527cdc7c9 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_named__mojo__ipc__server_named__mojo__ipc__server__client__util.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_named__mojo__ipc__server_named__mojo__ipc__server__client__util.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/components/named_mojo_ipc_server/named_mojo_ipc_server_client_util.cc.orig 2023-02-08 09:03:45 UTC +--- src/3rdparty/chromium/components/named_mojo_ipc_server/named_mojo_ipc_server_client_util.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/components/named_mojo_ipc_server/named_mojo_ipc_server_client_util.cc -@@ -22,7 +22,7 @@ namespace named_mojo_ipc_server { +@@ -23,7 +23,7 @@ namespace named_mojo_ipc_server { // static mojo::PlatformChannelEndpoint ConnectToServer( const mojo::NamedPlatformChannel::ServerName& server_name) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_named__system__lock_lock.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_named__system__lock_lock.h new file mode 100644 index 000000000000..65f7818502f9 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_named__system__lock_lock.h @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/components/named_system_lock/lock.h.orig 2024-07-30 11:12:21 UTC ++++ src/3rdparty/chromium/components/named_system_lock/lock.h +@@ -38,7 +38,7 @@ class ScopedLock { + // may acquire that lock. The lock name has different meanings per platform: + // Linux: A shared memory object name starting with `/`. E.g. `/MyApp.lock`. + // Mac: A bootstrap service name (see `man bootstrap_check_in`). +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + static std::unique_ptr Create(const std::string& name, + base::TimeDelta timeout); + #elif BUILDFLAG(IS_WIN) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_network__session__configurator_browser_network__session__configurator.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_network__session__configurator_browser_network__session__configurator.cc index 52e9d647cf2e..5a1f7c4c3666 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_network__session__configurator_browser_network__session__configurator.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_network__session__configurator_browser_network__session__configurator.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/components/network_session_configurator/browser/network_session_configurator.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/components/network_session_configurator/browser/network_session_configurator.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/components/network_session_configurator/browser/network_session_configurator.cc -@@ -827,7 +827,7 @@ net::URLRequestContextBuilder::HttpCacheParams::Type C +@@ -849,7 +849,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/qt6-webengine/files/patch-src_3rdparty_chromium_components_optimization__guide_core_optimization__guide__util.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_optimization__guide_core_optimization__guide__util.cc index 65846afede75..09e18bd11848 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_optimization__guide_core_optimization__guide__util.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_optimization__guide_core_optimization__guide__util.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/components/optimization_guide/core/optimization_guide_util.cc.orig 2024-01-30 07:53:34 UTC +--- src/3rdparty/chromium/components/optimization_guide/core/optimization_guide_util.cc.orig 2024-07-30 11:12:21 UTC +++ src/3rdparty/chromium/components/optimization_guide/core/optimization_guide_util.cc -@@ -39,7 +39,7 @@ optimization_guide::proto::Platform GetPlatform() { +@@ -35,7 +35,7 @@ optimization_guide::proto::Platform GetPlatform() { return optimization_guide::proto::PLATFORM_CHROMEOS; #elif BUILDFLAG(IS_ANDROID) return optimization_guide::proto::PLATFORM_ANDROID; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_os__crypt_async_browser_secret__portal__key__provider.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_os__crypt_async_browser_secret__portal__key__provider.cc new file mode 100644 index 000000000000..3c83ff265da7 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_os__crypt_async_browser_secret__portal__key__provider.cc @@ -0,0 +1,12 @@ +--- src/3rdparty/chromium/components/os_crypt/async/browser/secret_portal_key_provider.cc.orig 2024-10-22 08:31:56 UTC ++++ src/3rdparty/chromium/components/os_crypt/async/browser/secret_portal_key_provider.cc +@@ -5,7 +5,9 @@ + #include "components/os_crypt/async/browser/secret_portal_key_provider.h" + + #include ++#if BUILDFLAG(IS_LINUX) + #include ++#endif + + #include + #include diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_os__crypt_async_common_encryptor.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_os__crypt_async_common_encryptor.cc new file mode 100644 index 000000000000..f4403568aa9f --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_os__crypt_async_common_encryptor.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/components/os_crypt/async/common/encryptor.cc.orig 2024-10-22 08:31:56 UTC ++++ src/3rdparty/chromium/components/os_crypt/async/common/encryptor.cc +@@ -277,7 +277,7 @@ std::optional Encryptor::DecryptData( + // or not encryption worked or not, and certainly not advisable to recommend + // a re-encryption of this potentially invalid data. + // TODO(crbug.com/365712505): Remove this fallback. +-#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_APPLE) && \ ++#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD) && \ + !(BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)) || \ + BUILDFLAG(IS_FUCHSIA) + if (plaintext == string_data) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_os__crypt_sync_libsecret__util__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_os__crypt_sync_libsecret__util__linux.cc index 82e9cd60a576..123dc26ce3e3 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_os__crypt_sync_libsecret__util__linux.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_os__crypt_sync_libsecret__util__linux.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/components/os_crypt/sync/libsecret_util_linux.cc.orig 2023-04-28 17:01:32 UTC +--- src/3rdparty/chromium/components/os_crypt/sync/libsecret_util_linux.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/components/os_crypt/sync/libsecret_util_linux.cc -@@ -99,16 +99,22 @@ bool LibsecretLoader::EnsureLibsecretLoaded() { +@@ -185,16 +185,22 @@ bool LibsecretLoader::EnsureLibsecretLoaded() { // static bool LibsecretLoader::LoadLibsecret() { @@ -19,9 +19,9 @@ // We wanted to use libsecret, but we couldn't load it. Warn, because // either the user asked for this, or we autodetected it incorrectly. (Or // the system has broken libraries, which is also good to warn about.) - // TODO(crbug.com/607435): Channel this message to the user-facing log + // TODO(crbug.com/40467093): Channel this message to the user-facing log - VLOG(1) << "Could not load libsecret-1.so.0: " << dlerror(); -+ VLOG(1) << "Could not load << " << kSecretLib << ": " << dlerror(); ++ VLOG(1) << "Could not load " << kSecretLib << ": " << dlerror(); return false; } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_os__crypt_sync_os__crypt.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_os__crypt_sync_os__crypt.h index 8bbbbc3083c8..81e2c3eeadee 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_os__crypt_sync_os__crypt.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_os__crypt_sync_os__crypt.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/components/os_crypt/sync/os_crypt.h.orig 2023-04-28 17:01:32 UTC +--- src/3rdparty/chromium/components/os_crypt/sync/os_crypt.h.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/components/os_crypt/sync/os_crypt.h @@ -14,7 +14,7 @@ #include "build/build_config.h" @@ -11,7 +11,7 @@ @@ -23,7 +23,7 @@ class PrefRegistrySimple; class PrefService; - #endif + #endif // BUILDFLAG(IS_WIN) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_APPLE) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD) @@ -67,6 +67,6 @@ -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // Create the KeyStorage. Will be null if no service is found. A Config must - // be set before every call to this method. - std::unique_ptr CreateKeyStorage(); + // Returns a cached string of "peanuts". Is thread-safe. + crypto::SymmetricKey* GetPasswordV10(); + diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_paint__preview_browser_paint__preview__client.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_paint__preview_browser_paint__preview__client.cc index d92d62501494..c4646513fbb8 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_paint__preview_browser_paint__preview__client.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_paint__preview_browser_paint__preview__client.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/components/paint_preview/browser/paint_preview_client.cc.orig 2024-01-30 07:53:34 UTC +--- src/3rdparty/chromium/components/paint_preview/browser/paint_preview_client.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/components/paint_preview/browser/paint_preview_client.cc -@@ -313,8 +313,8 @@ void PaintPreviewClient::CapturePaintPreview( +@@ -326,8 +326,8 @@ void PaintPreviewClient::CapturePaintPreview( metadata->set_version(kPaintPreviewVersion); auto* chromeVersion = metadata->mutable_chrome_version(); const auto& current_chrome_version = version_info::GetVersion(); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_paint__preview_player_player__compositor__delegate.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_paint__preview_player_player__compositor__delegate.cc index 5f4b049edd33..3c90cff537cb 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_paint__preview_player_player__compositor__delegate.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_paint__preview_player_player__compositor__delegate.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/components/paint_preview/player/player_compositor_delegate.cc.orig 2024-01-30 07:53:34 UTC +--- src/3rdparty/chromium/components/paint_preview/player/player_compositor_delegate.cc.orig 2024-08-26 12:06:38 UTC +++ src/3rdparty/chromium/components/paint_preview/player/player_compositor_delegate.cc -@@ -455,8 +455,8 @@ void PlayerCompositorDelegate::ValidateProtoAndLoadAXT +@@ -434,8 +434,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() && diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_browser_features_password__features.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_browser_features_password__features.cc index 06065cf3e0d1..2ade6a08b107 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_browser_features_password__features.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_browser_features_password__features.cc @@ -1,20 +1,20 @@ ---- src/3rdparty/chromium/components/password_manager/core/browser/features/password_features.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/components/password_manager/core/browser/features/password_features.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/components/password_manager/core/browser/features/password_features.cc -@@ -24,7 +24,7 @@ BASE_FEATURE(kButterOnDesktopFollowup, - +@@ -41,7 +41,7 @@ BASE_FEATURE(kClearUndecryptablePasswords, 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) + #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_IOS) || \ +- BUILDFLAG(IS_WIN) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -104,7 +104,7 @@ BASE_FEATURE(kPasswordManagerLogToTerminal, - "PasswordManagerLogToTerminal", +@@ -92,7 +92,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_DISABLED_BY_DEFAULT); + #if BUILDFLAG(IS_MAC) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_browser_features_password__features.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_browser_features_password__features.h index 9245405b0828..84bf605a3a42 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_browser_features_password__features.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_browser_features_password__features.h @@ -1,11 +1,11 @@ ---- src/3rdparty/chromium/components/password_manager/core/browser/features/password_features.h.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/components/password_manager/core/browser/features/password_features.h.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/components/password_manager/core/browser/features/password_features.h -@@ -94,7 +94,7 @@ BASE_DECLARE_FEATURE(kPasswordManagerEnableSenderServi - // terminal. - BASE_DECLARE_FEATURE(kPasswordManagerLogToTerminal); +@@ -93,7 +93,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) + #endif // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_browser_password__form__manager.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_browser_password__form__manager.cc index 8d4ec9f7d604..4c5293c3b005 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_browser_password__form__manager.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_browser_password__form__manager.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/components/password_manager/core/browser/password_form_manager.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/components/password_manager/core/browser/password_form_manager.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/components/password_manager/core/browser/password_form_manager.cc -@@ -58,7 +58,7 @@ +@@ -61,7 +61,7 @@ #include "components/webauthn/android/webauthn_cred_man_delegate.h" #endif // BUILDFLAG(IS_ANDROID) @@ -9,16 +9,16 @@ #include "components/os_crypt/sync/os_crypt.h" #endif -@@ -229,7 +229,7 @@ bool ShouldUploadCrowdsourcingVotes(const FormOrDigest +@@ -231,7 +231,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( - absl::optional backend_error) { + std::optional backend_error) { if (!backend_error.has_value()) { -@@ -794,7 +794,7 @@ void PasswordFormManager::OnFetchCompleted() { +@@ -888,7 +888,7 @@ void PasswordFormManager::OnFetchCompleted() { error.value().type); } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_browser_password__manager.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_browser_password__manager.cc index ca56f648cb7f..8a17db823f50 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_browser_password__manager.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_browser_password__manager.cc @@ -1,7 +1,7 @@ ---- src/3rdparty/chromium/components/password_manager/core/browser/password_manager.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/components/password_manager/core/browser/password_manager.cc.orig 2024-09-30 07:45:04 UTC +++ src/3rdparty/chromium/components/password_manager/core/browser/password_manager.cc -@@ -363,7 +363,7 @@ void PasswordManager::RegisterProfilePrefs( - registry->RegisterListPref(prefs::kPasswordManagerPromoCardsList); +@@ -414,7 +414,7 @@ void PasswordManager::RegisterProfilePrefs( + prefs::kAutofillableCredentialsAccountStoreLoginDatabase, false); #endif // BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_IOS) registry->RegisterBooleanPref(prefs::kPasswordSharingEnabled, true); -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) @@ -9,3 +9,12 @@ registry->RegisterIntegerPref(prefs::kRelaunchChromeBubbleDismissedCounter, 0); #endif +@@ -427,7 +427,7 @@ void PasswordManager::RegisterProfilePrefs( + #endif + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_IOS) ++ BUILDFLAG(IS_IOS) || BUILDFLAG(IS_BSD) + registry->RegisterBooleanPref(prefs::kDeletingUndecryptablePasswordsEnabled, + true); + #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_browser_password__manager__client.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_browser_password__manager__client.h new file mode 100644 index 000000000000..d6e78b1fc41d --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_browser_password__manager__client.h @@ -0,0 +1,20 @@ +--- src/3rdparty/chromium/components/password_manager/core/browser/password_manager_client.h.orig 2024-10-22 08:31:56 UTC ++++ src/3rdparty/chromium/components/password_manager/core/browser/password_manager_client.h +@@ -30,7 +30,7 @@ + #include "net/cert/cert_status_flags.h" + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #include "base/i18n/rtl.h" + #include "components/password_manager/core/browser/password_cross_domain_confirmation_popup_controller.h" + #include "ui/gfx/geometry/rect_f.h" +@@ -545,7 +545,7 @@ class PasswordManagerClient { + CredentialsCallback callback); + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + + // Shows the bubble with the details of the `form`. + virtual void OpenPasswordDetailsBubble( diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_browser_password__manager__switches.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_browser_password__manager__switches.cc new file mode 100644 index 000000000000..6a88a620db20 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_browser_password__manager__switches.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/components/password_manager/core/browser/password_manager_switches.cc.orig 2024-06-17 12:56:06 UTC ++++ src/3rdparty/chromium/components/password_manager/core/browser/password_manager_switches.cc +@@ -6,7 +6,7 @@ + + namespace password_manager { + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Specifies which encryption storage backend to use. Possible values are + // kwallet, kwallet5, kwallet6, gnome-libsecret, basic. + // Any other value will lead to Chrome detecting the best backend automatically. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_browser_password__manager__switches.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_browser_password__manager__switches.h new file mode 100644 index 000000000000..b2f0bb60a916 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_browser_password__manager__switches.h @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/components/password_manager/core/browser/password_manager_switches.h.orig 2024-07-30 11:12:21 UTC ++++ src/3rdparty/chromium/components/password_manager/core/browser/password_manager_switches.h +@@ -10,7 +10,7 @@ + + namespace password_manager { + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + extern const char kPasswordStore[]; + extern const char kEnableEncryptionSelection[]; + #endif // BUILDFLAG(IS_LINUX) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_browser_password__manual__fallback__flow.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_browser_password__manual__fallback__flow.cc new file mode 100644 index 000000000000..35be47bb23c8 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_browser_password__manual__fallback__flow.cc @@ -0,0 +1,29 @@ +--- src/3rdparty/chromium/components/password_manager/core/browser/password_manual_fallback_flow.cc.orig 2024-10-22 08:31:56 UTC ++++ src/3rdparty/chromium/components/password_manager/core/browser/password_manual_fallback_flow.cc +@@ -43,7 +43,7 @@ std::u16string GetUsernameFromLabel(const std::u16stri + } + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + // Returns the password form corresponding to the `payload` data. In most + // cases there is only one such form stored, but having more than one or no + // forms is also possible. If there is more than one form, showing any of them +@@ -281,7 +281,7 @@ void PasswordManualFallbackFlow::DidAcceptSuggestion( + } + case autofill::SuggestionType::kViewPasswordDetails: { + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + std::optional credentials = + GetCorrespondingPasswordForm( + suggestion.GetPayload(), +@@ -413,7 +413,7 @@ void PasswordManualFallbackFlow::EnsureCrossDomainPass + const Suggestion::PasswordSuggestionDetails& payload, + base::OnceClosure on_allowed) { + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + if (payload.is_cross_domain) { + cross_domain_confirmation_popup_controller_ = + password_client_->ShowCrossDomainConfirmationPopup( diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_browser_password__manual__fallback__flow.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_browser_password__manual__fallback__flow.h new file mode 100644 index 000000000000..9211994d6db1 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_browser_password__manual__fallback__flow.h @@ -0,0 +1,20 @@ +--- src/3rdparty/chromium/components/password_manager/core/browser/password_manual_fallback_flow.h.orig 2024-10-22 08:31:56 UTC ++++ src/3rdparty/chromium/components/password_manager/core/browser/password_manual_fallback_flow.h +@@ -17,7 +17,7 @@ + #include "components/password_manager/core/browser/ui/saved_passwords_presenter.h" + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #include "components/password_manager/core/browser/password_cross_domain_confirmation_popup_controller.h" + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || + // BUILDFLAG(IS_CHROMEOS) +@@ -178,7 +178,7 @@ class PasswordManualFallbackFlow : public autofill::Au + std::unique_ptr authenticator_; + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + std::unique_ptr + cross_domain_confirmation_popup_controller_; + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_browser_password__store__factory__util.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_browser_password__store__factory__util.cc new file mode 100644 index 000000000000..01de67ab4575 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_browser_password__store__factory__util.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/components/password_manager/core/browser/password_store_factory_util.cc.orig 2024-10-22 08:31:56 UTC ++++ src/3rdparty/chromium/components/password_manager/core/browser/password_store_factory_util.cc +@@ -29,7 +29,7 @@ namespace { + LoginDatabase::DeletingUndecryptablePasswordsEnabled GetPolicyFromPrefs( + PrefService* prefs) { + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_IOS) ++ BUILDFLAG(IS_IOS) || BUILDFLAG(IS_BSD) + return LoginDatabase::DeletingUndecryptablePasswordsEnabled( + prefs->GetBoolean(prefs::kDeletingUndecryptablePasswordsEnabled)); + #else diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_browser_password__store_login__database.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_browser_password__store_login__database.cc new file mode 100644 index 000000000000..8abe6a31437d --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_browser_password__store_login__database.cc @@ -0,0 +1,20 @@ +--- src/3rdparty/chromium/components/password_manager/core/browser/password_store/login_database.cc.orig 2024-10-22 08:31:56 UTC ++++ src/3rdparty/chromium/components/password_manager/core/browser/password_store/login_database.cc +@@ -1030,7 +1030,7 @@ bool ShouldDeleteUndecryptablePasswords( + bool is_user_data_dir_policy_set, + bool is_enabled_by_policy, + IsAccountStore is_account_store) { +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + std::string user_data_dir_string; + std::unique_ptr environment(base::Environment::Create()); + // On Linux user data directory ca be specified using an env variable. If it +@@ -1049,7 +1049,7 @@ bool ShouldDeleteUndecryptablePasswords( + return false; + } + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (command_line->HasSwitch(password_manager::kPasswordStore)) { + RecordShouldDeleteUndecryptablePasswordsMetric( + ShouldDeleteUndecryptablePasswordsResult:: diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_browser_password__store_login__database__async__helper.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_browser_password__store_login__database__async__helper.cc new file mode 100644 index 000000000000..9bbb04406a0b --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_browser_password__store_login__database__async__helper.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/components/password_manager/core/browser/password_store/login_database_async_helper.cc.orig 2024-09-30 07:45:04 UTC ++++ src/3rdparty/chromium/components/password_manager/core/browser/password_store/login_database_async_helper.cc +@@ -154,7 +154,7 @@ LoginsResultOrError LoginDatabaseAsyncHelper::FillMatc + std::vector 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/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_browser_stub__password__manager__client.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_browser_stub__password__manager__client.cc new file mode 100644 index 000000000000..cee3f8137f01 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_browser_stub__password__manager__client.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/components/password_manager/core/browser/stub_password_manager_client.cc.orig 2024-10-22 08:31:56 UTC ++++ src/3rdparty/chromium/components/password_manager/core/browser/stub_password_manager_client.cc +@@ -187,7 +187,7 @@ version_info::Channel StubPasswordManagerClient::GetCh + } + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + void StubPasswordManagerClient::OpenPasswordDetailsBubble( + const password_manager::PasswordForm& form) {} + diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_browser_stub__password__manager__client.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_browser_stub__password__manager__client.h new file mode 100644 index 000000000000..dd569b066731 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_browser_stub__password__manager__client.h @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/components/password_manager/core/browser/stub_password_manager_client.h.orig 2024-09-30 07:45:04 UTC ++++ src/3rdparty/chromium/components/password_manager/core/browser/stub_password_manager_client.h +@@ -75,7 +75,7 @@ class StubPasswordManagerClient : public PasswordManag + MockPasswordFeatureManager* GetPasswordFeatureManager(); + version_info::Channel GetChannel() const override; + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + void OpenPasswordDetailsBubble( + const password_manager::PasswordForm& form) override; + std::unique_ptr< diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_browser_sync_password__sync__bridge.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_browser_sync_password__sync__bridge.cc deleted file mode 100644 index 93e1c684834f..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_browser_sync_password__sync__bridge.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/components/password_manager/core/browser/sync/password_sync_bridge.cc.orig 2023-10-27 05:38:38 UTC -+++ src/3rdparty/chromium/components/password_manager/core/browser/sync/password_sync_bridge.cc -@@ -197,7 +197,7 @@ bool ShouldRecoverPasswordsDuringMerge() { - } - - bool ShouldCleanSyncMetadataDuringStartupWhenDecryptionFails() { --#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - return ShouldRecoverPasswordsDuringMerge() && - base::FeatureList::IsEnabled( - features::kForceInitialSyncWhenDecryptionFails); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_common_password__manager__features.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_common_password__manager__features.cc deleted file mode 100644 index a43967c49118..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_common_password__manager__features.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/components/password_manager/core/common/password_manager_features.cc.orig 2023-10-27 05:38:38 UTC -+++ src/3rdparty/chromium/components/password_manager/core/common/password_manager_features.cc -@@ -18,7 +18,7 @@ BASE_FEATURE(kEnableOverwritingPlaceholderUsernames, - "EnableOverwritingPlaceholderUsernames", - base::FEATURE_DISABLED_BY_DEFAULT); - --#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // When enabled, initial sync will be forced during startup if the password - // store has encryption service failures. - BASE_FEATURE(kForceInitialSyncWhenDecryptionFails, diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_common_password__manager__features.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_common_password__manager__features.h deleted file mode 100644 index e117fb35e7d8..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_common_password__manager__features.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/components/password_manager/core/common/password_manager_features.h.orig 2023-12-10 06:10:27 UTC -+++ src/3rdparty/chromium/components/password_manager/core/common/password_manager_features.h -@@ -19,7 +19,7 @@ namespace password_manager::features { - // alongside the definition of their values in the .cc file. - BASE_DECLARE_FEATURE(kEnableOverwritingPlaceholderUsernames); - --#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - BASE_DECLARE_FEATURE(kForceInitialSyncWhenDecryptionFails); - #endif - BASE_DECLARE_FEATURE(kForgotPasswordFormSupport); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_common_password__manager__pref__names.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_common_password__manager__pref__names.h index 14a22bf48457..94d3ccc84bfe 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_common_password__manager__pref__names.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_common_password__manager__pref__names.h @@ -1,6 +1,15 @@ ---- src/3rdparty/chromium/components/password_manager/core/common/password_manager_pref_names.h.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/components/password_manager/core/common/password_manager_pref_names.h.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/components/password_manager/core/common/password_manager_pref_names.h -@@ -324,7 +324,7 @@ inline constexpr char kPasswordManagerPromoCardsList[] +@@ -41,7 +41,7 @@ inline constexpr char kCredentialProviderEnabledOnStar + #endif + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_IOS) ++ BUILDFLAG(IS_IOS) || BUILDFLAG(IS_BSD) + // Boolean pref controlled by the DeletingUndecryptablePasswordsEnabled policy. + // If set to false it blocks deleting undecryptable passwords, otherwise the + // deletion can happen. +@@ -334,7 +334,7 @@ inline constexpr char kAutofillableCredentialsAccountS inline constexpr char kPasswordSharingEnabled[] = "password_manager.password_sharing_enabled"; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_performance__manager_public_features.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_performance__manager_public_features.h index d174e24d6b30..5e31ce9bb588 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_performance__manager_public_features.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_performance__manager_public_features.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/components/performance_manager/public/features.h.orig 2023-11-03 10:09:45 UTC +--- src/3rdparty/chromium/components/performance_manager/public/features.h.orig 2024-07-30 11:12:21 UTC +++ src/3rdparty/chromium/components/performance_manager/public/features.h -@@ -28,7 +28,7 @@ BASE_DECLARE_FEATURE(kRunOnDedicatedThreadPoolThread); +@@ -21,7 +21,7 @@ BASE_DECLARE_FEATURE(kRunOnMainThreadSync); #if !BUILDFLAG(IS_ANDROID) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_policy_core_browser_policy__pref__mapping__test.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_policy_core_browser_policy__pref__mapping__test.cc index ce43d7c06a79..bd364678d5d6 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_policy_core_browser_policy__pref__mapping__test.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_policy_core_browser_policy__pref__mapping__test.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/components/policy/core/browser/policy_pref_mapping_test.cc.orig 2024-01-30 07:53:34 UTC +--- src/3rdparty/chromium/components/policy/core/browser/policy_pref_mapping_test.cc.orig 2024-06-17 12:56:06 UTC +++ src/3rdparty/chromium/components/policy/core/browser/policy_pref_mapping_test.cc -@@ -318,7 +318,7 @@ class PolicyTestCase { +@@ -411,7 +411,7 @@ class PolicyTestCase { const std::string os("chromeos_lacros"); #elif BUILDFLAG(IS_IOS) const std::string os("ios"); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_policy_core_common_cloud_cloud__policy__client.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_policy_core_common_cloud_cloud__policy__client.cc index e5c6928ce9c7..0debdfe734c4 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_policy_core_common_cloud_cloud__policy__client.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_policy_core_common_cloud_cloud__policy__client.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/components/policy/core/common/cloud/cloud_policy_client.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/components/policy/core/common/cloud/cloud_policy_client.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/components/policy/core/common/cloud/cloud_policy_client.cc -@@ -554,7 +554,7 @@ void CloudPolicyClient::FetchPolicy(PolicyFetchReason +@@ -703,7 +703,7 @@ void CloudPolicyClient::FetchPolicy(PolicyFetchReason fetch_request->set_invalidation_payload(invalidation_payload_); } } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_policy_core_common_cloud_cloud__policy__refresh__scheduler.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_policy_core_common_cloud_cloud__policy__refresh__scheduler.cc new file mode 100644 index 000000000000..b433e28c007a --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_policy_core_common_cloud_cloud__policy__refresh__scheduler.cc @@ -0,0 +1,20 @@ +--- src/3rdparty/chromium/components/policy/core/common/cloud/cloud_policy_refresh_scheduler.cc.orig 2024-10-22 08:31:56 UTC ++++ src/3rdparty/chromium/components/policy/core/common/cloud/cloud_policy_refresh_scheduler.cc +@@ -25,7 +25,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) + BASE_FEATURE(kRetryWithKeyReset, + "RetryWithKeyReset", + base::FEATURE_ENABLED_BY_DEFAULT); +@@ -220,7 +220,7 @@ void CloudPolicyRefreshScheduler::OnStoreError(CloudPo + // continue using the stale information. Thus, no specific response to a store + // error is required. NB: Changes to is_managed fire OnStoreLoaded(). + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Client is registered means we have successfully get policy key once. However, + // a following policy fetch request is failed because we can't verified + // signature. Delete the policy key so that we can get it again with next diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_policy_core_common_cloud_cloud__policy__util.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_policy_core_common_cloud_cloud__policy__util.cc index 244cc5c20edb..d97731e4c262 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_policy_core_common_cloud_cloud__policy__util.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_policy_core_common_cloud_cloud__policy__util.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/components/policy/core/common/cloud/cloud_policy_util.cc.orig 2023-11-03 10:09:45 UTC +--- src/3rdparty/chromium/components/policy/core/common/cloud/cloud_policy_util.cc.orig 2024-03-22 08:19:40 UTC +++ src/3rdparty/chromium/components/policy/core/common/cloud/cloud_policy_util.cc @@ -20,7 +20,7 @@ #endif @@ -26,7 +26,7 @@ #include #include -@@ -86,7 +91,7 @@ namespace em = enterprise_management; +@@ -88,7 +93,7 @@ namespace em = enterprise_management; std::string GetMachineName() { #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \ @@ -35,7 +35,7 @@ char hostname[HOST_NAME_MAX]; if (gethostname(hostname, HOST_NAME_MAX) == 0) // Success. return hostname; -@@ -143,7 +148,7 @@ std::string GetMachineName() { +@@ -145,7 +150,7 @@ std::string GetMachineName() { std::string GetOSVersion() { #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_APPLE) || \ @@ -44,7 +44,7 @@ return base::SysInfo::OperatingSystemVersion(); #elif BUILDFLAG(IS_WIN) base::win::OSInfo::VersionNumber version_number = -@@ -166,7 +171,7 @@ std::string GetOSArchitecture() { +@@ -168,7 +173,7 @@ std::string GetOSArchitecture() { } std::string GetOSUsername() { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_policy_core_common_policy__utils.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_policy_core_common_policy__utils.cc index e746a2814462..733f5400d0b7 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_policy_core_common_policy__utils.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_policy_core_common_policy__utils.cc @@ -1,11 +1,11 @@ ---- src/3rdparty/chromium/components/policy/core/common/policy_utils.cc.orig 2024-01-30 07:53:34 UTC +--- src/3rdparty/chromium/components/policy/core/common/policy_utils.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/components/policy/core/common/policy_utils.cc -@@ -28,7 +28,7 @@ bool IsPolicyTestingEnabled(PrefService* pref_service, +@@ -22,7 +22,7 @@ bool IsPolicyTestingEnabled(PrefService* pref_service, return true; } --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_IOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_BSD) if (channel == version_info::Channel::DEV) { return true; } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_policy_tools_generate__policy__source.py b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_policy_tools_generate__policy__source.py index fb0b794ebdc6..6ef9338ffdb1 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_policy_tools_generate__policy__source.py +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_policy_tools_generate__policy__source.py @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/components/policy/tools/generate_policy_source.py.orig 2023-09-13 12:11:42 UTC +--- src/3rdparty/chromium/components/policy/tools/generate_policy_source.py.orig 2024-04-19 13:02:56 UTC +++ src/3rdparty/chromium/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/qt6-webengine/files/patch-src_3rdparty_chromium_components_qr__code__generator_features.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_qr__code__generator_features.cc deleted file mode 100644 index 3ec6f5e3413e..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_qr__code__generator_features.cc +++ /dev/null @@ -1,13 +0,0 @@ ---- src/3rdparty/chromium/components/qr_code_generator/features.cc.orig 2024-02-23 21:04:38 UTC -+++ src/3rdparty/chromium/components/qr_code_generator/features.cc -@@ -11,6 +11,10 @@ namespace qr_code_generator { - - BASE_FEATURE(kRustyQrCodeGeneratorFeature, - "RustyQrCodeGenerator", -+#if BUILDFLAG(IS_BSD) -+ base::FEATURE_DISABLED_BY_DEFAULT); -+#else - base::FEATURE_ENABLED_BY_DEFAULT); -+#endif - - } // namespace qr_code_generator diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_qr__code__generator_features.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_qr__code__generator_features.h deleted file mode 100644 index 5efb11c19bc6..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_qr__code__generator_features.h +++ /dev/null @@ -1,14 +0,0 @@ ---- src/3rdparty/chromium/components/qr_code_generator/features.h.orig 2024-01-30 07:53:34 UTC -+++ src/3rdparty/chromium/components/qr_code_generator/features.h -@@ -26,7 +26,11 @@ BASE_DECLARE_FEATURE(kRustyQrCodeGeneratorFeature); - // See https://crbug.com/1431991 for more details about the feature and the - // Rust QR Code Generator project. - inline bool IsRustyQrCodeGeneratorFeatureEnabled() { -+#ifdef notyet - return base::FeatureList::IsEnabled(kRustyQrCodeGeneratorFeature); -+#else -+ return false; -+#endif - } - - } // namespace qr_code_generator diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_qr__code__generator_qr__code__generator.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_qr__code__generator_qr__code__generator.cc deleted file mode 100644 index ec91cb953e18..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_qr__code__generator_qr__code__generator.cc +++ /dev/null @@ -1,47 +0,0 @@ ---- src/3rdparty/chromium/components/qr_code_generator/qr_code_generator.cc.orig 2024-02-23 21:04:38 UTC -+++ src/3rdparty/chromium/components/qr_code_generator/qr_code_generator.cc -@@ -11,12 +11,16 @@ - #include - - #include "base/check_op.h" -+#ifdef notyet - #include "base/containers/span_rust.h" -+#endif - #include "base/memory/raw_ptr.h" - #include "base/notreached.h" - #include "base/numerics/safe_conversions.h" - #include "components/qr_code_generator/features.h" -+#ifdef notyet - #include "components/qr_code_generator/qr_code_generator_ffi_glue.rs.h" -+#endif - - namespace qr_code_generator { - -@@ -572,6 +576,7 @@ size_t SegmentSpanLength(base::span GenerateQrCodeUsingRust( - base::span in, - absl::optional min_version) { -@@ -596,6 +601,7 @@ absl::optional Generat - CHECK_EQ(code.data.size(), static_cast(code.qr_size * code.qr_size)); - return code; - } -+#endif - - } // namespace - -@@ -613,9 +619,11 @@ QRCodeGenerator::GeneratedCode::~GeneratedCode() = def - absl::optional QRCodeGenerator::Generate( - base::span in, - absl::optional min_version) { -+#ifdef notyet - if (IsRustyQrCodeGeneratorFeatureEnabled()) { - return GenerateQrCodeUsingRust(in, min_version); - } -+#endif - - if (in.size() > kMaxInputSize) { - return absl::nullopt; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_safe__browsing_content_resources_gen__file__type__proto.py b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_safe__browsing_content_resources_gen__file__type__proto.py index bdf0bdb12355..d564950f63ab 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_safe__browsing_content_resources_gen__file__type__proto.py +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_safe__browsing_content_resources_gen__file__type__proto.py @@ -1,15 +1,15 @@ ---- src/3rdparty/chromium/components/safe_browsing/content/resources/gen_file_type_proto.py.orig 2023-01-11 09:17:16 UTC +--- src/3rdparty/chromium/components/safe_browsing/content/resources/gen_file_type_proto.py.orig 2024-08-26 12:06:38 UTC +++ src/3rdparty/chromium/components/safe_browsing/content/resources/gen_file_type_proto.py -@@ -38,6 +38,8 @@ def PlatformTypes(): - "fuchsia": - download_file_types_pb2.DownloadFileType.PLATFORM_TYPE_FUCHSIA, +@@ -37,6 +37,8 @@ def PlatformTypes(): + "chromeos": + download_file_types_pb2.DownloadFileType.PLATFORM_TYPE_CHROME_OS, "linux": download_file_types_pb2.DownloadFileType.PLATFORM_TYPE_LINUX, + "openbsd": download_file_types_pb2.DownloadFileType.PLATFORM_TYPE_LINUX, + "freebsd": download_file_types_pb2.DownloadFileType.PLATFORM_TYPE_LINUX, "mac": download_file_types_pb2.DownloadFileType.PLATFORM_TYPE_MAC, "win": download_file_types_pb2.DownloadFileType.PLATFORM_TYPE_WINDOWS, - } -@@ -181,7 +183,7 @@ class DownloadFileTypeProtoGenerator(BinaryProtoGenera + # LINT.ThenChange(BUILD.gn:PlatformTypes) +@@ -179,7 +181,7 @@ class DownloadFileTypeProtoGenerator(BinaryProtoGenera '-t', '--type', help='The platform type. One of android, chromeos, ' + diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_safe__browsing_core_browser_db_v4__protocol__manager__util.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_safe__browsing_core_browser_db_v4__protocol__manager__util.cc index 9a59f366b1ca..6f6cebb8d418 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_safe__browsing_core_browser_db_v4__protocol__manager__util.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_safe__browsing_core_browser_db_v4__protocol__manager__util.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/components/safe_browsing/core/browser/db/v4_protocol_manager_util.cc.orig 2023-12-10 06:10:27 UTC +--- src/3rdparty/chromium/components/safe_browsing/core/browser/db/v4_protocol_manager_util.cc.orig 2024-09-30 07:45:04 UTC +++ src/3rdparty/chromium/components/safe_browsing/core/browser/db/v4_protocol_manager_util.cc -@@ -116,7 +116,7 @@ std::ostream& operator<<(std::ostream& os, const ListI +@@ -119,7 +119,7 @@ std::ostream& operator<<(std::ostream& os, const ListI PlatformType GetCurrentPlatformType() { #if BUILDFLAG(IS_WIN) return WINDOWS_PLATFORM; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_safe__browsing_core_browser_realtime_url__lookup__service__base.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_safe__browsing_core_browser_realtime_url__lookup__service__base.cc index a1dc6484a884..41a580d4f00d 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_safe__browsing_core_browser_realtime_url__lookup__service__base.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_safe__browsing_core_browser_realtime_url__lookup__service__base.cc @@ -1,7 +1,7 @@ ---- src/3rdparty/chromium/components/safe_browsing/core/browser/realtime/url_lookup_service_base.cc.orig 2022-02-28 16:54:41 UTC +--- src/3rdparty/chromium/components/safe_browsing/core/browser/realtime/url_lookup_service_base.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/components/safe_browsing/core/browser/realtime/url_lookup_service_base.cc -@@ -109,7 +109,7 @@ RTLookupRequest::OSType GetRTLookupRequestOSType() { - return RTLookupRequest::OS_TYPE_FUCHSIA; +@@ -110,7 +110,7 @@ RTLookupRequest::OSType GetRTLookupRequestOSType() { + return RTLookupRequest::OS_TYPE_CHROME_OS; #elif BUILDFLAG(IS_IOS) return RTLookupRequest::OS_TYPE_IOS; -#elif BUILDFLAG(IS_LINUX) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_safe__browsing_core_common_features.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_safe__browsing_core_common_features.cc index 06925fa38d05..5e15e5c695ee 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_safe__browsing_core_common_features.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_safe__browsing_core_common_features.cc @@ -1,11 +1,11 @@ ---- src/3rdparty/chromium/components/safe_browsing/core/common/features.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/components/safe_browsing/core/common/features.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/components/safe_browsing/core/common/features.cc -@@ -201,7 +201,7 @@ BASE_FEATURE(kSafeBrowsingSkipSubresources, - BASE_FEATURE(kSafeBrowsingSkipSubresources2, - "SafeBrowsingSkipSubResources2", +@@ -237,7 +237,7 @@ BASE_FEATURE(kRippleForEnhancedProtection, + BASE_FEATURE(kSafeBrowsingAsyncRealTimeCheck, + "SafeBrowsingAsyncRealTimeCheck", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS_LACROS) -+ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_search__engines_search__engine__choice_search__engine__choice__service.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_search__engines_search__engine__choice_search__engine__choice__service.cc new file mode 100644 index 000000000000..55b6a288ca0c --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_search__engines_search__engine__choice_search__engine__choice__service.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/components/search_engines/search_engine_choice/search_engine_choice_service.cc.orig 2024-10-22 08:31:56 UTC ++++ src/3rdparty/chromium/components/search_engines/search_engine_choice/search_engine_choice_service.cc +@@ -594,7 +594,7 @@ void SearchEngineChoiceService::RegisterLocalStatePref + + 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/qt6-webengine/files/patch-src_3rdparty_chromium_components_search__engines_template__url__service.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_search__engines_template__url__service.cc index 9f4f9b8b075e..1739649004be 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_search__engines_template__url__service.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_search__engines_template__url__service.cc @@ -1,11 +1,11 @@ ---- src/3rdparty/chromium/components/search_engines/template_url_service.cc.orig 2024-02-29 08:25:16 UTC +--- src/3rdparty/chromium/components/search_engines/template_url_service.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/components/search_engines/template_url_service.cc -@@ -2915,7 +2915,7 @@ bool TemplateURLService::MatchesDefaultSearchProvider( +@@ -3060,7 +3060,7 @@ bool TemplateURLService::MatchesDefaultSearchProvider( std::unique_ptr TemplateURLService::GetEnterpriseSiteSearchManager(PrefService* prefs) { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS_ASH) -+ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) return base::FeatureList::IsEnabled(omnibox::kSiteSearchSettingsPolicy) ? std::make_unique( prefs, base::BindRepeating( diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_services_screen__ai_public_cpp_utilities.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_services_screen__ai_public_cpp_utilities.cc deleted file mode 100644 index 784fcadcebcc..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_services_screen__ai_public_cpp_utilities.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- src/3rdparty/chromium/components/services/screen_ai/public/cpp/utilities.cc.orig 2024-02-23 21:04:38 UTC -+++ src/3rdparty/chromium/components/services/screen_ai/public/cpp/utilities.cc -@@ -32,7 +32,7 @@ constexpr char kScreenAIDlcRootPath[] = - "/run/imageloader/screen-ai/package/root/"; - #endif - --#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"); - -@@ -72,7 +72,7 @@ base::FilePath GetComponentDir() { - } - - base::FilePath GetLatestComponentBinaryPath() { --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - if (features::IsScreenAITestModeEnabled()) { - CHECK_IS_TEST(); - return GetTestComponentBinaryPath(); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.cc deleted file mode 100644 index f3b1f5a23310..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.cc +++ /dev/null @@ -1,18 +0,0 @@ ---- src/3rdparty/chromium/components/services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.cc.orig 2024-01-30 07:53:34 UTC -+++ src/3rdparty/chromium/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 permissions{ -@@ -75,6 +76,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/qt6-webengine/files/patch-src_3rdparty_chromium_components_services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.h deleted file mode 100644 index 6b7b6ea44244..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.h +++ /dev/null @@ -1,16 +0,0 @@ ---- src/3rdparty/chromium/components/services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.h.orig 2023-04-28 17:01:32 UTC -+++ src/3rdparty/chromium/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/qt6-webengine/files/patch-src_3rdparty_chromium_components_signin_public_base_signin__switches.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_signin_public_base_signin__switches.cc deleted file mode 100644 index d791d36f0857..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_signin_public_base_signin__switches.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/components/signin/public/base/signin_switches.cc.orig 2024-07-03 01:14:49 UTC -+++ src/3rdparty/chromium/components/signin/public/base/signin_switches.cc -@@ -102,7 +102,7 @@ BASE_FEATURE(kUnoDesktop, "UnoDesktop", base::FEATURE_ - BASE_FEATURE(kUnoDesktop, "UnoDesktop", base::FEATURE_DISABLED_BY_DEFAULT); - - #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); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_signin_public_base_signin__switches.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_signin_public_base_signin__switches.h deleted file mode 100644 index 95e273e34b2c..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_signin_public_base_signin__switches.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/components/signin/public/base/signin_switches.h.orig 2024-02-23 21:04:38 UTC -+++ src/3rdparty/chromium/components/signin/public/base/signin_switches.h -@@ -92,7 +92,7 @@ BASE_DECLARE_FEATURE(kUnoDesktop); - - // 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) - BASE_DECLARE_FEATURE(kMinorModeRestrictionsForHistorySyncOptIn); - #endif - diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_soda_soda__util.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_soda_soda__util.cc new file mode 100644 index 000000000000..1713989bb166 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_soda_soda__util.cc @@ -0,0 +1,29 @@ +--- src/3rdparty/chromium/components/soda/soda_util.cc.orig 2024-09-30 07:45:04 UTC ++++ src/3rdparty/chromium/components/soda/soda_util.cc +@@ -27,7 +27,7 @@ + #include "base/win/windows_version.h" + #endif + +-#if BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_X86_FAMILY) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_X86_FAMILY) + #include "base/cpu.h" + #endif + +@@ -52,7 +52,7 @@ bool IsSupportedChromeOS() { + } + #endif // BUILDFLAG(IS_CHROMEOS) + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + bool IsSupportedLinux() { + #if defined(ARCH_CPU_X86_FAMILY) + // Check if the CPU has the required instruction set to run the Speech +@@ -83,7 +83,7 @@ bool IsSupportedWin() { + bool IsOnDeviceSpeechRecognitionSupported() { + #if BUILDFLAG(IS_CHROMEOS) + return IsSupportedChromeOS(); +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + return IsSupportedLinux(); + #elif BUILDFLAG(IS_WIN) + return IsSupportedWin(); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_startup__metric__utils_common_startup__metric__utils.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_startup__metric__utils_common_startup__metric__utils.cc index 21005be66449..93795121b94e 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_startup__metric__utils_common_startup__metric__utils.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_startup__metric__utils_common_startup__metric__utils.cc @@ -1,9 +1,9 @@ ---- src/3rdparty/chromium/components/startup_metric_utils/common/startup_metric_utils.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/components/startup_metric_utils/common/startup_metric_utils.cc.orig 2024-08-26 12:06:38 UTC +++ src/3rdparty/chromium/components/startup_metric_utils/common/startup_metric_utils.cc -@@ -85,7 +85,7 @@ base::TimeTicks CommonStartupMetricRecorder::StartupTi +@@ -94,7 +94,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. + // TODO(crbug.com/40464036): Remove IS_APPLE ifdef once utility processes + // set their desired main thread priority. -#if !BUILDFLAG(IS_APPLE) +#if !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD) static bool statics_initialized = false; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_storage__monitor_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_storage__monitor_BUILD.gn index 0ba648cfe5a9..fcac51b90320 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_storage__monitor_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_storage__monitor_BUILD.gn @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/components/storage_monitor/BUILD.gn.orig 2024-07-03 01:14:49 UTC +--- src/3rdparty/chromium/components/storage_monitor/BUILD.gn.orig 2025-02-21 12:29:33 UTC +++ src/3rdparty/chromium/components/storage_monitor/BUILD.gn -@@ -78,7 +78,7 @@ jumbo_static_library("storage_monitor") { +@@ -76,7 +76,7 @@ jumbo_static_library("storage_monitor") { deps += [ "//services/device/public/mojom" ] } } else if (is_linux || is_chromeos_lacros) { @@ -9,7 +9,7 @@ sources += [ "mtab_watcher_linux.cc", "mtab_watcher_linux.h", -@@ -185,7 +185,7 @@ source_set("unit_tests") { +@@ -181,7 +181,7 @@ source_set("unit_tests") { "storage_monitor_chromeos_unittest.cc", ] } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_supervised__user_core_browser_supervised__user__metrics__service.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_supervised__user_core_browser_supervised__user__metrics__service.cc new file mode 100644 index 000000000000..9090384e1feb --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_supervised__user_core_browser_supervised__user__metrics__service.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/components/supervised_user/core/browser/supervised_user_metrics_service.cc.orig 2024-07-30 11:12:21 UTC ++++ src/3rdparty/chromium/components/supervised_user/core/browser/supervised_user_metrics_service.cc +@@ -47,7 +47,7 @@ SupervisedUserMetricsService::SupervisedUserMetricsSer + extensions_metrics_delegate_(std::move(extensions_metrics_delegate)) { + DCHECK(pref_service_); + DCHECK(url_filter_); +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + CHECK(extensions_metrics_delegate_) + << "Extensions metrics delegate must exist on Win/Linux/Mac"; + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_supervised__user_core_browser_supervised__user__preferences.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_supervised__user_core_browser_supervised__user__preferences.cc new file mode 100644 index 000000000000..9c5b1eb3fcdd --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_supervised__user_core_browser_supervised__user__preferences.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/components/supervised_user/core/browser/supervised_user_preferences.cc.orig 2024-09-30 07:45:04 UTC ++++ src/3rdparty/chromium/components/supervised_user/core/browser/supervised_user_preferences.cc +@@ -147,7 +147,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry + registry->RegisterBooleanPref(prefs::kChildAccountStatusKnown, false); + registry->RegisterStringPref(prefs::kFamilyLinkUserMemberRole, std::string()); + #if BUILDFLAG(ENABLE_EXTENSIONS) && \ +- (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)) ++ (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) + registry->RegisterIntegerPref( + prefs::kLocallyParentApprovedExtensionsMigrationState, + static_cast( diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_supervised__user_core_browser_supervised__user__service.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_supervised__user_core_browser_supervised__user__service.cc index 081a1691cb22..3e8480327dc4 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_supervised__user_core_browser_supervised__user__service.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_supervised__user_core_browser_supervised__user__service.cc @@ -1,11 +1,11 @@ ---- src/3rdparty/chromium/components/supervised_user/core/browser/supervised_user_service.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/components/supervised_user/core/browser/supervised_user_service.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/components/supervised_user/core/browser/supervised_user_service.cc -@@ -164,7 +164,7 @@ FirstTimeInterstitialBannerState SupervisedUserService +@@ -152,7 +152,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 (original_state != FirstTimeInterstitialBannerState::kSetupComplete && - can_show_first_time_interstitial_banner_) { + if (original_state != FirstTimeInterstitialBannerState::kSetupComplete && + can_show_first_time_interstitial_banner_) { + target_state = FirstTimeInterstitialBannerState::kNeedToShow; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_supervised__user_core_common_features.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_supervised__user_core_common_features.cc index 551d9d381553..2a3b83548b58 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_supervised__user_core_common_features.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_supervised__user_core_common_features.cc @@ -1,56 +1,45 @@ ---- src/3rdparty/chromium/components/supervised_user/core/common/features.cc.orig 2024-07-03 01:14:49 UTC +--- src/3rdparty/chromium/components/supervised_user/core/common/features.cc.orig 2025-02-21 12:29:33 UTC +++ src/3rdparty/chromium/components/supervised_user/core/common/features.cc -@@ -64,7 +64,7 @@ bool IsLocalWebApprovalsEnabled() { - // particular aspects. If one or more of these sub-feature flags are enabled, - // then child account detection logic is implicitly enabled. - #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ -- BUILDFLAG(IS_IOS) -+ BUILDFLAG(IS_IOS) || BUILDFLAG(IS_BSD) - BASE_FEATURE(kFilterWebsitesForSupervisedUsersOnDesktopAndIOS, - "FilterWebsitesForSupervisedUsersOnDesktopAndIOS", - base::FEATURE_ENABLED_BY_DEFAULT); -@@ -74,7 +74,7 @@ BASE_FEATURE(kFilterWebsitesForSupervisedUsersOnDeskto +@@ -67,7 +67,7 @@ BASE_FEATURE(kUpdatedSupervisedUserExtensionApprovalSt + "UpdatedSupervisedUserExtensionApprovalStrings", base::FEATURE_DISABLED_BY_DEFAULT); - #endif --#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(kSupervisedPrefsControlledBySupervisedStore, - "SupervisedPrefsControlledBySupervisedStore", - base::FEATURE_ENABLED_BY_DEFAULT); -@@ -86,7 +86,7 @@ BASE_FEATURE(kSupervisedPrefsControlledBySupervisedSto +-#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); +@@ -82,7 +82,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 = +@@ -107,13 +107,13 @@ BASE_FEATURE(kSupervisedUserProfileSigninIPH, + "SupervisedUserProfileSigninIPH", + base::FEATURE_DISABLED_BY_DEFAULT); - // Whether to display a "Managed by your parent" or similar text for supervised - // users in various UI surfaces. -#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(kEnableManagedByParentUi, - "EnableManagedByParentUi", - base::FEATURE_ENABLED_BY_DEFAULT); -@@ -96,7 +96,7 @@ BASE_FEATURE(kEnableManagedByParentUi, + BASE_FEATURE(kShowKiteForSupervisedUsers, + "ShowKiteForSupervisedUsers", base::FEATURE_DISABLED_BY_DEFAULT); #endif --#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", +-#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(kHideGuestModeForSupervisedUsers, + "HideGuestModeForSupervisedUsers", + base::FEATURE_DISABLED_BY_DEFAULT); +@@ -123,7 +123,7 @@ BASE_FEATURE(kForceSafeSearchForUnauthenticatedSupervi + "ForceSafeSearchForUnauthenticatedSupervisedUsers", base::FEATURE_DISABLED_BY_DEFAULT); -@@ -115,7 +115,7 @@ bool CanDisplayFirstTimeInterstitialBanner() { - // When enabled non-syncing signed in supervised users will not be signed out of - // their google account when cookies are cleared -#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(kClearingCookiesKeepsSupervisedUsersSignedIn, - "ClearingCookiesKeepsSupervisedUsersSignedIn", - base::FEATURE_ENABLED_BY_DEFAULT); -@@ -162,7 +162,7 @@ bool IsChildAccountSupervisionEnabled() { - return base::FeatureList::IsEnabled( - supervised_user:: - kFilterWebsitesForSupervisedUsersOnDesktopAndIOS) || --#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - base::FeatureList::IsEnabled( - supervised_user:: - kEnableExtensionsPermissionsForSupervisedUsersOnDesktop) || + BASE_FEATURE(kForceSupervisedUserReauthenticationForYouTube, + "ForceSupervisedUserReauthenticationForYouTube", + base::FEATURE_DISABLED_BY_DEFAULT); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_supervised__user_core_common_features.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_supervised__user_core_common_features.h index fa546fc35858..9de7071fe1c4 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_supervised__user_core_common_features.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_supervised__user_core_common_features.h @@ -1,11 +1,34 @@ ---- src/3rdparty/chromium/components/supervised_user/core/common/features.h.orig 2023-12-10 06:10:27 UTC +--- src/3rdparty/chromium/components/supervised_user/core/common/features.h.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/components/supervised_user/core/common/features.h -@@ -24,7 +24,7 @@ BASE_DECLARE_FEATURE(kEnableManagedByParentUi); - extern const base::FeatureParam kManagedByParentUiMoreInfoUrl; - BASE_DECLARE_FEATURE(kClearingCookiesKeepsSupervisedUsersSignedIn); +@@ -25,7 +25,7 @@ BASE_DECLARE_FEATURE( + // Applies new informative strings during the parental extension approval flow. + BASE_DECLARE_FEATURE(kUpdatedSupervisedUserExtensionApprovalStrings); -#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 +@@ -59,11 +59,11 @@ BASE_DECLARE_FEATURE(kSupervisedUserProfileSigninIPH); + + // Displays a Family Link kite badge on the supervised user avatar in various + // surfaces. +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + BASE_DECLARE_FEATURE(kShowKiteForSupervisedUsers); + #endif + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + // This hides the following guest mode entry points for supervised users: + // + // * In the Profile menu for supervised profiles +@@ -75,7 +75,7 @@ BASE_DECLARE_FEATURE(kHideGuestModeForSupervisedUsers) + // unauthenticated (e.g. signed out of the content area) account. + BASE_DECLARE_FEATURE(kForceSafeSearchForUnauthenticatedSupervisedUsers); + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + // Force re-authentication when an unauthenticated supervised user tries to + // access YouTube, so that content restrictions can be applied. + BASE_DECLARE_FEATURE(kForceSupervisedUserReauthenticationForYouTube); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_supervised__user_core_common_pref__names.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_supervised__user_core_common_pref__names.h new file mode 100644 index 000000000000..fc75a77dbd40 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_supervised__user_core_common_pref__names.h @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/components/supervised_user/core/common/pref_names.h.orig 2024-07-30 11:12:21 UTC ++++ src/3rdparty/chromium/components/supervised_user/core/common/pref_names.h +@@ -137,7 +137,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/qt6-webengine/files/patch-src_3rdparty_chromium_components_sync__device__info_local__device__info__util.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_sync__device__info_local__device__info__util.cc index 4c825d79ccdb..cc8d26204f9d 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_sync__device__info_local__device__info__util.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_sync__device__info_local__device__info__util.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/components/sync_device_info/local_device_info_util.cc.orig 2023-09-13 12:11:42 UTC +--- src/3rdparty/chromium/components/sync_device_info/local_device_info_util.cc.orig 2024-09-30 07:45:04 UTC +++ src/3rdparty/chromium/components/sync_device_info/local_device_info_util.cc -@@ -82,7 +82,7 @@ void OnMachineStatisticsLoaded(LocalDeviceNameInfo* na +@@ -85,7 +85,7 @@ void OnMachineStatisticsLoaded(LocalDeviceNameInfo* na sync_pb::SyncEnums::DeviceType GetLocalDeviceType() { #if BUILDFLAG(IS_CHROMEOS) return sync_pb::SyncEnums_DeviceType_TYPE_CROS; @@ -9,7 +9,7 @@ return sync_pb::SyncEnums_DeviceType_TYPE_LINUX; #elif BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) switch (ui::GetDeviceFormFactor()) { -@@ -107,7 +107,7 @@ DeviceInfo::OsType GetLocalDeviceOSType() { +@@ -110,7 +110,7 @@ DeviceInfo::OsType GetLocalDeviceOSType() { return DeviceInfo::OsType::kChromeOsAsh; #elif BUILDFLAG(IS_CHROMEOS_LACROS) return DeviceInfo::OsType::kChromeOsLacros; @@ -18,7 +18,7 @@ return DeviceInfo::OsType::kLinux; #elif BUILDFLAG(IS_ANDROID) return DeviceInfo::OsType::kAndroid; -@@ -126,7 +126,7 @@ DeviceInfo::OsType GetLocalDeviceOSType() { +@@ -129,7 +129,7 @@ DeviceInfo::OsType GetLocalDeviceOSType() { DeviceInfo::FormFactor GetLocalDeviceFormFactor() { #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_system__cpu_cpu__probe.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_system__cpu_cpu__probe.cc new file mode 100644 index 000000000000..279e4d00c55a --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_system__cpu_cpu__probe.cc @@ -0,0 +1,12 @@ +--- src/3rdparty/chromium/components/system_cpu/cpu_probe.cc.orig 2024-02-23 21:04:38 UTC ++++ src/3rdparty/chromium/components/system_cpu/cpu_probe.cc +@@ -30,6 +30,9 @@ std::unique_ptr 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/qt6-webengine/files/patch-src_3rdparty_chromium_components_trusted__vault_trusted__vault__connection__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_trusted__vault_trusted__vault__connection__impl.cc new file mode 100644 index 000000000000..11614709e0d3 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_trusted__vault_trusted__vault__connection__impl.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/components/trusted_vault/trusted_vault_connection_impl.cc.orig 2024-10-22 08:31:56 UTC ++++ src/3rdparty/chromium/components/trusted_vault/trusted_vault_connection_impl.cc +@@ -102,7 +102,7 @@ GetLocalPhysicalDeviceType() { + // currently used or even built on all platforms. + #if BUILDFLAG(IS_CHROMEOS) + return trusted_vault_pb::PhysicalDeviceMetadata::DEVICE_TYPE_CHROMEOS; +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + return trusted_vault_pb::PhysicalDeviceMetadata::DEVICE_TYPE_LINUX; + #elif BUILDFLAG(IS_ANDROID) + return trusted_vault_pb::PhysicalDeviceMetadata::DEVICE_TYPE_ANDROID; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_update__client_update__query__params.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_update__client_update__query__params.cc index 8e39f14d2c90..be51222521a8 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_update__client_update__query__params.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_update__client_update__query__params.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/components/update_client/update_query_params.cc.orig 2023-07-16 15:47:57 UTC +--- src/3rdparty/chromium/components/update_client/update_query_params.cc.orig 2024-09-30 07:45:04 UTC +++ src/3rdparty/chromium/components/update_client/update_query_params.cc -@@ -42,6 +42,8 @@ const char kOs[] = +@@ -40,6 +40,8 @@ const char kOs[] = "fuchsia"; #elif BUILDFLAG(IS_OPENBSD) "openbsd"; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_user__education_views_help__bubble__view.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_user__education_views_help__bubble__view.cc index 67c3cd176ebe..98ec7812edd8 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_user__education_views_help__bubble__view.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_user__education_views_help__bubble__view.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/components/user_education/views/help_bubble_view.cc.orig 2024-01-30 07:53:34 UTC +--- src/3rdparty/chromium/components/user_education/views/help_bubble_view.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/components/user_education/views/help_bubble_view.cc -@@ -1009,7 +1009,7 @@ gfx::Rect HelpBubbleView::GetAnchorRect() const { +@@ -852,7 +852,7 @@ gfx::Rect HelpBubbleView::GetAnchorRect() const { void HelpBubbleView::OnBeforeBubbleWidgetInit(views::Widget::InitParams* params, views::Widget* widget) const { BubbleDialogDelegateView::OnBeforeBubbleWidgetInit(params, widget); @@ -8,4 +8,4 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Help bubbles anchored to menus may be clipped to their anchors' bounds, // resulting in visual errors, unless they use accelerated rendering. See - // crbug.com/1445770 for details. + // crbug.com/1445770 for details. This also applies to bubbles anchored to diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_variations_service_variations__service.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_variations_service_variations__service.cc index 3b52feef7e0e..43f09c0ab8f6 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_variations_service_variations__service.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_variations_service_variations__service.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/components/variations/service/variations_service.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/components/variations/service/variations_service.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/components/variations/service/variations_service.cc -@@ -98,7 +98,7 @@ std::string GetPlatformString() { +@@ -102,7 +102,7 @@ std::string GetPlatformString() { return "android"; #elif BUILDFLAG(IS_FUCHSIA) return "fuchsia"; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_visited__url__ranking_public_url__visit__util.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_visited__url__ranking_public_url__visit__util.cc new file mode 100644 index 000000000000..65f2cb8da1bb --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_visited__url__ranking_public_url__visit__util.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/components/visited_url_ranking/public/url_visit_util.cc.orig 2024-10-22 08:31:56 UTC ++++ src/3rdparty/chromium/components/visited_url_ranking/public/url_visit_util.cc +@@ -66,7 +66,7 @@ PlatformType GetPlatformInput() { + return PlatformType::kWindows; + #elif BUILDFLAG(IS_MAC) + return PlatformType::kMac; +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + return PlatformType::kLinux; + #elif BUILDFLAG(IS_IOS) + return PlatformType::kIos; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_viz_host_host__display__client.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_viz_host_host__display__client.cc index 8b61620d5556..92e8ed239070 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_viz_host_host__display__client.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_viz_host_host__display__client.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/components/viz/host/host_display_client.cc.orig 2024-01-30 07:53:34 UTC +--- src/3rdparty/chromium/components/viz/host/host_display_client.cc.orig 2024-05-21 18:07:39 UTC +++ src/3rdparty/chromium/components/viz/host/host_display_client.cc -@@ -64,7 +64,7 @@ void HostDisplayClient::AddChildWindowToBrowser( +@@ -65,7 +65,7 @@ void HostDisplayClient::AddChildWindowToBrowser( } #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_viz_service_display__embedder_skia__output__surface__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_viz_service_display__embedder_skia__output__surface__impl.cc index 2bad4b621fad..2a5688871362 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_viz_service_display__embedder_skia__output__surface__impl.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_viz_service_display__embedder_skia__output__surface__impl.cc @@ -1,9 +1,9 @@ ---- src/3rdparty/chromium/components/viz/service/display_embedder/skia_output_surface_impl.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/components/viz/service/display_embedder/skia_output_surface_impl.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/components/viz/service/display_embedder/skia_output_surface_impl.cc -@@ -1549,7 +1549,7 @@ GrBackendFormat SkiaOutputSurfaceImpl::GetGrBackendFor - ->GetDeviceQueue() - ->GetVulkanPhysicalDevice(), - VK_IMAGE_TILING_OPTIMAL, vk_format, yuv_color_space, ycbcr_info); +@@ -1498,7 +1498,7 @@ GrBackendFormat SkiaOutputSurfaceImpl::GetGrBackendFor + ->GetVulkanPhysicalDevice(), + 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 diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_viz_service_display__embedder_software__output__surface.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_viz_service_display__embedder_software__output__surface.cc index ce6d02f474a6..001c32836c8a 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_viz_service_display__embedder_software__output__surface.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_viz_service_display__embedder_software__output__surface.cc @@ -1,17 +1,17 @@ ---- src/3rdparty/chromium/components/viz/service/display_embedder/software_output_surface.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/components/viz/service/display_embedder/software_output_surface.cc.orig 2024-09-30 07:45:04 UTC +++ src/3rdparty/chromium/components/viz/service/display_embedder/software_output_surface.cc -@@ -124,7 +124,7 @@ void SoftwareOutputSurface::SwapBuffersCallback(base:: +@@ -115,7 +115,7 @@ void SoftwareOutputSurface::SwapBuffersCallback(base:: now.SnappedToNextTick(refresh_timebase_, refresh_interval_) - now; - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // TODO(crbug.com/40118868): 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 (needs_swap_size_notifications_) client_->DidSwapWithSize(pixel_size); #endif -@@ -153,7 +153,7 @@ gfx::OverlayTransform SoftwareOutputSurface::GetDispla +@@ -144,7 +144,7 @@ gfx::OverlayTransform SoftwareOutputSurface::GetDispla - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // TODO(crbug.com/40118868): 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) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_viz_service_display__embedder_software__output__surface.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_viz_service_display__embedder_software__output__surface.h index 4a4f87be7964..1158b2b183cf 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_viz_service_display__embedder_software__output__surface.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_viz_service_display__embedder_software__output__surface.h @@ -1,17 +1,17 @@ ---- src/3rdparty/chromium/components/viz/service/display_embedder/software_output_surface.h.orig 2023-12-10 06:10:27 UTC +--- src/3rdparty/chromium/components/viz/service/display_embedder/software_output_surface.h.orig 2024-09-30 07:45:04 UTC +++ src/3rdparty/chromium/components/viz/service/display_embedder/software_output_surface.h -@@ -47,7 +47,7 @@ class VIZ_SERVICE_EXPORT SoftwareOutputSurface : publi +@@ -44,7 +44,7 @@ class VIZ_SERVICE_EXPORT SoftwareOutputSurface : publi gfx::OverlayTransform GetDisplayTransform() override; - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // TODO(crbug.com/40118868): 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 SetNeedsSwapSizeNotifications( bool needs_swap_size_notifications) override; #endif -@@ -70,7 +70,7 @@ class VIZ_SERVICE_EXPORT SoftwareOutputSurface : publi +@@ -64,7 +64,7 @@ class VIZ_SERVICE_EXPORT SoftwareOutputSurface : publi - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // TODO(crbug.com/40118868): 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) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_viz_service_display_skia__renderer.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_viz_service_display_skia__renderer.cc index 80fb716075d4..d6cf73348cc9 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_viz_service_display_skia__renderer.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_viz_service_display_skia__renderer.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/components/viz/service/display/skia_renderer.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/components/viz/service/display/skia_renderer.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/components/viz/service/display/skia_renderer.cc -@@ -1346,7 +1346,7 @@ void SkiaRenderer::ClearFramebuffer() { +@@ -1363,7 +1363,7 @@ void SkiaRenderer::ClearFramebuffer() { if (current_frame()->current_render_pass->has_transparent_background) { ClearCanvas(SkColors::kTransparent); } else { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc index d45d99f69e61..900c94316e74 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig 2024-01-30 07:53:34 UTC +--- src/3rdparty/chromium/components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc -@@ -109,7 +109,7 @@ RootCompositorFrameSinkImpl::Create( +@@ -113,7 +113,7 @@ RootCompositorFrameSinkImpl::Create( output_surface->SetNeedsSwapSizeNotifications( params->send_swap_size_notifications); @@ -9,10 +9,10 @@ // 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); -@@ -713,7 +713,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw - #if BUILDFLAG(IS_ANDROID) - if (display_client_ && enable_swap_competion_callback_) +@@ -793,7 +793,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw + if (display_client_ && enable_swap_completion_callback_) { display_client_->DidCompleteSwapWithSize(pixel_size); + } -#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_) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h index a07a3632f4bb..e3235296e9e4 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h @@ -1,8 +1,8 @@ ---- src/3rdparty/chromium/components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h.orig 2024-01-30 07:53:34 UTC +--- src/3rdparty/chromium/components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h.orig 2024-09-30 07:45:04 UTC +++ src/3rdparty/chromium/components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h -@@ -210,7 +210,7 @@ class VIZ_SERVICE_EXPORT RootCompositorFrameSinkImpl - // to actually unref. - LocalSurfaceId to_evict_on_next_draw_and_swap_ = LocalSurfaceId(); +@@ -231,7 +231,7 @@ class VIZ_SERVICE_EXPORT RootCompositorFrameSinkImpl + // See comments on `EvictionHandler`. + EvictionHandler eviction_handler_; -#if BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11) +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(IS_OZONE_X11) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_app_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_app_BUILD.gn new file mode 100644 index 000000000000..942f2779fe58 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_app_BUILD.gn @@ -0,0 +1,15 @@ +--- src/3rdparty/chromium/content/app/BUILD.gn.orig 2025-02-21 12:29:33 UTC ++++ src/3rdparty/chromium/content/app/BUILD.gn +@@ -97,9 +97,9 @@ source_set("content_main_runner_app") { + "//chromeos/startup:constants", + ] + } +- if (build_tflite_with_xnnpack) { +- deps += [ "//third_party/cpuinfo" ] +- } ++# if (build_tflite_with_xnnpack) { ++# deps += [ "//third_party/cpuinfo" ] ++# } + } + + source_set("app") { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_app_content__main.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_app_content__main.cc index 134ac0181f04..967cc4751d2e 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_app_content__main.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_app_content__main.cc @@ -1,11 +1,20 @@ ---- src/3rdparty/chromium/content/app/content_main.cc.orig 2024-07-03 01:14:49 UTC +--- src/3rdparty/chromium/content/app/content_main.cc.orig 2025-02-21 12:29:33 UTC +++ src/3rdparty/chromium/content/app/content_main.cc -@@ -209,7 +209,7 @@ RunContentProcess(ContentMainParams params, - base::EnableTerminationOnOutOfMemory(); +@@ -229,7 +229,7 @@ NO_STACK_PROTECTOR int RunContentProcess( #endif + logging::RegisterAbslAbortHook(); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // The various desktop environments set this environment variable that // allows the dbus client library to connect directly to the bus. When this // variable is not set (test environments like xvfb-run), the dbus client +@@ -316,7 +316,7 @@ NO_STACK_PROTECTOR int RunContentProcess( + command_line->AppendSwitch(switches::kUseMobileUserAgent); + #endif + +-#if (BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)) && !defined(COMPONENT_BUILD) ++#if (BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)) && !defined(COMPONENT_BUILD) && defined(notyet) + base::subtle::EnableFDOwnershipEnforcement(true); + #endif + diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_app_content__main__runner__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_app_content__main__runner__impl.cc index e7edbde5dbb5..93e00805053d 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_app_content__main__runner__impl.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_app_content__main__runner__impl.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/app/content_main_runner_impl.cc.orig 2024-07-03 01:14:49 UTC +--- src/3rdparty/chromium/content/app/content_main_runner_impl.cc.orig 2025-03-09 19:36:47 UTC +++ src/3rdparty/chromium/content/app/content_main_runner_impl.cc -@@ -143,13 +143,13 @@ +@@ -147,18 +147,20 @@ #include "content/browser/posix_file_descriptor_info_impl.h" #include "content/public/common/content_descriptors.h" @@ -16,7 +16,14 @@ #include "base/files/file_path_watcher_inotify.h" #include "base/native_library.h" #include "base/rand_util.h" -@@ -184,12 +184,16 @@ + #include "content/public/common/zygote/sandbox_support_linux.h" ++#if !BUILDFLAG(IS_BSD) + #include "sandbox/policy/linux/sandbox_linux.h" ++#endif + #include "third_party/boringssl/src/include/openssl/crypto.h" + + #if BUILDFLAG(IS_CHROMEOS_LACROS) +@@ -189,12 +191,16 @@ #include "content/public/common/zygote/zygote_handle.h" #include "content/zygote/zygote_main.h" #include "media/base/media_switches.h" @@ -34,7 +41,7 @@ #if BUILDFLAG(IS_ANDROID) #include "base/system/sys_info.h" #include "content/browser/android/battery_metrics.h" -@@ -379,7 +383,7 @@ void InitializeZygoteSandboxForBrowserProcess( +@@ -406,7 +412,7 @@ void InitializeZygoteSandboxForBrowserProcess( } #endif // BUILDFLAG(USE_ZYGOTE) @@ -43,7 +50,7 @@ #if BUILDFLAG(ENABLE_PPAPI) // Loads the (native) libraries but does not initialize them (i.e., does not -@@ -417,7 +421,10 @@ void PreSandboxInit() { +@@ -444,7 +450,10 @@ void PreSandboxInit() { void PreSandboxInit() { // Ensure the /dev/urandom is opened. @@ -54,7 +61,7 @@ // May use sysinfo(), sched_getaffinity(), and open various /sys/ and /proc/ // files. -@@ -429,9 +436,16 @@ void PreSandboxInit() { +@@ -456,9 +465,16 @@ void PreSandboxInit() { // https://boringssl.googlesource.com/boringssl/+/HEAD/SANDBOXING.md CRYPTO_pre_sandbox_init(); @@ -71,8 +78,17 @@ #if BUILDFLAG(ENABLE_PPAPI) // Ensure access to the Pepper plugins before the sandbox is turned on. -@@ -842,11 +856,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam - kFieldTrialDescriptor + base::GlobalDescriptors::kBaseDescriptor); +@@ -772,7 +788,7 @@ NO_STACK_PROTECTOR int RunOtherNamedProcessTypeMain( + unregister_thread_closure = base::HangWatcher::RegisterThread( + base::HangWatcher::ThreadType::kMainThread); + bool start_hang_watcher_now; +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + // On Linux/ChromeOS, the HangWatcher can't start until after the sandbox is + // initialized, because the sandbox can't be started with multiple threads. + // TODO(mpdenton): start the HangWatcher after the sandbox is initialized. +@@ -882,11 +898,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam + base::GlobalDescriptors::kBaseDescriptor); #endif // !BUILDFLAG(IS_ANDROID) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OPENBSD) @@ -85,7 +101,7 @@ #endif // !BUILDFLAG(IS_WIN) -@@ -1041,8 +1054,20 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam +@@ -1069,8 +1084,20 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam process_type == switches::kZygoteProcess) { PreSandboxInit(); } @@ -106,16 +122,7 @@ delegate_->SandboxInitialized(process_type); #if BUILDFLAG(USE_ZYGOTE) -@@ -1110,7 +1135,7 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { - ->ReconfigureAfterFeatureListInit(process_type); - } - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - // 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 -@@ -1145,6 +1170,11 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { +@@ -1169,6 +1196,11 @@ NO_STACK_PROTECTOR int ContentMainRunnerImpl::Run() { content_main_params_.reset(); RegisterMainThreadFactories(); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_BUILD.gn index caaa1dd6bd64..59d1647cd490 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_BUILD.gn @@ -1,16 +1,33 @@ ---- src/3rdparty/chromium/content/browser/BUILD.gn.orig 2024-10-02 15:40:01 UTC +--- src/3rdparty/chromium/content/browser/BUILD.gn.orig 2025-02-21 12:29:33 UTC +++ src/3rdparty/chromium/content/browser/BUILD.gn -@@ -2463,6 +2463,13 @@ jumbo_source_set("browser") { - deps += [ "//media/mojo/mojom/stable:stable_video_decoder" ] +@@ -2438,6 +2438,14 @@ jumbo_source_set("browser") { + ] } ++ if (is_bsd) { ++ sources += [ ++ "file_system_access/file_path_watcher/file_path_watcher_bsd.cc", ++ "file_system_access/file_path_watcher/file_path_watcher_kqueue.cc", ++ "file_system_access/file_path_watcher/file_path_watcher_kqueue.h", ++ ] ++ } ++ + if (is_linux || is_chromeos) { + sources += [ + "child_process_launcher_helper_linux.cc", +@@ -2481,6 +2489,15 @@ jumbo_source_set("browser") { + if (allow_oop_video_decoder) { + sources += [ "media/stable_video_decoder_factory.cc" ] + deps += [ "//media/mojo/mojom/stable:stable_video_decoder" ] ++ } ++ + if (is_bsd) { + sources -= [ ++ "file_system_access/file_path_watcher/file_path_watcher_inotify.cc", ++ "file_system_access/file_path_watcher/file_path_watcher_inotify.h", + "sandbox_ipc_linux.cc", + "sandbox_ipc_linux.h", + ] -+ } -+ + } + if (is_chromeos) { - sources += [ - "handwriting/handwriting_recognition_service_impl_cros.cc", diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_audio_audio__service.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_audio_audio__service.cc index b69ef3d01c9c..cf18316945e3 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_audio_audio__service.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_audio_audio__service.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/browser/audio/audio_service.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/content/browser/audio/audio_service.cc.orig 2024-05-21 18:07:39 UTC +++ src/3rdparty/chromium/content/browser/audio/audio_service.cc -@@ -34,7 +34,7 @@ +@@ -32,7 +32,7 @@ #if BUILDFLAG(ENABLE_PASSTHROUGH_AUDIO_CODECS) #include "ui/display/util/edid_parser.h" @@ -9,7 +9,7 @@ #include "ui/display/display_util.h" #endif // BUILDFLAG(IS_LINUX) -@@ -202,7 +202,7 @@ audio::mojom::AudioService& GetAudioService() { +@@ -200,7 +200,7 @@ audio::mojom::AudioService& GetAudioService() { ->PostTaskAndReplyWithResult( FROM_HERE, base::BindOnce(&ScanEdidBitstreams), base::BindOnce(&LaunchAudioService, std::move(receiver))); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_browser__child__process__host__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_browser__child__process__host__impl.cc index 5b96b1ad8d74..f8c77fcb90c7 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_browser__child__process__host__impl.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_browser__child__process__host__impl.cc @@ -1,14 +1,14 @@ ---- src/3rdparty/chromium/content/browser/browser_child_process_host_impl.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/content/browser/browser_child_process_host_impl.cc.orig 2024-09-30 07:45:04 UTC +++ src/3rdparty/chromium/content/browser/browser_child_process_host_impl.cc -@@ -326,6 +326,7 @@ void BrowserChildProcessHostImpl::LaunchWithoutExtraCo - switches::kDisableBestEffortTasks, - switches::kDisableLogging, - switches::kEnableLogging, -+ switches::kDisableUnveil, - switches::kIPCConnectionTimeout, +@@ -328,6 +328,7 @@ void BrowserChildProcessHostImpl::LaunchWithoutExtraCo switches::kLogBestEffortTasks, - switches::kLogFile, -@@ -635,7 +636,7 @@ void BrowserChildProcessHostImpl::OnProcessLaunched() + switches::kPerfettoDisableInterning, + switches::kTraceToConsole, ++ switches::kDisableUnveil, + }; + cmd_line->CopySwitchesFrom(browser_command_line, kForwardSwitches); + +@@ -659,7 +660,7 @@ void BrowserChildProcessHostImpl::OnProcessLaunched() ->child_process()); #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_browser__child__process__host__impl.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_browser__child__process__host__impl.h index b0d805d00c30..637519aea8a3 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_browser__child__process__host__impl.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_browser__child__process__host__impl.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/browser/browser_child_process_host_impl.h.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/content/browser/browser_child_process_host_impl.h.orig 2024-08-26 12:06:38 UTC +++ src/3rdparty/chromium/content/browser/browser_child_process_host_impl.h -@@ -34,7 +34,7 @@ +@@ -35,7 +35,7 @@ #include "base/win/object_watcher.h" #endif @@ -9,7 +9,7 @@ #include "content/browser/child_thread_type_switcher_linux.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -264,7 +264,7 @@ class BrowserChildProcessHostImpl +@@ -269,7 +269,7 @@ class BrowserChildProcessHostImpl std::unique_ptr system_tracing_service_; #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_browser__main__loop.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_browser__main__loop.cc index ab952ea504c2..08eee7628f9e 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_browser__main__loop.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_browser__main__loop.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/browser/browser_main_loop.cc.orig 2024-10-02 15:40:01 UTC +--- src/3rdparty/chromium/content/browser/browser_main_loop.cc.orig 2025-02-21 12:29:33 UTC +++ src/3rdparty/chromium/content/browser/browser_main_loop.cc -@@ -254,6 +254,12 @@ +@@ -255,6 +255,12 @@ #include "mojo/public/cpp/bindings/lib/test_random_mojo_delays.h" #endif @@ -13,7 +13,7 @@ // One of the linux specific headers defines this as a macro. #ifdef DestroyAll #undef DestroyAll -@@ -559,6 +565,12 @@ int BrowserMainLoop::EarlyInitialization() { +@@ -550,6 +556,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()); @@ -26,7 +26,7 @@ #endif // GLib's spawning of new processes is buggy, so it's important that at this -@@ -599,7 +611,7 @@ int BrowserMainLoop::EarlyInitialization() { +@@ -590,7 +602,7 @@ int BrowserMainLoop::EarlyInitialization() { features::kBrowserUseCompositingThreadPriority)); #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_child__process__launcher__helper.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_child__process__launcher__helper.h index 154c10ac196c..2eed575498d1 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_child__process__launcher__helper.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_child__process__launcher__helper.h @@ -1,8 +1,8 @@ ---- src/3rdparty/chromium/content/browser/child_process_launcher_helper.h.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/content/browser/child_process_launcher_helper.h.orig 2024-09-30 07:45:04 UTC +++ src/3rdparty/chromium/content/browser/child_process_launcher_helper.h -@@ -269,7 +269,7 @@ class ChildProcessLauncherHelper - std::unique_ptr delegate_; - base::WeakPtr child_process_launcher_; +@@ -293,7 +293,7 @@ class ChildProcessLauncherHelper + std::optional process_id_ = std::nullopt; + #endif // BUILDFLAG(IS_CHROMEOS) -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_child__process__launcher__helper__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_child__process__launcher__helper__linux.cc index 8d9472406893..aacf1228918e 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_child__process__launcher__helper__linux.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_child__process__launcher__helper__linux.cc @@ -1,19 +1,16 @@ ---- src/3rdparty/chromium/content/browser/child_process_launcher_helper_linux.cc.orig 2024-07-03 01:14:49 UTC +--- src/3rdparty/chromium/content/browser/child_process_launcher_helper_linux.cc.orig 2024-06-17 12:56:06 UTC +++ src/3rdparty/chromium/content/browser/child_process_launcher_helper_linux.cc -@@ -21,8 +21,12 @@ +@@ -22,7 +22,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" +#if !BUILDFLAG(IS_BSD) #include "content/public/common/zygote/zygote_handle.h" - #include "sandbox/policy/linux/sandbox_linux.h" -+#else -+#include "sandbox/policy/sandbox.h" +#endif + #include "sandbox/policy/linux/sandbox_linux.h" namespace content { - namespace internal { -@@ -46,14 +50,20 @@ bool ChildProcessLauncherHelper::IsUsingLaunchOptions( +@@ -47,14 +49,20 @@ ChildProcessLauncherHelper::GetFilesToMap() { } bool ChildProcessLauncherHelper::IsUsingLaunchOptions() { @@ -34,7 +31,7 @@ // Convert FD mapping to FileHandleMappingVector options->fds_to_remap = files_to_register.GetMappingWithIDAdjustment( base::GlobalDescriptors::kBaseDescriptor); -@@ -65,7 +75,9 @@ bool ChildProcessLauncherHelper::BeforeLaunchOnLaunche +@@ -66,7 +74,9 @@ bool ChildProcessLauncherHelper::BeforeLaunchOnLaunche options->environment = delegate_->GetEnvironment(); } else { @@ -44,15 +41,15 @@ // Environment variables could be supported in the future, but are not // currently supported when launching with the zygote. DCHECK(delegate_->GetEnvironment().empty()); -@@ -82,6 +94,7 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr +@@ -83,6 +93,7 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr int* launch_result) { *is_synchronous_launch = true; Process process; +#if !BUILDFLAG(IS_BSD) ZygoteCommunication* zygote_handle = GetZygoteForLaunch(); if (zygote_handle) { - // TODO(crbug.com/569191): If chrome supported multiple zygotes they could -@@ -92,7 +105,6 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr + // TODO(crbug.com/40448989): If chrome supported multiple zygotes they could +@@ -93,7 +104,6 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr GetProcessType()); *launch_result = LAUNCH_RESULT_SUCCESS; @@ -60,7 +57,7 @@ if (handle) { // It could be a renderer process or an utility process. int oom_score = content::kMiscOomScore; -@@ -101,15 +113,17 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr +@@ -102,15 +112,17 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr oom_score = content::kLowestRendererOomScore; ZygoteHostImpl::GetInstance()->AdjustRendererOOMScore(handle, oom_score); } @@ -78,8 +75,8 @@ +#endif #if BUILDFLAG(IS_CHROMEOS) - if (GetProcessType() == switches::kRendererProcess) { -@@ -131,10 +145,14 @@ ChildProcessTerminationInfo ChildProcessLauncherHelper + process_id_ = process.process.Pid(); +@@ -134,10 +146,14 @@ ChildProcessTerminationInfo ChildProcessLauncherHelper const ChildProcessLauncherHelper::Process& process, bool known_dead) { ChildProcessTerminationInfo info; @@ -94,7 +91,7 @@ info.status = base::GetKnownDeadTerminationStatus(process.process.Handle(), &info.exit_code); } else { -@@ -160,13 +178,17 @@ void ChildProcessLauncherHelper::ForceNormalProcessTer +@@ -163,13 +179,17 @@ void ChildProcessLauncherHelper::ForceNormalProcessTer DCHECK(CurrentlyOnProcessLauncherTaskRunner()); process.process.Terminate(RESULT_CODE_NORMAL_EXIT, false); // On POSIX, we must additionally reap the child. @@ -112,7 +109,7 @@ } void ChildProcessLauncherHelper::SetProcessPriorityOnLauncherThread( -@@ -179,11 +201,13 @@ void ChildProcessLauncherHelper::SetProcessPriorityOnL +@@ -182,11 +202,13 @@ void ChildProcessLauncherHelper::SetProcessPriorityOnL } } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_child__thread__type__switcher__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_child__thread__type__switcher__linux.cc index 60b7cc05cf16..6545657a5cdb 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_child__thread__type__switcher__linux.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_child__thread__type__switcher__linux.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/content/browser/child_thread_type_switcher_linux.cc.orig 2023-12-10 06:10:27 UTC +--- src/3rdparty/chromium/content/browser/child_thread_type_switcher_linux.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/content/browser/child_thread_type_switcher_linux.cc @@ -20,6 +20,9 @@ void SetThreadTypeOnLauncherThread(base::ProcessId pee base::ThreadType thread_type) { @@ -10,7 +10,7 @@ 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 +@@ -39,6 +42,7 @@ void SetThreadTypeOnLauncherThread(base::ProcessId pee base::PlatformThread::SetThreadType(peer_pid, peer_tid, thread_type, base::IsViaIPC(true)); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_compositor_viz__process__transport__factory.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_compositor_viz__process__transport__factory.cc index d00cf1f5a125..09094d627e6d 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_compositor_viz__process__transport__factory.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_compositor_viz__process__transport__factory.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/browser/compositor/viz_process_transport_factory.cc.orig 2024-01-30 07:53:34 UTC +--- src/3rdparty/chromium/content/browser/compositor/viz_process_transport_factory.cc.orig 2024-07-30 11:12:21 UTC +++ src/3rdparty/chromium/content/browser/compositor/viz_process_transport_factory.cc -@@ -118,7 +118,7 @@ class HostDisplayClient : public viz::HostDisplayClien +@@ -110,7 +110,7 @@ class HostDisplayClient : public viz::HostDisplayClien HostDisplayClient& operator=(const HostDisplayClient&) = delete; // viz::HostDisplayClient: diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_devtools_devtools__frontend__host__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_devtools_devtools__frontend__host__impl.cc index 3b5faa382b59..61cc5417ddb7 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_devtools_devtools__frontend__host__impl.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_devtools_devtools__frontend__host__impl.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/browser/devtools/devtools_frontend_host_impl.cc.orig 2023-11-03 10:09:45 UTC +--- src/3rdparty/chromium/content/browser/devtools/devtools_frontend_host_impl.cc.orig 2024-07-30 11:12:21 UTC +++ src/3rdparty/chromium/content/browser/devtools/devtools_frontend_host_impl.cc -@@ -22,7 +22,7 @@ +@@ -27,7 +27,7 @@ #include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h" #include "ui/base/webui/resource_path.h" @@ -9,7 +9,7 @@ #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[] = +@@ -42,7 +42,7 @@ const char kCompatibilityScriptSourceURL[] = "\n//# " "sourceURL=devtools://devtools/bundled/devtools_compatibility.js"; @@ -18,7 +18,7 @@ // 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( +@@ -112,7 +112,7 @@ DevToolsFrontendHostImpl::DevToolsFrontendHostImpl( const HandleMessageCallback& handle_message_callback) : web_contents_(WebContents::FromRenderFrameHost(frame_host)), handle_message_callback_(handle_message_callback) { @@ -27,7 +27,7 @@ Observe(web_contents_); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) mojo::AssociatedRemote frontend; -@@ -132,7 +132,7 @@ void DevToolsFrontendHostImpl::DispatchEmbedderMessage +@@ -137,7 +137,7 @@ void DevToolsFrontendHostImpl::DispatchEmbedderMessage handle_message_callback_.Run(std::move(message)); } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_devtools_devtools__frontend__host__impl.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_devtools_devtools__frontend__host__impl.h index 6b525d08a736..7ef33e0fc49c 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_devtools_devtools__frontend__host__impl.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_devtools_devtools__frontend__host__impl.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/browser/devtools/devtools_frontend_host_impl.h.orig 2023-11-03 10:09:45 UTC +--- src/3rdparty/chromium/content/browser/devtools/devtools_frontend_host_impl.h.orig 2024-05-21 18:07:39 UTC +++ src/3rdparty/chromium/content/browser/devtools/devtools_frontend_host_impl.h -@@ -33,7 +33,7 @@ class DevToolsFrontendHostImpl : public DevToolsFronte +@@ -34,7 +34,7 @@ class DevToolsFrontendHostImpl : public DevToolsFronte void BadMessageReceived() override; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_devtools_protocol_system__info__handler.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_devtools_protocol_system__info__handler.cc index bc5aeb9a8c03..0f73930358f7 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_devtools_protocol_system__info__handler.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_devtools_protocol_system__info__handler.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/browser/devtools/protocol/system_info_handler.cc.orig 2023-09-13 12:11:42 UTC +--- src/3rdparty/chromium/content/browser/devtools/protocol/system_info_handler.cc.orig 2024-05-21 18:07:39 UTC +++ src/3rdparty/chromium/content/browser/devtools/protocol/system_info_handler.cc -@@ -49,7 +49,7 @@ std::unique_ptr GfxSizeToSystemInfoS +@@ -51,7 +51,7 @@ std::unique_ptr 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/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_file__system__access_file__path__watcher_file__path__watcher.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_file__system__access_file__path__watcher_file__path__watcher.h new file mode 100644 index 000000000000..8652828fa0d6 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_file__system__access_file__path__watcher_file__path__watcher.h @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/content/browser/file_system_access/file_path_watcher/file_path_watcher.h.orig 2024-09-30 07:45:04 UTC ++++ src/3rdparty/chromium/content/browser/file_system_access/file_path_watcher/file_path_watcher.h +@@ -125,7 +125,7 @@ class CONTENT_EXPORT FilePathWatcher { + Type type = Type::kNonRecursive; + + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ +- BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) ++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + // The callback will return the full path to a changed file instead of + // the watched path supplied as |path| when Watch is called. + // So the full path can be different from the watched path when a folder is diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_file__system__access_file__path__watcher_file__path__watcher__bsd.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_file__system__access_file__path__watcher_file__path__watcher__bsd.cc new file mode 100644 index 000000000000..0efdc149e7b3 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_file__system__access_file__path__watcher_file__path__watcher__bsd.cc @@ -0,0 +1,58 @@ +--- src/3rdparty/chromium/content/browser/file_system_access/file_path_watcher/file_path_watcher_bsd.cc.orig 2024-07-30 11:12:21 UTC ++++ src/3rdparty/chromium/content/browser/file_system_access/file_path_watcher/file_path_watcher_bsd.cc +@@ -0,0 +1,55 @@ ++// Copyright 2024 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/browser/file_system_access/file_path_watcher/file_path_watcher.h" ++ ++#include ++ ++#include "base/memory/ptr_util.h" ++#include "build/build_config.h" ++#include "content/browser/file_system_access/file_path_watcher/file_path_watcher_kqueue.h" ++ ++namespace content { ++ ++namespace { ++ ++class FilePathWatcherImpl : public FilePathWatcher::PlatformDelegate { ++ public: ++ FilePathWatcherImpl() = default; ++ FilePathWatcherImpl(const FilePathWatcherImpl&) = delete; ++ FilePathWatcherImpl& operator=(const FilePathWatcherImpl&) = delete; ++ ~FilePathWatcherImpl() override = default; ++ ++ bool Watch(const base::FilePath& path, ++ Type type, ++ const FilePathWatcher::Callback& callback) override { ++ DCHECK(!impl_.get()); ++ if (type == Type::kRecursive) { ++ if (!FilePathWatcher::RecursiveWatchAvailable()) { ++ return false; ++ } ++ } else { ++ impl_ = std::make_unique(); ++ } ++ DCHECK(impl_.get()); ++ return impl_->Watch(path, type, callback); ++ } ++ ++ void Cancel() override { ++ if (impl_.get()) { ++ impl_->Cancel(); ++ } ++ set_cancelled(); ++ } ++ ++ private: ++ std::unique_ptr impl_; ++}; ++ ++} // namespace ++ ++FilePathWatcher::FilePathWatcher() ++ : FilePathWatcher(std::make_unique()) {} ++ ++} // namespace content diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_file__system__access_file__path__watcher_file__path__watcher__kqueue.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_file__system__access_file__path__watcher_file__path__watcher__kqueue.h new file mode 100644 index 000000000000..c08a6b6b2f14 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_file__system__access_file__path__watcher_file__path__watcher__kqueue.h @@ -0,0 +1,10 @@ +--- src/3rdparty/chromium/content/browser/file_system_access/file_path_watcher/file_path_watcher_kqueue.h.orig 2024-07-30 11:12:21 UTC ++++ src/3rdparty/chromium/content/browser/file_system_access/file_path_watcher/file_path_watcher_kqueue.h +@@ -5,6 +5,7 @@ + #ifndef CONTENT_BROWSER_FILE_SYSTEM_ACCESS_FILE_PATH_WATCHER_FILE_PATH_WATCHER_KQUEUE_H_ + #define CONTENT_BROWSER_FILE_SYSTEM_ACCESS_FILE_PATH_WATCHER_FILE_PATH_WATCHER_KQUEUE_H_ + ++#include + #include + + #include diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_file__system__access_file__system__access__local__path__watcher.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_file__system__access_file__system__access__local__path__watcher.cc index 4642d7ee3dca..f9d0c3266b24 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_file__system__access_file__system__access__local__path__watcher.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_file__system__access_file__system__access__local__path__watcher.cc @@ -1,11 +1,11 @@ ---- src/3rdparty/chromium/content/browser/file_system_access/file_system_access_local_path_watcher.cc.orig 2023-11-03 10:09:45 UTC +--- src/3rdparty/chromium/content/browser/file_system_access/file_system_access_local_path_watcher.cc.orig 2024-09-30 07:45:04 UTC +++ src/3rdparty/chromium/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. + .type = scope().IsRecursive() ? FilePathWatcher::Type::kRecursive + : FilePathWatcher::Type::kNonRecursive, + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \ +- BUILDFLAG(IS_MAC) ++ BUILDFLAG(IS_MAC) || 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/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_gpu_compositor__util.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_gpu_compositor__util.cc index 4e0e0b759cb0..a59aeddeebb3 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_gpu_compositor__util.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_gpu_compositor__util.cc @@ -1,20 +1,20 @@ ---- src/3rdparty/chromium/content/browser/gpu/compositor_util.cc.orig 2024-01-30 07:53:34 UTC +--- src/3rdparty/chromium/content/browser/gpu/compositor_util.cc.orig 2024-08-26 12:06:38 UTC +++ src/3rdparty/chromium/content/browser/gpu/compositor_util.cc -@@ -149,7 +149,7 @@ const GpuFeatureData GetGpuFeatureData( - {"video_decode", - SafeGetFeatureStatus(gpu_feature_info, - gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE), +@@ -153,7 +153,7 @@ std::vector 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), -@@ -160,7 +160,7 @@ const GpuFeatureData GetGpuFeatureData( - {"video_encode", - SafeGetFeatureStatus(gpu_feature_info, - gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_ENCODE), + command_line.HasSwitch(switches::kDisableAcceleratedVideoDecode)), +@@ -165,7 +165,7 @@ std::vector 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/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_gpu_gpu__data__manager__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_gpu_gpu__data__manager__impl.cc index 9d9098464fef..eaa0da6d4dbf 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_gpu_gpu__data__manager__impl.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_gpu_gpu__data__manager__impl.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/browser/gpu/gpu_data_manager_impl.cc.orig 2023-04-28 17:01:32 UTC +--- src/3rdparty/chromium/content/browser/gpu/gpu_data_manager_impl.cc.orig 2024-08-26 12:06:38 UTC +++ src/3rdparty/chromium/content/browser/gpu/gpu_data_manager_impl.cc -@@ -405,7 +405,7 @@ void GpuDataManagerImpl::OnDisplayMetricsChanged( +@@ -402,7 +402,7 @@ void GpuDataManagerImpl::OnDisplayMetricsChanged( private_->OnDisplayMetricsChanged(display, changed_metrics); } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_gpu_gpu__data__manager__impl.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_gpu_gpu__data__manager__impl.h index 40e498c97e5f..bc1fcd5df77e 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_gpu_gpu__data__manager__impl.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_gpu_gpu__data__manager__impl.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/browser/gpu/gpu_data_manager_impl.h.orig 2023-04-28 17:01:32 UTC +--- src/3rdparty/chromium/content/browser/gpu/gpu_data_manager_impl.h.orig 2024-08-26 12:06:38 UTC +++ src/3rdparty/chromium/content/browser/gpu/gpu_data_manager_impl.h -@@ -221,7 +221,7 @@ class CONTENT_EXPORT GpuDataManagerImpl : public GpuDa +@@ -220,7 +220,7 @@ class CONTENT_EXPORT GpuDataManagerImpl : public GpuDa void OnDisplayMetricsChanged(const display::Display& display, uint32_t changed_metrics) override; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_gpu_gpu__data__manager__impl__private.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_gpu_gpu__data__manager__impl__private.cc index a75987ad1bb5..757e616420eb 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_gpu_gpu__data__manager__impl__private.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_gpu_gpu__data__manager__impl__private.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/browser/gpu/gpu_data_manager_impl_private.cc.orig 2024-07-03 01:14:49 UTC +--- src/3rdparty/chromium/content/browser/gpu/gpu_data_manager_impl_private.cc.orig 2025-02-21 12:29:33 UTC +++ src/3rdparty/chromium/content/browser/gpu/gpu_data_manager_impl_private.cc -@@ -1790,7 +1790,7 @@ void GpuDataManagerImplPrivate::RecordCompositingMode( +@@ -1668,7 +1668,7 @@ void GpuDataManagerImplPrivate::RecordCompositingMode( UMA_HISTOGRAM_ENUMERATION("GPU.CompositingMode", compositing_mode); } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_gpu_gpu__data__manager__impl__private.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_gpu_gpu__data__manager__impl__private.h index 18bd9de3b825..816aee463068 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_gpu_gpu__data__manager__impl__private.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_gpu_gpu__data__manager__impl__private.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/browser/gpu/gpu_data_manager_impl_private.h.orig 2023-09-13 12:11:42 UTC +--- src/3rdparty/chromium/content/browser/gpu/gpu_data_manager_impl_private.h.orig 2024-08-26 12:06:38 UTC +++ src/3rdparty/chromium/content/browser/gpu/gpu_data_manager_impl_private.h -@@ -151,7 +151,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate { +@@ -147,7 +147,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate { void OnDisplayMetricsChanged(const display::Display& display, uint32_t changed_metrics); @@ -9,7 +9,7 @@ bool IsGpuMemoryBufferNV12Supported(); void SetGpuMemoryBufferNV12Supported(bool supported); #endif // BUILDFLAG(IS_LINUX) -@@ -306,7 +306,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate { +@@ -303,7 +303,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate { bool application_is_visible_ = true; bool disable_gpu_compositing_ = false; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_gpu_gpu__memory__buffer__manager__singleton.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_gpu_gpu__memory__buffer__manager__singleton.cc index 161dd5425ec2..640924a6cb49 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_gpu_gpu__memory__buffer__manager__singleton.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_gpu_gpu__memory__buffer__manager__singleton.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/browser/gpu/gpu_memory_buffer_manager_singleton.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/content/browser/gpu/gpu_memory_buffer_manager_singleton.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/content/browser/gpu/gpu_memory_buffer_manager_singleton.cc -@@ -54,7 +54,7 @@ scoped_refptr GetTaskRun +@@ -46,7 +46,7 @@ scoped_refptr GetTaskRun #endif } @@ -9,10 +9,10 @@ bool IsGpuMemoryBufferNV12Supported() { static bool is_computed = false; static bool supported = false; -@@ -117,7 +117,7 @@ void GpuMemoryBufferManagerSingleton::OnGpuExtraInfoUp - SetNativeConfigurations(std::move(configs)); - } - #endif // BUILDFLAG(IS_OZONE_X11) +@@ -98,7 +98,7 @@ GpuMemoryBufferManagerSingleton::GetInstance() { + } + + void GpuMemoryBufferManagerSingleton::OnGpuExtraInfoUpdate() { -#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/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_gpu_gpu__process__host.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_gpu_gpu__process__host.cc index aa9cc2965b15..84345d9314c8 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_gpu_gpu__process__host.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_gpu_gpu__process__host.cc @@ -1,16 +1,16 @@ ---- src/3rdparty/chromium/content/browser/gpu/gpu_process_host.cc.orig 2024-07-03 01:14:49 UTC +--- src/3rdparty/chromium/content/browser/gpu/gpu_process_host.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/content/browser/gpu/gpu_process_host.cc -@@ -258,6 +258,7 @@ static const char* const kSwitchNames[] = { - switches::kEnableGpuRasterization, - switches::kEnableSkiaGraphite, - switches::kEnableLogging, +@@ -275,6 +275,7 @@ static const char* const kSwitchNames[] = { + switches::kEnableLowEndDeviceMode, + switches::kDisableSkiaGraphite, + switches::kDisableLowEndDeviceMode, + switches::kDisableUnveil, - switches::kDoubleBufferCompositing, - switches::kHeadless, - switches::kLoggingLevel, -@@ -292,7 +293,7 @@ static const char* const kSwitchNames[] = { - switches::kDisableExplicitDmaFences, + switches::kProfilingAtStart, + switches::kProfilingFile, + switches::kProfilingFlush, +@@ -302,7 +303,7 @@ static const char* const kSwitchNames[] = { switches::kOzoneDumpFile, + switches::kEnableNativeGpuMemoryBuffers, #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_media_frameless__media__interface__proxy.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_media_frameless__media__interface__proxy.h index 4ca5904fc35d..3f5dfc05e6bb 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_media_frameless__media__interface__proxy.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_media_frameless__media__interface__proxy.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/content/browser/media/frameless_media_interface_proxy.h.orig 2022-10-24 13:33:33 UTC +--- src/3rdparty/chromium/content/browser/media/frameless_media_interface_proxy.h.orig 2024-05-21 18:07:39 UTC +++ src/3rdparty/chromium/content/browser/media/frameless_media_interface_proxy.h @@ -19,7 +19,7 @@ #include "mojo/public/cpp/bindings/receiver_set.h" @@ -9,7 +9,7 @@ #include "media/mojo/mojom/stable/stable_video_decoder.mojom.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -100,7 +100,7 @@ class FramelessMediaInterfaceProxy final +@@ -105,7 +105,7 @@ class FramelessMediaInterfaceProxy final // Connections to the renderer. mojo::ReceiverSet receivers_; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_media_media__keys__listener__manager__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_media_media__keys__listener__manager__impl.cc index 85a2910e5e31..d70412500501 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_media_media__keys__listener__manager__impl.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_media_media__keys__listener__manager__impl.cc @@ -1,11 +1,11 @@ ---- src/3rdparty/chromium/content/browser/media/media_keys_listener_manager_impl.cc.orig 2024-01-30 07:53:34 UTC +--- src/3rdparty/chromium/content/browser/media/media_keys_listener_manager_impl.cc.orig 2024-07-30 11:12:21 UTC +++ src/3rdparty/chromium/content/browser/media/media_keys_listener_manager_impl.cc -@@ -300,7 +300,7 @@ void MediaKeysListenerManagerImpl::StartListeningForMe +@@ -333,7 +333,7 @@ void MediaKeysListenerManagerImpl::StartListeningForMe + return; } - #if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ -- BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) -+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) +-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_WIN) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) || BUILDFLAG(IS_WIN) // Create SystemMediaControls with the SingletonHwnd. browser_system_media_controls_ = system_media_controls::SystemMediaControls::Create( diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_network__service__instance__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_network__service__instance__impl.cc index 70ba01d3b945..152c1508e38c 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_network__service__instance__impl.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_network__service__instance__impl.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/browser/network_service_instance_impl.cc.orig 2024-07-03 01:14:49 UTC +--- src/3rdparty/chromium/content/browser/network_service_instance_impl.cc.orig 2025-02-21 12:29:33 UTC +++ src/3rdparty/chromium/content/browser/network_service_instance_impl.cc -@@ -81,7 +81,7 @@ +@@ -85,7 +85,7 @@ #include "content/browser/network/network_service_process_tracker_win.h" #endif @@ -9,7 +9,7 @@ #include "content/browser/system_dns_resolution/system_dns_resolver.h" #include "services/network/public/mojom/system_dns_resolution.mojom-forward.h" #endif -@@ -360,7 +360,7 @@ void CreateInProcessNetworkService( +@@ -369,7 +369,7 @@ void CreateInProcessNetworkService( std::move(receiver))); } @@ -18,7 +18,7 @@ // Runs a self-owned SystemDnsResolverMojoImpl. This is meant to run on a // high-priority thread pool. void RunSystemDnsResolverOnThreadPool( -@@ -429,7 +429,7 @@ network::mojom::NetworkServiceParamsPtr CreateNetworkS +@@ -438,7 +438,7 @@ network::mojom::NetworkServiceParamsPtr CreateNetworkS } #endif // BUILDFLAG(IS_POSIX) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_delegated__frame__host.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_delegated__frame__host.cc index 3b46313aa590..7bf7e3138bec 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_delegated__frame__host.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_delegated__frame__host.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/browser/renderer_host/delegated_frame_host.cc.orig 2024-01-30 07:53:34 UTC +--- src/3rdparty/chromium/content/browser/renderer_host/delegated_frame_host.cc.orig 2024-03-22 08:19:40 UTC +++ src/3rdparty/chromium/content/browser/renderer_host/delegated_frame_host.cc -@@ -317,7 +317,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/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_media_service__video__capture__device__launcher.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_media_service__video__capture__device__launcher.cc index 52fb401e6d41..4e53a98d713c 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_media_service__video__capture__device__launcher.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_media_service__video__capture__device__launcher.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/content/browser/renderer_host/media/service_video_capture_device_launcher.cc.orig 2023-12-10 06:10:27 UTC +--- src/3rdparty/chromium/content/browser/renderer_host/media/service_video_capture_device_launcher.cc.orig 2024-05-21 18:07:39 UTC +++ src/3rdparty/chromium/content/browser/renderer_host/media/service_video_capture_device_launcher.cc @@ -25,7 +25,7 @@ #include "media/base/media_switches.h" @@ -9,7 +9,7 @@ #include "content/browser/gpu/gpu_data_manager_impl.h" #endif -@@ -172,7 +172,7 @@ void ServiceVideoCaptureDeviceLauncher::LaunchDeviceAs +@@ -173,7 +173,7 @@ void ServiceVideoCaptureDeviceLauncher::LaunchDeviceAs } #else if (switches::IsVideoCaptureUseGpuMemoryBufferEnabled()) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__process__host__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__process__host__impl.cc index b1fb4afd0702..466d11256579 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__process__host__impl.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__process__host__impl.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/browser/renderer_host/render_process_host_impl.cc.orig 2024-07-03 01:14:49 UTC +--- src/3rdparty/chromium/content/browser/renderer_host/render_process_host_impl.cc.orig 2025-02-21 12:29:33 UTC +++ src/3rdparty/chromium/content/browser/renderer_host/render_process_host_impl.cc -@@ -222,7 +222,7 @@ +@@ -218,7 +218,7 @@ #include "third_party/blink/public/mojom/android_font_lookup/android_font_lookup.mojom.h" #endif @@ -9,7 +9,7 @@ #include #include "components/services/font/public/mojom/font_service.mojom.h" // nogncheck -@@ -970,7 +970,7 @@ size_t GetPlatformProcessLimit() { +@@ -1086,7 +1086,7 @@ size_t GetPlatformProcessLimit() { // to indicate failure and std::numeric_limits::max() to indicate // unlimited. size_t GetPlatformProcessLimit() { @@ -18,34 +18,16 @@ struct rlimit limit; if (getrlimit(RLIMIT_NPROC, &limit) != 0) return kUnknownPlatformProcessLimit; -@@ -1158,7 +1158,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public - IOThreadHostImpl& operator=(const IOThreadHostImpl& other) = delete; +@@ -1267,7 +1267,7 @@ void RenderProcessHostImpl::IOThreadHostImpl::SetPid( - void SetPid(base::ProcessId child_pid) { + void RenderProcessHostImpl::IOThreadHostImpl::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); + child_thread_type_switcher_.SetPid(child_pid); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) - } -@@ -1175,7 +1175,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public - return; - } - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - if (auto font_receiver = receiver.As()) { - ConnectToFontService(std::move(font_receiver)); - return; -@@ -1269,7 +1269,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public - std::unique_ptr binders_; - mojo::Receiver receiver_{this}; - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - mojo::Remote - video_encode_accelerator_factory_remote_; - ChildThreadTypeSwitcher child_thread_type_switcher_; -@@ -3403,7 +3403,7 @@ void RenderProcessHostImpl::AppendRendererCommandLine( + } +@@ -3304,7 +3304,7 @@ void RenderProcessHostImpl::AppendRendererCommandLine( base::TimeTicks::UnixEpoch().since_origin().InMicroseconds())); } @@ -54,7 +36,7 @@ // Append `kDisableVideoCaptureUseGpuMemoryBuffer` flag if there is no support // for NV12 GPU memory buffer. if (switches::IsVideoCaptureUseGpuMemoryBufferEnabled() && -@@ -3463,6 +3463,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin +@@ -3360,6 +3360,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin switches::kDisableSpeechAPI, switches::kDisableThreadedCompositing, switches::kDisableTouchDragDrop, @@ -62,3 +44,12 @@ switches::kDisableV8IdleTasks, switches::kDisableVideoCaptureUseGpuMemoryBuffer, switches::kDisableWebGLImageChromium, +@@ -5141,7 +5142,7 @@ uint64_t RenderProcessHostImpl::GetPrivateMemoryFootpr + // - Win: https://crbug.com/707022 . + uint64_t total_size = 0; + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ +- BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + total_size = dump->platform_private_footprint->rss_anon_bytes + + dump->platform_private_footprint->vm_swap_bytes; + #elif BUILDFLAG(IS_APPLE) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__process__host__impl.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__process__host__impl.h index ae7400ba5a25..ef039b4748d7 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__process__host__impl.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__process__host__impl.h @@ -1,6 +1,15 @@ ---- src/3rdparty/chromium/content/browser/renderer_host/render_process_host_impl.h.orig 2024-07-03 01:14:49 UTC +--- src/3rdparty/chromium/content/browser/renderer_host/render_process_host_impl.h.orig 2025-02-21 12:29:33 UTC +++ src/3rdparty/chromium/content/browser/renderer_host/render_process_host_impl.h -@@ -548,7 +548,7 @@ class CONTENT_EXPORT RenderProcessHostImpl +@@ -102,7 +102,7 @@ + #include "media/fuchsia_media_codec_provider_impl.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" + #include "media/mojo/mojom/video_encode_accelerator.mojom.h" + #endif +@@ -617,7 +617,7 @@ class CONTENT_EXPORT RenderProcessHostImpl // Sets this RenderProcessHost to be guest only. For Testing only. void SetForGuestsOnlyForTesting(); @@ -9,3 +18,12 @@ // Launch the zygote early in the browser startup. static void EarlyZygoteLaunch(); #endif // BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_MAC) +@@ -982,7 +982,7 @@ class CONTENT_EXPORT RenderProcessHostImpl + std::unique_ptr binders_; + mojo::Receiver receiver_{this}; + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + mojo::Remote + video_encode_accelerator_factory_remote_; + ChildThreadTypeSwitcher child_thread_type_switcher_; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__process__host__impl__receiver__bindings.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__process__host__impl__receiver__bindings.cc new file mode 100644 index 000000000000..83d0682dabbc --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__process__host__impl__receiver__bindings.cc @@ -0,0 +1,20 @@ +--- src/3rdparty/chromium/content/browser/renderer_host/render_process_host_impl_receiver_bindings.cc.orig 2025-02-21 12:29:33 UTC ++++ src/3rdparty/chromium/content/browser/renderer_host/render_process_host_impl_receiver_bindings.cc +@@ -54,7 +54,7 @@ + #include "third_party/blink/public/mojom/webdatabase/web_database.mojom.h" + #endif + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #include "components/services/font/public/mojom/font_service.mojom.h" // nogncheck + #include "content/browser/font_service.h" // nogncheck + #include "content/browser/media/video_encode_accelerator_provider_launcher.h" +@@ -348,7 +348,7 @@ void RenderProcessHostImpl::IOThreadHostImpl::BindHost + } + #endif + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + if (auto font_receiver = receiver.As()) { + ConnectToFontService(std::move(font_receiver)); + return; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__view__host__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__view__host__impl.cc index 46ae754dc74f..615dd74e9a9e 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__view__host__impl.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__view__host__impl.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/browser/renderer_host/render_view_host_impl.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/content/browser/renderer_host/render_view_host_impl.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/content/browser/renderer_host/render_view_host_impl.cc -@@ -270,7 +270,7 @@ void RenderViewHostImpl::GetPlatformSpecificPrefs( +@@ -275,7 +275,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); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__widget__host__view__aura.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__widget__host__view__aura.cc index df40785beaa8..b0225b6fe792 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__widget__host__view__aura.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__widget__host__view__aura.cc @@ -1,25 +1,25 @@ ---- src/3rdparty/chromium/content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/content/browser/renderer_host/render_widget_host_view_aura.cc -@@ -120,7 +120,7 @@ +@@ -121,7 +121,7 @@ #include "ui/gfx/gdi_util.h" #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - #include "content/browser/accessibility/browser_accessibility_auralinux.h" + #include "ui/accessibility/platform/browser_accessibility_auralinux.h" #include "ui/base/ime/linux/text_edit_command_auralinux.h" #include "ui/base/ime/text_input_flags.h" -@@ -458,7 +458,7 @@ gfx::NativeViewAccessible RenderWidgetHostViewAura::Ge +@@ -484,7 +484,7 @@ gfx::NativeViewAccessible RenderWidgetHostViewAura::Ge return ToBrowserAccessibilityWin(manager->GetBrowserAccessibilityRoot()) ->GetCOM(); -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - BrowserAccessibilityManager* manager = + ui::BrowserAccessibilityManager* manager = host()->GetOrCreateRootBrowserAccessibilityManager(); if (manager && manager->GetBrowserAccessibilityRoot()) -@@ -1696,7 +1696,7 @@ bool RenderWidgetHostViewAura::ShouldDoLearning() { - return GetTextInputManager() && GetTextInputManager()->should_do_learning(); +@@ -1745,7 +1745,7 @@ bool RenderWidgetHostViewAura::ShouldDoLearning() { + return host() && host()->delegate() && host()->delegate()->ShouldDoLearning(); } -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -27,7 +27,7 @@ bool RenderWidgetHostViewAura::SetCompositionFromExistingText( const gfx::Range& range, const std::vector& ui_ime_text_spans) { -@@ -2540,7 +2540,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { +@@ -2654,7 +2654,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { } bool RenderWidgetHostViewAura::NeedsMouseCapture() { @@ -36,7 +36,7 @@ return NeedsInputGrab(); #else return false; -@@ -2723,7 +2723,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit +@@ -2838,7 +2838,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit if (!target_host) return; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__widget__host__view__aura.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__widget__host__view__aura.h index ea2b5e006dba..31dba8c38368 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__widget__host__view__aura.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__widget__host__view__aura.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/browser/renderer_host/render_widget_host_view_aura.h.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/content/browser/renderer_host/render_widget_host_view_aura.h.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/content/browser/renderer_host/render_widget_host_view_aura.h -@@ -256,7 +256,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura +@@ -267,7 +267,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura ukm::SourceId GetClientSourceForMetrics() const override; bool ShouldDoLearning() override; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__widget__host__view__event__handler.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__widget__host__view__event__handler.cc index b6ce175463e4..d14c99786292 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__widget__host__view__event__handler.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__widget__host__view__event__handler.cc @@ -1,7 +1,7 @@ ---- src/3rdparty/chromium/content/browser/renderer_host/render_widget_host_view_event_handler.cc.orig 2024-01-30 07:53:34 UTC +--- src/3rdparty/chromium/content/browser/renderer_host/render_widget_host_view_event_handler.cc.orig 2024-08-26 12:06:38 UTC +++ src/3rdparty/chromium/content/browser/renderer_host/render_widget_host_view_event_handler.cc -@@ -599,7 +599,7 @@ bool RenderWidgetHostViewEventHandler::CanRendererHand - if (event->type() == ui::ET_MOUSE_EXITED) { +@@ -602,7 +602,7 @@ bool RenderWidgetHostViewEventHandler::CanRendererHand + if (event->type() == ui::EventType::kMouseExited) { if (mouse_locked || selection_popup) return false; -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_scheduler_responsiveness_jank__monitor__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_scheduler_responsiveness_jank__monitor__impl.cc index 290ad1688b2d..ee51597dc379 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_scheduler_responsiveness_jank__monitor__impl.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_scheduler_responsiveness_jank__monitor__impl.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/content/browser/scheduler/responsiveness/jank_monitor_impl.cc.orig 2023-08-17 07:33:31 UTC +--- src/3rdparty/chromium/content/browser/scheduler/responsiveness/jank_monitor_impl.cc.orig 2024-07-30 11:12:21 UTC +++ src/3rdparty/chromium/content/browser/scheduler/responsiveness/jank_monitor_impl.cc @@ -340,7 +340,7 @@ void JankMonitorImpl::ThreadExecutionState::DidRunTask // in context menus, among others). Simply ignore the mismatches for now. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_utility__process__host.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_utility__process__host.cc index cfc0e6027657..df4558c3a981 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_utility__process__host.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_utility__process__host.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/browser/utility_process_host.cc.orig 2024-07-03 01:14:49 UTC +--- src/3rdparty/chromium/content/browser/utility_process_host.cc.orig 2025-02-21 12:29:33 UTC +++ src/3rdparty/chromium/content/browser/utility_process_host.cc -@@ -61,7 +61,7 @@ +@@ -62,7 +62,7 @@ #include "content/browser/v8_snapshot_files.h" #endif @@ -27,17 +27,26 @@ base::ScopedFD PassNetworkContextParentDirs( std::vector network_context_parent_dirs) { base::Pickle pickle; -@@ -150,7 +150,7 @@ UtilityProcessHost::UtilityProcessHost(std::unique_ptr +@@ -151,7 +151,7 @@ UtilityProcessHost::UtilityProcessHost(std::unique_ptr started_(false), name_(u"utility process"), file_data_(std::make_unique()), -#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)) { -@@ -435,7 +435,7 @@ bool UtilityProcessHost::StartProcess() { - file_data_->files_to_preload.merge(GetV8SnapshotFilesToPreload()); +@@ -210,7 +210,7 @@ void UtilityProcessHost::SetAllowGpuClient() { + #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 + } +@@ -409,7 +409,7 @@ bool UtilityProcessHost::StartProcess() { + file_data_->files_to_preload.merge(GetV8SnapshotFilesToPreload(*cmd_line)); #endif // BUILDFLAG(IS_POSIX) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -45,7 +54,7 @@ // The network service should have access to the parent directories // necessary for its usage. if (sandbox_type_ == sandbox::mojom::Sandbox::kNetwork) { -@@ -446,13 +446,13 @@ bool UtilityProcessHost::StartProcess() { +@@ -420,13 +420,13 @@ bool UtilityProcessHost::StartProcess() { } #endif // BUILDFLAG(IS_LINUX) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_utility__process__host.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_utility__process__host.h index 6cee8294e730..1b37a2f1b4cf 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_utility__process__host.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_utility__process__host.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/browser/utility_process_host.h.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/content/browser/utility_process_host.h.orig 2024-05-21 18:07:39 UTC +++ src/3rdparty/chromium/content/browser/utility_process_host.h -@@ -39,7 +39,7 @@ namespace base { +@@ -33,7 +33,7 @@ namespace base { class Thread; } // namespace base @@ -9,12 +9,12 @@ namespace viz { class GpuClient; } // namespace viz -@@ -225,7 +225,7 @@ class CONTENT_EXPORT UtilityProcessHost - std::vector pending_run_service_callbacks_; - #endif +@@ -200,7 +200,7 @@ class CONTENT_EXPORT UtilityProcessHost + }; + LaunchState launch_state_ = LaunchState::kLaunchInProgress; -#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 gpu_client_; #endif - diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_utility__process__host__receiver__bindings.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_utility__process__host__receiver__bindings.cc index 4b4d61fd429e..6c3071fae3e2 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_utility__process__host__receiver__bindings.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_utility__process__host__receiver__bindings.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/content/browser/utility_process_host_receiver_bindings.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/content/browser/utility_process_host_receiver_bindings.cc.orig 2024-04-19 13:02:56 UTC +++ src/3rdparty/chromium/content/browser/utility_process_host_receiver_bindings.cc @@ -10,12 +10,12 @@ #include "content/public/browser/content_browser_client.h" @@ -28,6 +28,6 @@ #endif -#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 (auto gpu_receiver = receiver.As()) { - gpu_client_ = - content::CreateGpuClient(std::move(gpu_receiver), base::DoNothing()); + if (allowed_gpu_) { + // TODO(crbug.com/328099369) Remove once all clients get this directly. + if (auto gpu_receiver = receiver.As()) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_utility__sandbox__delegate.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_utility__sandbox__delegate.cc index 0d5c522ea731..01bdbf195058 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_utility__sandbox__delegate.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_utility__sandbox__delegate.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/browser/utility_sandbox_delegate.cc.orig 2024-01-30 07:53:34 UTC +--- src/3rdparty/chromium/content/browser/utility_sandbox_delegate.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/content/browser/utility_sandbox_delegate.cc -@@ -67,10 +67,10 @@ UtilitySandboxedProcessLauncherDelegate:: +@@ -76,10 +76,10 @@ UtilitySandboxedProcessLauncherDelegate:: #if BUILDFLAG(IS_FUCHSIA) sandbox_type_ == sandbox::mojom::Sandbox::kVideoCapture || #endif @@ -13,7 +13,7 @@ sandbox_type_ == sandbox::mojom::Sandbox::kHardwareVideoEncoding || #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -126,10 +126,10 @@ ZygoteCommunication* UtilitySandboxedProcessLauncherDe +@@ -137,10 +137,10 @@ ZygoteCommunication* UtilitySandboxedProcessLauncherDe // process upon startup. if (sandbox_type_ == sandbox::mojom::Sandbox::kNetwork || sandbox_type_ == sandbox::mojom::Sandbox::kOnDeviceModelExecution || diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_v8__snapshot__files.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_v8__snapshot__files.cc index 13036dd9b8ba..623631105694 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_v8__snapshot__files.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_v8__snapshot__files.cc @@ -1,8 +1,8 @@ ---- src/3rdparty/chromium/content/browser/v8_snapshot_files.cc.orig 2023-03-09 06:31:50 UTC +--- src/3rdparty/chromium/content/browser/v8_snapshot_files.cc.orig 2024-06-17 12:56:06 UTC +++ src/3rdparty/chromium/content/browser/v8_snapshot_files.cc -@@ -13,7 +13,7 @@ namespace content { +@@ -17,7 +17,7 @@ namespace content { std::map> - GetV8SnapshotFilesToPreload() { + GetV8SnapshotFilesToPreload(base::CommandLine& process_command_line) { std::map> files; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_web__contents_web__contents__view__aura.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_web__contents_web__contents__view__aura.cc index fb4b85f5b555..1fa349739ad2 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_web__contents_web__contents__view__aura.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_web__contents_web__contents__view__aura.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/content/browser/web_contents/web_contents_view_aura.cc.orig 2023-12-10 06:10:27 UTC +--- src/3rdparty/chromium/content/browser/web_contents/web_contents_view_aura.cc.orig 2024-09-30 07:45:04 UTC +++ src/3rdparty/chromium/content/browser/web_contents/web_contents_view_aura.cc @@ -174,7 +174,7 @@ class WebDragSourceAura : public content::WebContentsO raw_ptr window_; @@ -18,7 +18,7 @@ // 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. -@@ -1319,7 +1319,7 @@ void WebContentsViewAura::OnMouseEvent(ui::MouseEvent* +@@ -1324,7 +1324,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/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_webui_web__ui__main__frame__observer.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_webui_web__ui__main__frame__observer.cc index d4e2edce9b70..4f629f312ec3 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_webui_web__ui__main__frame__observer.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_webui_web__ui__main__frame__observer.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/content/browser/webui/web_ui_main_frame_observer.cc.orig 2023-05-31 08:12:17 UTC +--- src/3rdparty/chromium/content/browser/webui/web_ui_main_frame_observer.cc.orig 2024-06-17 12:56:06 UTC +++ src/3rdparty/chromium/content/browser/webui/web_ui_main_frame_observer.cc @@ -13,7 +13,7 @@ #include "content/public/browser/navigation_handle.h" @@ -29,7 +29,7 @@ blink::mojom::ConsoleMessageLevel log_level, @@ -167,7 +167,7 @@ void WebUIMainFrameObserver::ReadyToCommitNavigation( - // TODO(crbug.com/1129544) This is currently disabled due to Windows DLL + // TODO(crbug.com/40149439) This is currently disabled due to Windows DLL // thunking issues. Fix & re-enable. -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_webui_web__ui__main__frame__observer.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_webui_web__ui__main__frame__observer.h index 4c644b960cf2..797185134066 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_webui_web__ui__main__frame__observer.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_webui_web__ui__main__frame__observer.h @@ -1,8 +1,8 @@ ---- src/3rdparty/chromium/content/browser/webui/web_ui_main_frame_observer.h.orig 2022-07-22 17:30:31 UTC +--- src/3rdparty/chromium/content/browser/webui/web_ui_main_frame_observer.h.orig 2024-06-17 12:56:06 UTC +++ src/3rdparty/chromium/content/browser/webui/web_ui_main_frame_observer.h @@ -44,7 +44,7 @@ class CONTENT_EXPORT WebUIMainFrameObserver : public W - // TODO(crbug.com/1129544) This is currently disabled due to Windows DLL + // TODO(crbug.com/40149439) This is currently disabled due to Windows DLL // thunking issues. Fix & re-enable. -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_zygote__host_zygote__host__impl__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_zygote__host_zygote__host__impl__linux.cc index c51cfc29de2a..1c900bc039c6 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_zygote__host_zygote__host__impl__linux.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_zygote__host_zygote__host__impl__linux.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/browser/zygote_host/zygote_host_impl_linux.cc.orig 2024-07-03 01:14:49 UTC +--- src/3rdparty/chromium/content/browser/zygote_host/zygote_host_impl_linux.cc.orig 2024-09-30 07:45:04 UTC +++ src/3rdparty/chromium/content/browser/zygote_host/zygote_host_impl_linux.cc -@@ -19,13 +19,19 @@ +@@ -19,8 +19,10 @@ #include "build/chromeos_buildflags.h" #include "content/common/zygote/zygote_commands_linux.h" #include "content/common/zygote/zygote_communication_linux.h" @@ -11,16 +11,7 @@ #include "sandbox/linux/services/credentials.h" #include "sandbox/linux/services/namespace_sandbox.h" #include "sandbox/linux/suid/client/setuid_sandbox_host.h" - #include "sandbox/linux/suid/common/sandbox.h" -+#if BUILDFLAG(IS_BSD) -+#include "sandbox/policy/sandbox.h" -+#else - #include "sandbox/policy/linux/sandbox_linux.h" -+#endif - #include "sandbox/policy/switches.h" - - #if BUILDFLAG(IS_CHROMEOS) -@@ -38,6 +44,7 @@ namespace { +@@ -38,6 +40,7 @@ namespace content { namespace { @@ -28,7 +19,7 @@ // 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 +66,7 @@ bool ReceiveFixedMessage(int fd, +@@ -60,6 +63,7 @@ bool ReceiveFixedMessage(int fd, return false; return true; } @@ -36,7 +27,7 @@ } // namespace -@@ -68,9 +76,13 @@ ZygoteHostImpl::ZygoteHostImpl() +@@ -69,9 +73,13 @@ ZygoteHost* ZygoteHost::GetInstance() { } ZygoteHostImpl::ZygoteHostImpl() @@ -50,7 +41,7 @@ sandbox_binary_(), zygote_pids_lock_(), zygote_pids_() {} -@@ -83,6 +95,7 @@ void ZygoteHostImpl::Init(const base::CommandLine& com +@@ -84,6 +92,7 @@ ZygoteHostImpl* ZygoteHostImpl::GetInstance() { } void ZygoteHostImpl::Init(const base::CommandLine& command_line) { @@ -58,7 +49,7 @@ if (command_line.HasSwitch(sandbox::policy::switches::kNoSandbox)) { return; } -@@ -133,6 +146,7 @@ void ZygoteHostImpl::Init(const base::CommandLine& com +@@ -138,6 +147,7 @@ void ZygoteHostImpl::Init(const base::CommandLine& com "you can try using --" << sandbox::policy::switches::kNoSandbox << "."; } @@ -66,7 +57,7 @@ } void ZygoteHostImpl::AddZygotePid(pid_t pid) { -@@ -157,6 +171,7 @@ pid_t ZygoteHostImpl::LaunchZygote( +@@ -162,6 +172,7 @@ pid_t ZygoteHostImpl::LaunchZygote( base::CommandLine* cmd_line, base::ScopedFD* control_fd, base::FileHandleMappingVector additional_remapped_fds) { @@ -74,7 +65,7 @@ int fds[2]; CHECK_EQ(0, socketpair(AF_UNIX, SOCK_SEQPACKET | SOCK_CLOEXEC, 0, fds)); CHECK(base::UnixDomainSocket::EnableReceiveProcessId(fds[0])); -@@ -225,9 +240,12 @@ pid_t ZygoteHostImpl::LaunchZygote( +@@ -230,9 +241,12 @@ pid_t ZygoteHostImpl::LaunchZygote( AddZygotePid(pid); return pid; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_child_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_child_BUILD.gn index 026613279ecf..d5bc4f0b5025 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_child_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_child_BUILD.gn @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/child/BUILD.gn.orig 2024-07-03 01:14:49 UTC +--- src/3rdparty/chromium/content/child/BUILD.gn.orig 2025-02-21 12:29:33 UTC +++ src/3rdparty/chromium/content/child/BUILD.gn -@@ -132,6 +132,13 @@ target(link_target_type, "child") { +@@ -139,6 +139,13 @@ target(link_target_type, "child") { ] } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_child_child__process.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_child_child__process.cc index f5d86c6d8539..8ba61807666a 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_child_child__process.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_child_child__process.cc @@ -1,11 +1,20 @@ ---- src/3rdparty/chromium/content/child/child_process.cc.orig 2023-11-03 10:09:45 UTC +--- src/3rdparty/chromium/content/child/child_process.cc.orig 2024-09-30 07:45:04 UTC +++ src/3rdparty/chromium/content/child/child_process.cc -@@ -66,7 +66,7 @@ ChildProcess::ChildProcess(base::ThreadType io_thread_ - thread_pool_init_params) - : resetter_(&child_process, this, nullptr), - io_thread_(std::make_unique()) { +@@ -32,7 +32,7 @@ + #include "content/common/android/cpu_time_metrics.h" + #endif + -#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 = + #include "content/child/sandboxed_process_thread_type_handler.h" + #endif + +@@ -179,7 +179,7 @@ void ChildProcess::set_main_thread(ChildThreadImpl* th + main_thread_.reset(thread); + } + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + void ChildProcess::SetIOThreadType(base::ThreadType thread_type) { + if (!io_thread_) { + return; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_child_child__process.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_child_child__process.h new file mode 100644 index 000000000000..26b1d2ccacd6 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_child_child__process.h @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/content/child/child_process.h.orig 2024-07-30 11:12:21 UTC ++++ src/3rdparty/chromium/content/child/child_process.h +@@ -79,7 +79,7 @@ class CONTENT_EXPORT ChildProcess { + return io_thread_runner_.get(); + } + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + // Changes the thread type of the child process IO thread. + void SetIOThreadType(base::ThreadType thread_type); + #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_common_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_common_BUILD.gn index 091c299a7cba..bae16c0c47a4 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_common_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_common_BUILD.gn @@ -1,8 +1,8 @@ ---- src/3rdparty/chromium/content/common/BUILD.gn.orig 2024-07-03 01:14:49 UTC +--- src/3rdparty/chromium/content/common/BUILD.gn.orig 2025-02-21 12:29:33 UTC +++ src/3rdparty/chromium/content/common/BUILD.gn -@@ -452,19 +452,28 @@ jumbo_source_set("common") { +@@ -402,18 +402,27 @@ jumbo_source_set("common") { } - + if (is_linux || is_chromeos) { - sources += [ - "gpu_pre_sandbox_hook_linux.cc", @@ -22,7 +22,6 @@ public_deps += [ "//sandbox/policy" ] deps += [ ":sandbox_support_linux", - ":set_process_title_linux", "//media/gpu:buildflags", "//sandbox/linux:sandbox_services", - "//sandbox/linux:seccomp_bpf", @@ -34,13 +33,3 @@ if (use_v4l2_codec) { deps += [ "//media/gpu/v4l2" ] } -@@ -543,6 +552,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" ] -+ } - } - } - diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_common_features.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_common_features.cc index 5cd3571a7619..05e7a7fb01ee 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_common_features.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_common_features.cc @@ -1,7 +1,7 @@ ---- src/3rdparty/chromium/content/common/features.cc.orig 2024-07-03 01:14:49 UTC +--- src/3rdparty/chromium/content/common/features.cc.orig 2025-02-21 12:29:33 UTC +++ src/3rdparty/chromium/content/common/features.cc -@@ -170,7 +170,7 @@ BASE_FEATURE(kEnableBackForwardCacheForOngoingSubframe - base::FEATURE_DISABLED_BY_DEFAULT); +@@ -145,7 +145,7 @@ BASE_FEATURE(kEnableBackForwardCacheForOngoingSubframe + base::FEATURE_ENABLED_BY_DEFAULT); // Enables error reporting for JS errors inside DevTools frontend host -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -9,7 +9,7 @@ BASE_FEATURE(kEnableDevToolsJsErrorReporting, "EnableDevToolsJsErrorReporting", base::FEATURE_DISABLED_BY_DEFAULT); -@@ -258,7 +258,7 @@ BASE_FEATURE(kGroupNIKByJoiningOrigin, +@@ -301,7 +301,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. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_common_features.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_common_features.h index 8bd4d4b94a6d..0a0abe95674a 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_common_features.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_common_features.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/common/features.h.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/content/common/features.h.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/content/common/features.h -@@ -37,7 +37,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kDocumentPolicyNeg +@@ -34,7 +34,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kDocumentPolicyNeg CONTENT_EXPORT BASE_DECLARE_FEATURE(kEnableBackForwardCacheForScreenReader); CONTENT_EXPORT BASE_DECLARE_FEATURE( kEnableBackForwardCacheForOngoingSubframeNavigation); @@ -8,8 +8,8 @@ +#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); -@@ -58,7 +58,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kForwardMemoryPres + CONTENT_EXPORT BASE_DECLARE_FEATURE(kEmbeddingRequiresOptIn); +@@ -76,7 +76,7 @@ CONTENT_EXPORT extern const base::FeatureParam CONTENT_EXPORT BASE_DECLARE_FEATURE(kGpuInfoCollectionSeparatePrefetch); #endif CONTENT_EXPORT BASE_DECLARE_FEATURE(kGroupNIKByJoiningOrigin); @@ -17,4 +17,4 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) CONTENT_EXPORT BASE_DECLARE_FEATURE(kHandleChildThreadTypeChangesInBrowser); #endif - CONTENT_EXPORT BASE_DECLARE_FEATURE(kHighPriorityBeforeUnload); + #if BUILDFLAG(IS_ANDROID) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_common_gpu__pre__sandbox__hook__bsd.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_common_gpu__pre__sandbox__hook__bsd.cc index 5bee1822c4f4..736b97349f20 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_common_gpu__pre__sandbox__hook__bsd.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_common_gpu__pre__sandbox__hook__bsd.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/common/gpu_pre_sandbox_hook_bsd.cc.orig 2024-01-30 07:53:34 UTC +--- src/3rdparty/chromium/content/common/gpu_pre_sandbox_hook_bsd.cc.orig 2024-04-19 13:02:56 UTC +++ src/3rdparty/chromium/content/common/gpu_pre_sandbox_hook_bsd.cc -@@ -0,0 +1,69 @@ +@@ -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. @@ -27,7 +27,6 @@ +#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" + diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_common_gpu__pre__sandbox__hook__linux.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_common_gpu__pre__sandbox__hook__linux.h new file mode 100644 index 000000000000..4e27c18fbeb2 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_common_gpu__pre__sandbox__hook__linux.h @@ -0,0 +1,16 @@ +--- src/3rdparty/chromium/content/common/gpu_pre_sandbox_hook_linux.h.orig 2024-04-19 13:02:56 UTC ++++ src/3rdparty/chromium/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/qt6-webengine/files/patch-src_3rdparty_chromium_content_common_mojo__core__library__support.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_common_mojo__core__library__support.cc deleted file mode 100644 index 047b67de482d..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_common_mojo__core__library__support.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/content/common/mojo_core_library_support.cc.orig 2024-02-23 21:04:38 UTC -+++ src/3rdparty/chromium/content/common/mojo_core_library_support.cc -@@ -15,7 +15,7 @@ bool IsMojoCoreSharedLibraryEnabled() { - } - - std::optional GetMojoCoreSharedLibraryPath() { --#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(); - if (!command_line.HasSwitch(switches::kMojoCoreLibraryPath)) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_common_zygote_sandbox__support__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_common_zygote_sandbox__support__linux.cc deleted file mode 100644 index 068d9a30097e..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_common_zygote_sandbox__support__linux.cc +++ /dev/null @@ -1,14 +0,0 @@ ---- src/3rdparty/chromium/content/common/zygote/sandbox_support_linux.cc.orig 2023-12-12 22:08:45 UTC -+++ src/3rdparty/chromium/content/common/zygote/sandbox_support_linux.cc -@@ -8,7 +8,11 @@ - #include "base/posix/global_descriptors.h" - #include "base/posix/unix_domain_socket.h" - #include "content/public/common/content_descriptors.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/qt6-webengine/files/patch-src_3rdparty_chromium_content_gpu_gpu__child__thread.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_gpu_gpu__child__thread.cc index 30000bfd0d00..692d5ca52c6a 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_gpu_gpu__child__thread.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_gpu_gpu__child__thread.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/content/gpu/gpu_child_thread.cc.orig 2024-07-03 01:14:49 UTC +--- src/3rdparty/chromium/content/gpu/gpu_child_thread.cc.orig 2025-02-21 12:29:33 UTC +++ src/3rdparty/chromium/content/gpu/gpu_child_thread.cc @@ -59,7 +59,7 @@ #include "third_party/skia/include/ports/SkFontConfigInterface.h" diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_gpu_gpu__main.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_gpu_gpu__main.cc index 447cc5b0e7df..a39594b4b9d8 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_gpu_gpu__main.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_gpu_gpu__main.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/gpu/gpu_main.cc.orig 2024-01-30 07:53:34 UTC +--- src/3rdparty/chromium/content/gpu/gpu_main.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/content/gpu/gpu_main.cc -@@ -91,7 +91,7 @@ +@@ -95,10 +95,14 @@ #include "sandbox/win/src/sandbox.h" #endif @@ -8,8 +8,15 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #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" -@@ -114,7 +114,7 @@ namespace content { ++#endif + #include "sandbox/policy/sandbox_type.h" + #endif + +@@ -117,7 +121,7 @@ namespace content { namespace { @@ -18,7 +25,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread*, const gpu::GPUInfo*, const gpu::GpuPreferences&); -@@ -179,7 +179,7 @@ class ContentSandboxHelper : public gpu::GpuSandboxHel +@@ -175,7 +179,7 @@ class ContentSandboxHelper : public gpu::GpuSandboxHel bool EnsureSandboxInitialized(gpu::GpuWatchdogThread* watchdog_thread, const gpu::GPUInfo* gpu_info, const gpu::GpuPreferences& gpu_prefs) override { @@ -27,7 +34,7 @@ return StartSandboxLinux(watchdog_thread, gpu_info, gpu_prefs); #elif BUILDFLAG(IS_WIN) return StartSandboxWindows(sandbox_info_); -@@ -291,7 +291,7 @@ int GpuMain(MainFunctionParams parameters) { +@@ -285,7 +289,7 @@ int GpuMain(MainFunctionParams parameters) { std::make_unique( gpu_preferences.message_pump_type); } @@ -36,17 +43,17 @@ #error "Unsupported Linux platform." #elif BUILDFLAG(IS_MAC) // Cross-process CoreAnimation requires a CFRunLoop to function at all, and -@@ -330,7 +330,8 @@ int GpuMain(MainFunctionParams parameters) { - // before it. - InitializeSkia(); +@@ -308,7 +312,8 @@ int GpuMain(MainFunctionParams parameters) { + base::PlatformThread::SetName("CrGpuMain"); + mojo::InterfaceEndpointClient::SetThreadNameSuffixForMetrics("GpuMain"); -#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, -@@ -438,7 +439,7 @@ int GpuMain(MainFunctionParams parameters) { + // thread type change below for the main thread and for thread pool in + // ChildProcess constructor. +@@ -439,7 +444,7 @@ int GpuMain(MainFunctionParams parameters) { namespace { @@ -55,7 +62,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdog_thread, const gpu::GPUInfo* gpu_info, const gpu::GpuPreferences& gpu_prefs) { -@@ -478,7 +479,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo +@@ -479,7 +484,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo sandbox_options.accelerated_video_encode_enabled = !gpu_prefs.disable_accelerated_video_encode; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_ppapi__plugin_ppapi__blink__platform__impl.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_ppapi__plugin_ppapi__blink__platform__impl.h index 9f9b934ef753..afa7d2488920 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_ppapi__plugin_ppapi__blink__platform__impl.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_ppapi__plugin_ppapi__blink__platform__impl.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/ppapi_plugin/ppapi_blink_platform_impl.h.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/content/ppapi_plugin/ppapi_blink_platform_impl.h.orig 2024-07-30 11:12:21 UTC +++ src/3rdparty/chromium/content/ppapi_plugin/ppapi_blink_platform_impl.h -@@ -34,7 +34,7 @@ class PpapiBlinkPlatformImpl : public BlinkPlatformImp +@@ -36,7 +36,7 @@ class PpapiBlinkPlatformImpl : public BlinkPlatformImp blink::WebString DefaultLocale() override; private: diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_ppapi__plugin_ppapi__plugin__main.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_ppapi__plugin_ppapi__plugin__main.cc index e70ef9f3685c..4d16fd1b289b 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_ppapi__plugin_ppapi__plugin__main.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_ppapi__plugin_ppapi__plugin__main.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/ppapi_plugin/ppapi_plugin_main.cc.orig 2023-08-17 07:33:31 UTC +--- src/3rdparty/chromium/content/ppapi_plugin/ppapi_plugin_main.cc.orig 2024-07-30 11:12:21 UTC +++ src/3rdparty/chromium/content/ppapi_plugin/ppapi_plugin_main.cc -@@ -54,6 +54,11 @@ +@@ -52,6 +52,11 @@ #include "gin/v8_initializer.h" #endif @@ -12,7 +12,7 @@ #if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_ANDROID) #include #endif -@@ -150,7 +155,7 @@ int PpapiPluginMain(MainFunctionParams parameters) { +@@ -141,7 +146,7 @@ int PpapiPluginMain(MainFunctionParams parameters) { gin::V8Initializer::LoadV8Snapshot(); #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_browser_content__browser__client.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_browser_content__browser__client.cc index 7b6db7bcd2d6..c937d19fd7b3 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_browser_content__browser__client.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_browser_content__browser__client.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/public/browser/content_browser_client.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/content/public/browser/content_browser_client.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/content/public/browser/content_browser_client.cc -@@ -1273,7 +1273,7 @@ bool ContentBrowserClient::ShouldRunOutOfProcessSystem +@@ -1330,7 +1330,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. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_browser_service__process__host.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_browser_service__process__host.cc new file mode 100644 index 000000000000..931ecbabe1cc --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_browser_service__process__host.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/content/public/browser/service_process_host.cc.orig 2024-05-21 18:07:39 UTC ++++ src/3rdparty/chromium/content/public/browser/service_process_host.cc +@@ -70,7 +70,7 @@ ServiceProcessHost::Options::WithPreloadedLibraries( + + ServiceProcessHost::Options& ServiceProcessHost::Options::WithGpuClient( + base::PassKey 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/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__features.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__features.cc index 179010bd0158..6f8883205923 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__features.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__features.cc @@ -1,42 +1,27 @@ ---- src/3rdparty/chromium/content/public/common/content_features.cc.orig 2024-10-02 15:40:01 UTC +--- src/3rdparty/chromium/content/public/common/content_features.cc.orig 2025-02-21 12:29:33 UTC +++ src/3rdparty/chromium/content/public/common/content_features.cc -@@ -36,7 +36,7 @@ BASE_FEATURE(kAudioServiceLaunchOnStartup, - base::FEATURE_DISABLED_BY_DEFAULT); +@@ -61,7 +61,7 @@ BASE_FEATURE(kAudioServiceLaunchOnStartup, // Runs the audio service in a separate process. --#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)) BASE_FEATURE(kAudioServiceOutOfProcess, "AudioServiceOutOfProcess", -@@ -51,7 +51,7 @@ BASE_FEATURE(kAudioServiceOutOfProcess, - - // Enables the audio-service sandbox. This feature has an effect only when the - // kAudioServiceOutOfProcess feature is enabled. --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - BASE_FEATURE(kAudioServiceSandbox, - "AudioServiceSandbox", - base::FEATURE_ENABLED_BY_DEFAULT); -@@ -670,7 +670,7 @@ BASE_FEATURE(kOverscrollHistoryNavigation, - base::FEATURE_ENABLED_BY_DEFAULT); - - // Setting to control overscroll history navigation. --#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(kOverscrollHistoryNavigationSetting, - "OverscrollHistoryNavigationSetting", - base::FEATURE_ENABLED_BY_DEFAULT); -@@ -1220,7 +1220,7 @@ BASE_FEATURE(kWebAssemblyTiering, + // TODO(crbug.com/1052397): Remove !IS_CHROMEOS_LACROS once lacros +@@ -1226,9 +1226,9 @@ BASE_FEATURE(kWebAssemblyTiering, // Enable WebAssembly trap handler. - #if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \ -- BUILDFLAG(IS_MAC)) && \ -+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)) && \ - defined(ARCH_CPU_X86_64)) || \ - (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64)) + #if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \ +- BUILDFLAG(IS_MAC)) && \ ++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)) && \ + defined(ARCH_CPU_X86_64)) || \ +- ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)) && \ ++ ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)) && \ + defined(ARCH_CPU_ARM64)) BASE_FEATURE(kWebAssemblyTrapHandler, -@@ -1265,7 +1265,11 @@ BASE_FEATURE(kWebUICodeCache, + "WebAssemblyTrapHandler", +@@ -1268,7 +1268,11 @@ BASE_FEATURE(kWebUICodeCache, // Controls whether the WebUSB API is enabled: // https://wicg.github.io/webusb diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__switches.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__switches.cc index 5e4c4312c806..22fac9bec572 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__switches.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__switches.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/public/common/content_switches.cc.orig 2024-07-03 01:14:49 UTC +--- src/3rdparty/chromium/content/public/common/content_switches.cc.orig 2025-02-21 12:29:33 UTC +++ src/3rdparty/chromium/content/public/common/content_switches.cc -@@ -366,6 +366,8 @@ const char kEnableLogging[] = "enable- +@@ -350,6 +350,8 @@ const char kEnableLogging[] = "enable- // builds. const char kEnableLogging[] = "enable-logging"; @@ -9,9 +9,9 @@ // 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. -@@ -1011,7 +1013,7 @@ const char kPreventResizingContentsForTesting[] = +@@ -978,7 +980,7 @@ const char kPreventResizingContentsForTesting[] = - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // TODO(crbug.com/40118868): 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) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__switches.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__switches.h index 1b8ab4dadbb9..2fe6e957fd98 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__switches.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__switches.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/public/common/content_switches.h.orig 2024-07-03 01:14:49 UTC +--- src/3rdparty/chromium/content/public/common/content_switches.h.orig 2025-02-21 12:29:33 UTC +++ src/3rdparty/chromium/content/public/common/content_switches.h -@@ -115,6 +115,7 @@ CONTENT_EXPORT extern const char kEnableLogging[]; +@@ -110,6 +110,7 @@ CONTENT_EXPORT extern const char kEnableLogging[]; CONTENT_EXPORT extern const char kEnableIsolatedWebAppsInRenderer[]; CONTENT_EXPORT extern const char kEnableLCDText[]; CONTENT_EXPORT extern const char kEnableLogging[]; @@ -8,9 +8,9 @@ CONTENT_EXPORT extern const char kEnableNetworkInformationDownlinkMax[]; CONTENT_EXPORT extern const char kEnableCanvas2DLayers[]; CONTENT_EXPORT extern const char kEnablePluginPlaceholderTesting[]; -@@ -271,7 +272,7 @@ CONTENT_EXPORT extern const char kPreventResizingConte +@@ -268,7 +269,7 @@ CONTENT_EXPORT extern const char kPreventResizingConte - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // TODO(crbug.com/40118868): 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) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_renderer_render__process__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_renderer_render__process__impl.cc deleted file mode 100644 index 674cfd027ee7..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_renderer_render__process__impl.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/content/renderer/render_process_impl.cc.orig 2024-01-30 07:53:34 UTC -+++ src/3rdparty/chromium/content/renderer/render_process_impl.cc -@@ -44,7 +44,7 @@ - #include "third_party/blink/public/web/web_frame.h" - #include "v8/include/v8-initialization.h" - --#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/qt6-webengine/files/patch-src_3rdparty_chromium_content_renderer_render__thread__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_renderer_render__thread__impl.cc index b961f6b4570c..aa44b086919f 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_renderer_render__thread__impl.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_renderer_render__thread__impl.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/renderer/render_thread_impl.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/content/renderer/render_thread_impl.cc.orig 2025-02-21 12:29:33 UTC +++ src/3rdparty/chromium/content/renderer/render_thread_impl.cc -@@ -203,6 +203,8 @@ +@@ -215,6 +215,8 @@ #if BUILDFLAG(IS_APPLE) #include @@ -9,7 +9,7 @@ #else #include #endif -@@ -942,7 +944,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: +@@ -1022,7 +1024,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: kGpuStreamIdMedia, kGpuStreamPriorityMedia); const bool enable_video_decode_accelerator = @@ -18,7 +18,7 @@ base::FeatureList::IsEnabled(media::kVaapiVideoDecodeLinux) && #endif // BUILDFLAG(IS_LINUX) !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode) && -@@ -951,7 +953,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: +@@ -1031,7 +1033,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: gpu::kGpuFeatureStatusEnabled); const bool enable_video_encode_accelerator = @@ -27,7 +27,7 @@ base::FeatureList::IsEnabled(media::kVaapiVideoEncodeLinux) && #else !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoEncode) && -@@ -1740,7 +1742,7 @@ std::unique_ptr RenderThreadImpl::Create +@@ -1816,7 +1818,7 @@ std::unique_ptr RenderThreadImpl::Create bool enable_video_encode_accelerator) { mojo::PendingRemote vea_provider; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_renderer_renderer__blink__platform__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_renderer_renderer__blink__platform__impl.cc index 0ff7a3fa123e..2b954f6bb505 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_renderer_renderer__blink__platform__impl.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_renderer_renderer__blink__platform__impl.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/renderer/renderer_blink_platform_impl.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/content/renderer/renderer_blink_platform_impl.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/content/renderer/renderer_blink_platform_impl.cc -@@ -114,7 +114,7 @@ +@@ -127,7 +127,7 @@ #if BUILDFLAG(IS_MAC) #include "content/child/child_process_sandbox_support_impl_mac.h" @@ -9,7 +9,7 @@ #include "content/child/child_process_sandbox_support_impl_linux.h" #include "content/child/sandboxed_process_thread_type_handler.h" #endif -@@ -184,13 +184,13 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( +@@ -197,13 +197,13 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( is_locked_to_site_(false), main_thread_scheduler_(main_thread_scheduler), next_frame_sink_id_(uint32_t{std::numeric_limits::max()} + 1) { @@ -25,7 +25,7 @@ mojo::PendingRemote font_service; RenderThreadImpl::current()->BindHostReceiver( font_service.InitWithNewPipeAndPassReceiver()); -@@ -199,7 +199,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( +@@ -223,7 +223,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( #endif } @@ -34,7 +34,7 @@ if (sandboxEnabled()) { #if BUILDFLAG(IS_MAC) sandbox_support_ = std::make_unique(); -@@ -260,7 +260,7 @@ void RendererBlinkPlatformImpl::SetThreadType(base::Pl +@@ -284,7 +284,7 @@ void RendererBlinkPlatformImpl::SetThreadType(base::Pl #endif blink::WebSandboxSupport* RendererBlinkPlatformImpl::GetSandboxSupport() { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_renderer_renderer__blink__platform__impl.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_renderer_renderer__blink__platform__impl.h index 154110905aa4..4b7805d2862a 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_renderer_renderer__blink__platform__impl.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_renderer_renderer__blink__platform__impl.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/renderer/renderer_blink_platform_impl.h.orig 2024-07-03 01:14:49 UTC +--- src/3rdparty/chromium/content/renderer/renderer_blink_platform_impl.h.orig 2025-02-21 12:29:33 UTC +++ src/3rdparty/chromium/content/renderer/renderer_blink_platform_impl.h -@@ -250,7 +250,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi +@@ -259,7 +259,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi void Collect3DContextInformation(blink::Platform::GraphicsInfo* gl_info, const gpu::GPUInfo& gpu_info) const; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_shell_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_shell_BUILD.gn index 3f2a8bc02264..e60ac47e40f6 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_shell_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_shell_BUILD.gn @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/shell/BUILD.gn.orig 2024-07-03 01:14:49 UTC +--- src/3rdparty/chromium/content/shell/BUILD.gn.orig 2025-02-21 12:29:33 UTC +++ src/3rdparty/chromium/content/shell/BUILD.gn -@@ -1032,7 +1032,7 @@ group("content_shell_crash_test") { +@@ -1089,7 +1089,7 @@ group("content_shell_crash_test") { if (is_win) { data_deps += [ "//build/win:copy_cdb_to_output" ] } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_shell_app_shell__main__delegate.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_shell_app_shell__main__delegate.cc index bf0318d77a64..80b5a23f5e75 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_shell_app_shell__main__delegate.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_shell_app_shell__main__delegate.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/shell/app/shell_main_delegate.cc.orig 2023-12-10 06:10:27 UTC +--- src/3rdparty/chromium/content/shell/app/shell_main_delegate.cc.orig 2024-08-26 12:06:38 UTC +++ src/3rdparty/chromium/content/shell/app/shell_main_delegate.cc -@@ -227,7 +227,7 @@ void ShellMainDelegate::PreSandboxStartup() { +@@ -276,7 +276,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/qt6-webengine/files/patch-src_3rdparty_chromium_content_shell_renderer_shell__content__renderer__client.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_shell_renderer_shell__content__renderer__client.cc new file mode 100644 index 000000000000..d9aea71898d4 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_shell_renderer_shell__content__renderer__client.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/content/shell/renderer/shell_content_renderer_client.cc.orig 2024-05-21 18:07:39 UTC ++++ src/3rdparty/chromium/content/shell/renderer/shell_content_renderer_client.cc +@@ -54,7 +54,7 @@ + #include "media/base/media_switches.h" + #endif + +-#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 + #include "base/debug/stack_trace.h" diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_test_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_test_BUILD.gn deleted file mode 100644 index 88f3ed244f04..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_test_BUILD.gn +++ /dev/null @@ -1,20 +0,0 @@ ---- src/3rdparty/chromium/content/test/BUILD.gn.orig 2024-07-03 01:14:49 UTC -+++ src/3rdparty/chromium/content/test/BUILD.gn -@@ -2271,7 +2271,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" ] - } - } -@@ -3375,7 +3375,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/qt6-webengine/files/patch-src_3rdparty_chromium_content_utility_services.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_utility_services.cc index e15995225e85..a6a8addbf34d 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_utility_services.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_utility_services.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/utility/services.cc.orig 2024-07-03 01:14:49 UTC +--- src/3rdparty/chromium/content/utility/services.cc.orig 2025-02-21 12:29:33 UTC +++ src/3rdparty/chromium/content/utility/services.cc -@@ -69,7 +69,7 @@ extern sandbox::TargetServices* g_utility_target_servi +@@ -76,7 +76,7 @@ extern sandbox::TargetServices* g_utility_target_servi extern sandbox::TargetServices* g_utility_target_services; #endif // BUILDFLAG(IS_WIN) @@ -9,7 +9,7 @@ #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" -@@ -92,7 +92,7 @@ extern sandbox::TargetServices* g_utility_target_servi +@@ -104,7 +104,7 @@ extern sandbox::TargetServices* g_utility_target_servi #endif // BUILDFLAG(IS_CHROMEOS_ASH) && (BUILDFLAG(USE_VAAPI) || // BUILDFLAG(USE_V4L2_CODEC)) @@ -18,16 +18,23 @@ (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) #include "content/common/features.h" #include "media/mojo/services/stable_video_decoder_factory_process_service.h" // nogncheck -@@ -109,7 +109,7 @@ extern sandbox::TargetServices* g_utility_target_servi - #include "ui/accessibility/accessibility_features.h" +@@ -122,13 +122,13 @@ extern sandbox::TargetServices* g_utility_target_servi #endif // BUILDFLAG(ENABLE_ACCESSIBILITY_SERVICE) + #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" + #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" - #include "services/viz/public/cpp/gpu/gpu.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || -@@ -228,7 +228,7 @@ auto RunAudio(mojo::PendingReceiver receiver) { +@@ -342,7 +342,7 @@ auto RunVideoCapture( + #endif // BUILDFLAG(IS_CHROMEOS_ASH) auto service = std::make_unique( std::move(receiver), base::SingleThreadTaskRunner::GetCurrentDefault()); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) @@ -45,7 +52,7 @@ #if BUILDFLAG(IS_CHROMEOS_ASH) { #else -@@ -356,7 +356,7 @@ auto RunOOPArcVideoAcceleratorFactoryService( +@@ -399,7 +399,7 @@ auto RunOOPArcVideoAcceleratorFactoryService( #endif // BUILDFLAG(IS_CHROMEOS_ASH) && (BUILDFLAG(USE_VAAPI) || // BUILDFLAG(USE_V4L2_CODEC)) @@ -54,7 +61,7 @@ (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) auto RunStableVideoDecoderFactoryProcessService( mojo::PendingReceiver< -@@ -367,7 +367,7 @@ auto RunStableVideoDecoderFactoryProcessService( +@@ -410,7 +410,7 @@ auto RunStableVideoDecoderFactoryProcessService( #endif // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) && // (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) @@ -63,7 +70,7 @@ auto RunVideoEncodeAcceleratorProviderFactory( mojo::PendingReceiver receiver) { -@@ -390,7 +390,7 @@ void RegisterIOThreadServices(mojo::ServiceFactory& se +@@ -433,7 +433,7 @@ void RegisterIOThreadServices(mojo::ServiceFactory& se // loop of type IO that can get notified when pipes have data. services.Add(RunNetworkService); @@ -72,7 +79,7 @@ (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) if (base::FeatureList::IsEnabled( features::kRunStableVideoDecoderFactoryProcessServiceOnIOThread)) { -@@ -440,7 +440,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& +@@ -491,7 +491,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& #endif // BUILDFLAG(IS_CHROMEOS_ASH) && (BUILDFLAG(USE_VAAPI) || // BUILDFLAG(USE_V4L2_CODEC)) @@ -81,7 +88,7 @@ (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) if (!base::FeatureList::IsEnabled( features::kRunStableVideoDecoderFactoryProcessServiceOnIOThread)) { -@@ -449,7 +449,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& +@@ -500,7 +500,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& #endif // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) && // (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_utility_speech_speech__recognition__sandbox__hook__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_utility_speech_speech__recognition__sandbox__hook__linux.cc index b1621e77c011..b0a41dc9c076 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_utility_speech_speech__recognition__sandbox__hook__linux.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_utility_speech_speech__recognition__sandbox__hook__linux.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/content/utility/speech/speech_recognition_sandbox_hook_linux.cc.orig 2023-01-11 09:17:16 UTC +--- src/3rdparty/chromium/content/utility/speech/speech_recognition_sandbox_hook_linux.cc.orig 2024-04-19 13:02:56 UTC +++ src/3rdparty/chromium/content/utility/speech/speech_recognition_sandbox_hook_linux.cc @@ -12,11 +12,14 @@ #include "sandbox/linux/syscall_broker/broker_command.h" @@ -27,9 +27,9 @@ #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/qt6-webengine/files/patch-src_3rdparty_chromium_content_utility_utility__main.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_utility_utility__main.cc index 684d0dd4d918..75ea7b2fcfe7 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_utility_utility__main.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_utility_utility__main.cc @@ -1,8 +1,8 @@ ---- src/3rdparty/chromium/content/utility/utility_main.cc.orig 2024-07-03 01:14:49 UTC +--- src/3rdparty/chromium/content/utility/utility_main.cc.orig 2025-02-21 12:29:33 UTC +++ src/3rdparty/chromium/content/utility/utility_main.cc -@@ -39,17 +39,21 @@ - #include "third_party/icu/source/common/unicode/unistr.h" - #include "third_party/icu/source/i18n/unicode/timezone.h" +@@ -38,17 +38,21 @@ + #include "services/screen_ai/buildflags/buildflags.h" + #include "services/tracing/public/cpp/trace_startup.h" -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) @@ -10,7 +10,7 @@ #include "base/files/file_util.h" #include "base/pickle.h" #include "content/child/sandboxed_process_thread_type_handler.h" -+#if BUILDFLAG(IS_LINUX) ++#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" @@ -23,7 +23,7 @@ #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 -@@ -61,10 +65,15 @@ +@@ -60,10 +64,15 @@ #endif #endif @@ -40,16 +40,16 @@ #if BUILDFLAG(IS_CHROMEOS_ASH) #include "chromeos/ash/components/assistant/buildflags.h" #include "chromeos/ash/services/ime/ime_sandbox_hook.h" -@@ -76,7 +85,7 @@ +@@ -75,7 +84,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 - -@@ -102,7 +111,7 @@ namespace { +@@ -103,7 +112,7 @@ namespace { namespace { @@ -58,8 +58,11 @@ std::vector GetNetworkContextsParentDirectories() { base::MemoryMappedFile::Region region; base::ScopedFD read_pipe_fd = base::FileDescriptorStore::GetInstance().TakeFD( -@@ -130,7 +139,7 @@ bool ShouldUseAmdGpuPolicy(sandbox::mojom::Sandbox san +@@ -130,9 +139,10 @@ std::vector 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) @@ -67,17 +70,25 @@ sandbox_type == sandbox::mojom::Sandbox::kHardwareVideoDecoding || #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) sandbox_type == sandbox::mojom::Sandbox::kHardwareVideoEncoding; -@@ -255,7 +264,8 @@ int UtilityMain(MainFunctionParams parameters) { - } +@@ -147,6 +157,7 @@ bool ShouldUseAmdGpuPolicy(sandbox::mojom::Sandbox san + + return false; + } ++#endif + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) + + #if BUILDFLAG(IS_WIN) +@@ -246,7 +257,8 @@ int UtilityMain(MainFunctionParams parameters) { } + #endif -#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, -@@ -266,7 +276,7 @@ int UtilityMain(MainFunctionParams parameters) { + // 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, which may race with +@@ -258,7 +270,7 @@ int UtilityMain(MainFunctionParams parameters) { } #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -86,16 +97,16 @@ // Initializes the sandbox before any threads are created. // TODO(jorgelo): move this after GTK initialization when we enable a strict // Seccomp-BPF policy. -@@ -307,7 +317,7 @@ int UtilityMain(MainFunctionParams parameters) { - #endif - break; - #endif +@@ -305,7 +317,7 @@ int UtilityMain(MainFunctionParams parameters) { + case sandbox::mojom::Sandbox::kVideoEffects: + // TODO(crbug.com/361128453): Implement this. + NOTREACHED() << "kVideoEffects sandbox not implemented."; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) case sandbox::mojom::Sandbox::kHardwareVideoDecoding: pre_sandbox_hook = base::BindOnce(&media::HardwareVideoDecodingPreSandboxHook); -@@ -334,6 +344,7 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -332,6 +344,7 @@ int UtilityMain(MainFunctionParams parameters) { default: break; } @@ -103,7 +114,7 @@ if (!sandbox::policy::IsUnsandboxedSandboxType(sandbox_type) && (parameters.zygote_child || !pre_sandbox_hook.is_null())) { sandbox_options.use_amd_specific_policies = -@@ -341,6 +352,11 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -339,6 +352,11 @@ int UtilityMain(MainFunctionParams parameters) { sandbox::policy::Sandbox::Initialize( sandbox_type, std::move(pre_sandbox_hook), sandbox_options); } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_utility_utility__thread__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_utility_utility__thread__impl.cc index 2bb934f16bed..7844c72d4c4f 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_utility_utility__thread__impl.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_utility_utility__thread__impl.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/utility/utility_thread_impl.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/content/utility/utility_thread_impl.cc.orig 2024-05-21 18:07:39 UTC +++ src/3rdparty/chromium/content/utility/utility_thread_impl.cc -@@ -32,7 +32,7 @@ +@@ -31,7 +31,7 @@ #include "mojo/public/cpp/bindings/pending_receiver.h" #include "mojo/public/cpp/bindings/service_factory.h" @@ -9,7 +9,7 @@ #include "content/child/sandboxed_process_thread_type_handler.h" #endif -@@ -252,7 +252,8 @@ void UtilityThreadImpl::Init() { +@@ -251,7 +251,8 @@ void UtilityThreadImpl::Init() { GetContentClient()->utility()->UtilityThreadStarted(); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_zygote_zygote__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_zygote_zygote__linux.cc index cd9e947bd91f..ddce2d251d97 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_zygote_zygote__linux.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_zygote_zygote__linux.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/content/zygote/zygote_linux.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/content/zygote/zygote_linux.cc.orig 2024-07-30 11:12:21 UTC +++ src/3rdparty/chromium/content/zygote/zygote_linux.cc @@ -1,6 +1,7 @@ // Copyright 2012 The Chromium Authors @@ -6,9 +6,9 @@ // found in the LICENSE file. +#if 0 - #include "content/zygote/zygote_linux.h" - -@@ -709,3 +710,4 @@ void Zygote::HandleReinitializeLoggingRequest(base::Pi + #ifdef UNSAFE_BUFFERS_BUILD + // TODO(crbug.com/342213636): Remove this and spanify to fix the errors. +@@ -723,3 +724,4 @@ void Zygote::HandleReinitializeLoggingRequest(base::Pi } } // namespace content diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_zygote_zygote__main__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_zygote_zygote__main__linux.cc index abdbd813300a..703c803a6217 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_zygote_zygote__main__linux.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_zygote_zygote__main__linux.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/content/zygote/zygote_main_linux.cc.orig 2024-07-03 01:14:49 UTC +--- src/3rdparty/chromium/content/zygote/zygote_main_linux.cc.orig 2025-02-21 12:29:33 UTC +++ src/3rdparty/chromium/content/zygote/zygote_main_linux.cc @@ -11,7 +11,9 @@ #include diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_device_bluetooth_bluetooth__adapter.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_device_bluetooth_bluetooth__adapter.cc index 852ac4023dd0..94e34a510984 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_device_bluetooth_bluetooth__adapter.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_device_bluetooth_bluetooth__adapter.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/device/bluetooth/bluetooth_adapter.cc.orig 2023-04-28 17:01:32 UTC +--- src/3rdparty/chromium/device/bluetooth/bluetooth_adapter.cc.orig 2024-03-22 08:19:40 UTC +++ src/3rdparty/chromium/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/qt6-webengine/files/patch-src_3rdparty_chromium_device_gamepad_gamepad__provider.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_device_gamepad_gamepad__provider.cc index b1615ce9a8d9..644fe88634b6 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_device_gamepad_gamepad__provider.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_device_gamepad_gamepad__provider.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/device/gamepad/gamepad_provider.cc.orig 2023-03-09 06:31:50 UTC +--- src/3rdparty/chromium/device/gamepad/gamepad_provider.cc.orig 2024-08-26 12:06:38 UTC +++ src/3rdparty/chromium/device/gamepad/gamepad_provider.cc -@@ -219,7 +219,7 @@ void GamepadProvider::Initialize(std::unique_ptr("Gamepad polling thread"); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_browser_api_api__browser__context__keyed__service__factories.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_browser_api_api__browser__context__keyed__service__factories.cc index a43d14b7864d..d97bf3c39b65 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_browser_api_api__browser__context__keyed__service__factories.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_browser_api_api__browser__context__keyed__service__factories.cc @@ -1,8 +1,8 @@ ---- src/3rdparty/chromium/extensions/browser/api/api_browser_context_keyed_service_factories.cc.orig 2024-07-03 01:14:49 UTC +--- src/3rdparty/chromium/extensions/browser/api/api_browser_context_keyed_service_factories.cc.orig 2025-02-21 12:29:33 UTC +++ src/3rdparty/chromium/extensions/browser/api/api_browser_context_keyed_service_factories.cc -@@ -121,7 +121,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt - MessagingAPIMessageFilter::EnsureAssociatedFactoryBuilt(); +@@ -126,7 +126,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt #endif + MessageService::GetFactoryInstance(); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \ - BUILDFLAG(IS_MAC) + BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_browser_api_management_management__api.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_browser_api_management_management__api.cc index 64e67c928e0c..bc173521274e 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_browser_api_management_management__api.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_browser_api_management_management__api.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/extensions/browser/api/management/management_api.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/extensions/browser/api/management/management_api.cc.orig 2024-08-26 12:06:38 UTC +++ src/3rdparty/chromium/extensions/browser/api/management/management_api.cc -@@ -279,7 +279,7 @@ bool PlatformSupportsApprovalFlowForExtensions() { +@@ -285,7 +285,7 @@ bool PlatformSupportsApprovalFlowForExtensions() { #if BUILDFLAG(IS_CHROMEOS) // ChromeOS devices have this feature already shipped. return true; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_browser_api_messaging_message__service.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_browser_api_messaging_message__service.cc index f5f0135ac58d..a9df902e7c30 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_browser_api_messaging_message__service.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_browser_api_messaging_message__service.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/extensions/browser/api/messaging/message_service.cc.orig 2024-07-03 01:14:49 UTC +--- src/3rdparty/chromium/extensions/browser/api/messaging/message_service.cc.orig 2025-02-21 12:29:33 UTC +++ src/3rdparty/chromium/extensions/browser/api/messaging/message_service.cc -@@ -70,7 +70,7 @@ const char kReceivingEndDoesntExistError[] = +@@ -78,7 +78,7 @@ const char kReceivingEndDoesntExistError[] = const char kReceivingEndDoesntExistError[] = "Could not establish connection. Receiving end does not exist."; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ const char kMissingPermissionError[] = "Access to native messaging requires nativeMessaging permission."; const char kProhibitedByPoliciesError[] = -@@ -544,7 +544,7 @@ void MessageService::OpenChannelToNativeAppImpl( +@@ -555,7 +555,7 @@ void MessageService::OpenChannelToNativeAppImpl( return; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_common_command.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_common_command.cc index 9fe832b28e09..8f6e2cf59a80 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_common_command.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_common_command.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/extensions/common/command.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/extensions/common/command.cc.orig 2024-09-30 07:45:04 UTC +++ src/3rdparty/chromium/extensions/common/command.cc -@@ -283,7 +283,7 @@ std::string Command::CommandPlatform() { +@@ -286,7 +286,7 @@ std::string Command::CommandPlatform() { return values::kKeybindingPlatformMac; #elif BUILDFLAG(IS_CHROMEOS) return values::kKeybindingPlatformChromeOs; @@ -8,4 +8,4 @@ +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) return values::kKeybindingPlatformLinux; #elif BUILDFLAG(IS_FUCHSIA) - // TODO(crbug.com/1312215): Change this once we decide what string should be + // TODO(crbug.com/40220501): Change this once we decide what string should be diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_renderer_bindings_api__binding__util.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_renderer_bindings_api__binding__util.cc index 17ce24fdf7f7..4bfb49ec12bc 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_renderer_bindings_api__binding__util.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_renderer_bindings_api__binding__util.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/extensions/renderer/bindings/api_binding_util.cc.orig 2022-02-28 16:54:41 UTC +--- src/3rdparty/chromium/extensions/renderer/bindings/api_binding_util.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/extensions/renderer/bindings/api_binding_util.cc -@@ -132,7 +132,7 @@ std::string GetPlatformString() { +@@ -133,7 +133,7 @@ std::string GetPlatformString() { return "lacros"; #elif BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_CHROMEOS_LACROS) return "chromeos"; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_shell_app_shell__main__delegate.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_shell_app_shell__main__delegate.cc index 60c21fd36c2f..818343c76132 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_shell_app_shell__main__delegate.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_shell_app_shell__main__delegate.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/extensions/shell/app/shell_main_delegate.cc.orig 2023-11-03 10:09:45 UTC +--- src/3rdparty/chromium/extensions/shell/app/shell_main_delegate.cc.orig 2024-04-19 13:02:56 UTC +++ src/3rdparty/chromium/extensions/shell/app/shell_main_delegate.cc @@ -43,7 +43,7 @@ #if BUILDFLAG(IS_WIN) @@ -9,8 +9,8 @@ #include "base/nix/xdg_util.h" #elif BUILDFLAG(IS_MAC) #include "base/base_paths_mac.h" -@@ -62,7 +62,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/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_shell_browser_api_runtime_shell__runtime__api__delegate.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_shell_browser_api_runtime_shell__runtime__api__delegate.cc index 478bd8df8e65..45b1f5fc6296 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_shell_browser_api_runtime_shell__runtime__api__delegate.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_shell_browser_api_runtime_shell__runtime__api__delegate.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/extensions/shell/browser/api/runtime/shell_runtime_api_delegate.cc.orig 2023-05-31 08:12:17 UTC +--- src/3rdparty/chromium/extensions/shell/browser/api/runtime/shell_runtime_api_delegate.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/extensions/shell/browser/api/runtime/shell_runtime_api_delegate.cc -@@ -44,7 +44,7 @@ void ShellRuntimeAPIDelegate::OpenURL(const GURL& unin +@@ -45,7 +45,7 @@ void ShellRuntimeAPIDelegate::OpenURL(const GURL& unin bool ShellRuntimeAPIDelegate::GetPlatformInfo(PlatformInfo* info) { #if BUILDFLAG(IS_CHROMEOS_ASH) info->os = api::runtime::PlatformOs::kCros; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_shell_browser_shell__extensions__api__client.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_shell_browser_shell__extensions__api__client.cc index 4d16ec0ac0ba..280891b6545e 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_shell_browser_shell__extensions__api__client.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_shell_browser_shell__extensions__api__client.cc @@ -1,8 +1,8 @@ ---- src/3rdparty/chromium/extensions/shell/browser/shell_extensions_api_client.cc.orig 2022-02-28 16:54:41 UTC +--- src/3rdparty/chromium/extensions/shell/browser/shell_extensions_api_client.cc.orig 2024-06-17 12:56:06 UTC +++ src/3rdparty/chromium/extensions/shell/browser/shell_extensions_api_client.cc @@ -58,7 +58,7 @@ ShellExtensionsAPIClient::CreateDisplayInfoProvider() - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // TODO(crbug.com/40118868): 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) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_shell_browser_shell__extensions__api__client.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_shell_browser_shell__extensions__api__client.h index 6fc003f13ba3..02dcea93ef08 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_shell_browser_shell__extensions__api__client.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_shell_browser_shell__extensions__api__client.h @@ -1,8 +1,8 @@ ---- src/3rdparty/chromium/extensions/shell/browser/shell_extensions_api_client.h.orig 2022-02-28 16:54:41 UTC +--- src/3rdparty/chromium/extensions/shell/browser/shell_extensions_api_client.h.orig 2024-06-17 12:56:06 UTC +++ src/3rdparty/chromium/extensions/shell/browser/shell_extensions_api_client.h @@ -36,7 +36,7 @@ class ShellExtensionsAPIClient : public ExtensionsAPIC const override; - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // TODO(crbug.com/40118868): 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) @@ -11,7 +11,7 @@ MessagingDelegate* GetMessagingDelegate() override; @@ -45,7 +45,7 @@ class ShellExtensionsAPIClient : public ExtensionsAPIC private: - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // TODO(crbug.com/40118868): 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) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_common_gpu__memory__buffer__support.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_common_gpu__memory__buffer__support.cc deleted file mode 100644 index 12e6456454a5..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_common_gpu__memory__buffer__support.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- src/3rdparty/chromium/gpu/command_buffer/common/gpu_memory_buffer_support.cc.orig 2023-09-13 12:11:42 UTC -+++ src/3rdparty/chromium/gpu/command_buffer/common/gpu_memory_buffer_support.cc -@@ -182,7 +182,7 @@ uint32_t GetPlatformSpecificTextureTarget() { - #if BUILDFLAG(IS_MAC) - return macos_specific_texture_target; - #elif BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - return GL_TEXTURE_EXTERNAL_OES; - #elif BUILDFLAG(IS_IOS) - return GL_TEXTURE_2D; -@@ -217,7 +217,7 @@ GPU_EXPORT bool NativeBufferNeedsPlatformSpecificTextu - gfx::BufferFormat format, - gfx::BufferPlane plane) { - #if BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ -- BUILDFLAG(IS_WIN) -+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - // Always use GL_TEXTURE_2D as the target for RGB textures. - // https://crbug.com/916728 - if (format == gfx::BufferFormat::R_8 || format == gfx::BufferFormat::RG_88 || diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_dawn__context__provider.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_dawn__context__provider.cc index 3f23f289eb61..55220641c0cd 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_dawn__context__provider.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_dawn__context__provider.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/gpu/command_buffer/service/dawn_context_provider.cc.orig 2024-01-30 07:53:34 UTC +--- src/3rdparty/chromium/gpu/command_buffer/service/dawn_context_provider.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/gpu/command_buffer/service/dawn_context_provider.cc -@@ -186,7 +186,7 @@ wgpu::BackendType DawnContextProvider::GetDefaultBacke +@@ -307,7 +307,7 @@ wgpu::BackendType DawnContextProvider::GetDefaultBacke return base::FeatureList::IsEnabled(features::kSkiaGraphiteDawnUseD3D12) ? wgpu::BackendType::D3D12 : wgpu::BackendType::D3D11; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_gles2__cmd__decoder.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_gles2__cmd__decoder.cc index 5aa0320936e1..0c3d258919bd 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_gles2__cmd__decoder.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_gles2__cmd__decoder.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/gpu/command_buffer/service/gles2_cmd_decoder.cc.orig 2024-07-03 01:14:49 UTC +--- src/3rdparty/chromium/gpu/command_buffer/service/gles2_cmd_decoder.cc.orig 2025-02-21 12:29:33 UTC +++ src/3rdparty/chromium/gpu/command_buffer/service/gles2_cmd_decoder.cc -@@ -3001,7 +3001,7 @@ GLES2Decoder* GLES2Decoder::Create( +@@ -2908,7 +2908,7 @@ GLES2Decoder* GLES2Decoder::Create( // Fix for Qt WebEngine Crash when QSG_RHI_BACKEND=opengl // Allow linux to run fuzzers. #if BUILDFLAG(ENABLE_VALIDATING_COMMAND_DECODER) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__context__state.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__context__state.cc new file mode 100644 index 000000000000..b8792a3e1bbc --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__context__state.cc @@ -0,0 +1,29 @@ +--- src/3rdparty/chromium/gpu/command_buffer/service/shared_context_state.cc.orig 2024-10-22 08:31:56 UTC ++++ src/3rdparty/chromium/gpu/command_buffer/service/shared_context_state.cc +@@ -56,7 +56,7 @@ + #include "gpu/vulkan/vulkan_implementation.h" + #include "gpu/vulkan/vulkan_util.h" + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + #include "gpu/command_buffer/service/external_semaphore_pool.h" + #endif + +@@ -287,7 +287,7 @@ SharedContextState::SharedContextState( + if (gr_context_type_ == GrContextType::kVulkan) { + if (vk_context_provider_) { + #if BUILDFLAG(ENABLE_VULKAN) && \ +- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_WIN)) ++ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)) + external_semaphore_pool_ = std::make_unique(this); + #endif + use_virtualized_gl_contexts_ = false; +@@ -320,7 +320,7 @@ SharedContextState::~SharedContextState() { + transfer_cache_.reset(); + + #if BUILDFLAG(ENABLE_VULKAN) && \ +- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_WIN)) ++ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)) + external_semaphore_pool_.reset(); + #endif + diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__context__state.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__context__state.h new file mode 100644 index 000000000000..7bf1cb7bcbd1 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__context__state.h @@ -0,0 +1,20 @@ +--- src/3rdparty/chromium/gpu/command_buffer/service/shared_context_state.h.orig 2024-10-22 08:31:56 UTC ++++ src/3rdparty/chromium/gpu/command_buffer/service/shared_context_state.h +@@ -222,7 +222,7 @@ class GPU_GLES2_EXPORT SharedContextState + return &memory_type_tracker_; + } + #if BUILDFLAG(ENABLE_VULKAN) && \ +- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_WIN)) ++ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)) + ExternalSemaphorePool* external_semaphore_pool() { + return external_semaphore_pool_.get(); + } +@@ -429,7 +429,7 @@ class GPU_GLES2_EXPORT SharedContextState + bool disable_check_reset_status_throttling_for_test_ = false; + + #if BUILDFLAG(ENABLE_VULKAN) && \ +- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_WIN)) ++ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)) + std::unique_ptr external_semaphore_pool_; + #endif + diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.cc index 1f74e598a479..64eb7c550d54 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.cc @@ -1,9 +1,9 @@ ---- src/3rdparty/chromium/gpu/command_buffer/service/shared_image/angle_vulkan_image_backing_factory.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/gpu/command_buffer/service/shared_image/angle_vulkan_image_backing_factory.cc.orig 2024-08-26 12:06:38 UTC +++ src/3rdparty/chromium/gpu/command_buffer/service/shared_image/angle_vulkan_image_backing_factory.cc -@@ -21,7 +21,7 @@ namespace { +@@ -20,7 +20,7 @@ namespace { // TODO(penghuang): verify the scanout is the right usage for video playback. // crbug.com/1280798 - constexpr uint32_t kSupportedUsage = + constexpr SharedImageUsageSet kSupportedUsage = -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) SHARED_IMAGE_USAGE_SCANOUT | diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__image_external__vk__image__backing.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__image_external__vk__image__backing.cc index 39ba3bbb2bce..732b6ad30ef4 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__image_external__vk__image__backing.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__image_external__vk__image__backing.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/gpu/command_buffer/service/shared_image/external_vk_image_backing.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/gpu/command_buffer/service/shared_image/external_vk_image_backing.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/gpu/command_buffer/service/shared_image/external_vk_image_backing.cc -@@ -49,7 +49,7 @@ +@@ -59,7 +59,7 @@ #include "ui/gl/gl_version_info.h" #include "ui/gl/scoped_binders.h" @@ -9,7 +9,7 @@ #include "gpu/command_buffer/service/shared_image/external_vk_image_dawn_representation.h" #if BUILDFLAG(DAWN_ENABLE_BACKEND_OPENGLES) #include "gpu/command_buffer/service/shared_image/dawn_gl_texture_representation.h" -@@ -679,7 +679,7 @@ std::unique_ptr ExternalVkIma +@@ -727,7 +727,7 @@ std::unique_ptr ExternalVkIma wgpu::BackendType backend_type, std::vector view_formats, scoped_refptr context_state) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__image_external__vk__image__backing__factory.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__image_external__vk__image__backing__factory.cc index 3ad2b8d29e9d..53b033d5dcf1 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__image_external__vk__image__backing__factory.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__image_external__vk__image__backing__factory.cc @@ -1,11 +1,11 @@ ---- src/3rdparty/chromium/gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.cc -@@ -147,7 +147,7 @@ bool IsFormatSupported(viz::SharedImageFormat format, +@@ -142,7 +142,7 @@ bool IsFormatSupported(viz::SharedImageFormat format, } // namespace - constexpr uint32_t kSupportedUsage = + constexpr SharedImageUsageSet 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 diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__image_shared__image__factory.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__image_shared__image__factory.cc index 061b05703dba..588bcc7b9c22 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__image_shared__image__factory.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__image_shared__image__factory.cc @@ -1,6 +1,15 @@ ---- src/3rdparty/chromium/gpu/command_buffer/service/shared_image/shared_image_factory.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/gpu/command_buffer/service/shared_image/shared_image_factory.cc.orig 2025-02-21 12:29:33 UTC +++ src/3rdparty/chromium/gpu/command_buffer/service/shared_image/shared_image_factory.cc -@@ -143,7 +143,7 @@ gfx::GpuMemoryBufferType GetNativeBufferType() { +@@ -48,7 +48,7 @@ + #include "gpu/command_buffer/service/shared_image/angle_vulkan_image_backing_factory.h" + #include "gpu/vulkan/vulkan_device_queue.h" + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + #include "gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.h" + #endif + +@@ -112,7 +112,7 @@ gfx::GpuMemoryBufferType GetNativeBufferType() { return gfx::GpuMemoryBufferType::IO_SURFACE_BUFFER; #elif BUILDFLAG(IS_ANDROID) return gfx::GpuMemoryBufferType::ANDROID_HARDWARE_BUFFER; @@ -9,3 +18,12 @@ return gfx::GpuMemoryBufferType::NATIVE_PIXMAP; #elif BUILDFLAG(IS_WIN) return gfx::GpuMemoryBufferType::DXGI_SHARED_HANDLE; +@@ -333,7 +333,7 @@ SharedImageFactory::SharedImageFactory( + context_state_, workarounds_); + factories_.push_back(std::move(ozone_factory)); + } +-#if BUILDFLAG(ENABLE_VULKAN) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA)) ++#if BUILDFLAG(ENABLE_VULKAN) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)) + if (gr_context_type_ == GrContextType::kVulkan) { + auto external_vk_image_factory = + std::make_unique(context_state_); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__image_shared__image__manager.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__image_shared__image__manager.cc index 33b961cc39ca..2933a1efa697 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__image_shared__image__manager.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__image_shared__image__manager.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/gpu/command_buffer/service/shared_image/shared_image_manager.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/gpu/command_buffer/service/shared_image/shared_image_manager.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/gpu/command_buffer/service/shared_image/shared_image_manager.cc -@@ -550,7 +550,7 @@ bool SharedImageManager::SupportsScanoutImages() { +@@ -603,7 +603,7 @@ bool SharedImageManager::SupportsScanoutImages() { return true; #elif BUILDFLAG(IS_ANDROID) return base::AndroidHardwareBufferCompat::IsSupportAvailable(); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__image_wrapped__sk__image__backing.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__image_wrapped__sk__image__backing.cc index b30cb289780f..570400dcb3ad 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__image_wrapped__sk__image__backing.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__image_wrapped__sk__image__backing.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/gpu/command_buffer/service/shared_image/wrapped_sk_image_backing.cc.orig 2023-11-03 10:09:45 UTC +--- src/3rdparty/chromium/gpu/command_buffer/service/shared_image/wrapped_sk_image_backing.cc.orig 2024-03-22 08:19:40 UTC +++ src/3rdparty/chromium/gpu/command_buffer/service/shared_image/wrapped_sk_image_backing.cc -@@ -212,7 +212,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/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_webgpu__decoder__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_webgpu__decoder__impl.cc index aa5762befa17..3ce737287558 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_webgpu__decoder__impl.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_webgpu__decoder__impl.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/gpu/command_buffer/service/webgpu_decoder_impl.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/gpu/command_buffer/service/webgpu_decoder_impl.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/gpu/command_buffer/service/webgpu_decoder_impl.cc -@@ -1243,7 +1243,7 @@ void WebGPUDecoderImpl::RequestAdapterImpl( +@@ -1309,7 +1309,7 @@ WGPUFuture WebGPUDecoderImpl::RequestAdapterImpl( force_fallback_adapter = true; } @@ -9,7 +9,7 @@ if (!shared_context_state_->GrContextIsVulkan() && !shared_context_state_->IsGraphiteDawnVulkan() && use_webgpu_adapter_ != WebGPUAdapterName::kOpenGLES) { -@@ -1895,7 +1895,7 @@ WebGPUDecoderImpl::AssociateMailboxDawn( +@@ -1978,7 +1978,7 @@ WebGPUDecoderImpl::AssociateMailboxDawn( } #if !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_APPLE) && \ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_config_gpu__control__list.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_config_gpu__control__list.cc index 8db4b1e23523..45c3e133775c 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_config_gpu__control__list.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_config_gpu__control__list.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/gpu/config/gpu_control_list.cc.orig 2024-01-30 07:53:34 UTC +--- src/3rdparty/chromium/gpu/config/gpu_control_list.cc.orig 2024-09-30 07:45:04 UTC +++ src/3rdparty/chromium/gpu/config/gpu_control_list.cc -@@ -276,7 +276,7 @@ bool GpuControlList::More::GLVersionInfoMismatch( +@@ -282,7 +282,7 @@ bool GpuControlList::More::GLVersionInfoMismatch( GpuControlList::GLType GpuControlList::More::GetDefaultGLType() { #if BUILDFLAG(IS_CHROMEOS) return kGLTypeGL; @@ -9,7 +9,7 @@ return kGLTypeGL; #elif BUILDFLAG(IS_MAC) return kGLTypeGL; -@@ -811,7 +811,7 @@ GpuControlList::OsType GpuControlList::GetOsType() { +@@ -819,7 +819,7 @@ GpuControlList::OsType GpuControlList::GetOsType() { return kOsAndroid; #elif BUILDFLAG(IS_FUCHSIA) return kOsFuchsia; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_config_gpu__finch__features.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_config_gpu__finch__features.cc index 0eded630cb5b..737b7e3aa0ae 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_config_gpu__finch__features.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_config_gpu__finch__features.cc @@ -1,21 +1,20 @@ ---- src/3rdparty/chromium/gpu/config/gpu_finch_features.cc.orig 2024-07-03 01:14:49 UTC +--- src/3rdparty/chromium/gpu/config/gpu_finch_features.cc.orig 2025-02-21 12:29:33 UTC +++ src/3rdparty/chromium/gpu/config/gpu_finch_features.cc -@@ -61,7 +61,7 @@ bool IsDeviceBlocked(const char* field, const std::str - - // Used to limit GL version to 2.0 for skia raster and compositing. - #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(kUseGles2ForOopR, - "UseGles2ForOopR", - base::FEATURE_DISABLED_BY_DEFAULT); -@@ -142,7 +142,8 @@ BASE_FEATURE(kAggressiveSkiaGpuResourcePurge, +@@ -148,7 +148,7 @@ const base::FeatureParam // DefaultEnableGpuRasterization has launched on Mac, Windows, ChromeOS, // Android and Linux. #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(kDefaultEnableGpuRasterization, "DefaultEnableGpuRasterization", base::FEATURE_ENABLED_BY_DEFAULT); +@@ -162,7 +162,7 @@ BASE_FEATURE(kDefaultEnableGpuRasterization, + // Enables the use of out of process rasterization for canvas. + #if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_WIN) || \ + (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64)) || BUILDFLAG(IS_ANDROID) || \ +- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + BASE_FEATURE(kCanvasOopRasterization, + "CanvasOopRasterization", + base::FEATURE_ENABLED_BY_DEFAULT); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_config_gpu__info__collector.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_config_gpu__info__collector.cc index 5f54598ac39e..95d45de86202 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_config_gpu__info__collector.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_config_gpu__info__collector.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/gpu/config/gpu_info_collector.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/gpu/config/gpu_info_collector.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/gpu/config/gpu_info_collector.cc -@@ -364,7 +364,7 @@ void ReportWebGPUAdapterMetrics(dawn::native::Instance +@@ -368,7 +368,7 @@ void ReportWebGPUAdapterMetrics(dawn::native::Instance void ReportWebGPUSupportMetrics(dawn::native::Instance* instance) { static BASE_FEATURE(kCollectWebGPUSupportMetrics, "CollectWebGPUSupportMetrics", diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_common_gpu__memory__buffer__support.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_common_gpu__memory__buffer__support.cc index 4b96fd768921..20f42950aedc 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_common_gpu__memory__buffer__support.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_common_gpu__memory__buffer__support.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/gpu/ipc/common/gpu_memory_buffer_support.cc.orig 2023-08-17 07:33:31 UTC +--- src/3rdparty/chromium/gpu/ipc/common/gpu_memory_buffer_support.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/gpu/ipc/common/gpu_memory_buffer_support.cc @@ -26,7 +26,7 @@ #include "ui/ozone/public/ozone_platform.h" @@ -9,7 +9,7 @@ #include "gpu/ipc/common/gpu_memory_buffer_impl_native_pixmap.h" #endif -@@ -56,7 +56,7 @@ GpuMemoryBufferSupport::GetNativeGpuMemoryBufferType() +@@ -55,7 +55,7 @@ GpuMemoryBufferSupport::GetNativeGpuMemoryBufferType() return gfx::IO_SURFACE_BUFFER; #elif BUILDFLAG(IS_ANDROID) return gfx::ANDROID_HARDWARE_BUFFER; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_service_gpu__init.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_service_gpu__init.cc index 1dc39b5b1783..ac3ee9a58d74 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_service_gpu__init.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_service_gpu__init.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/gpu/ipc/service/gpu_init.cc.orig 2024-10-02 15:40:01 UTC +--- src/3rdparty/chromium/gpu/ipc/service/gpu_init.cc.orig 2025-02-21 12:29:33 UTC +++ src/3rdparty/chromium/gpu/ipc/service/gpu_init.cc -@@ -370,7 +370,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -403,7 +403,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL enable_watchdog = false; #endif @@ -9,7 +9,7 @@ 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 -@@ -407,7 +407,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -440,7 +440,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL } bool attempted_startsandbox = false; @@ -18,7 +18,7 @@ // 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. -@@ -508,7 +508,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -544,7 +544,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL gpu_preferences_.gr_context_type = GrContextType::kGL; } @@ -27,7 +27,7 @@ // 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 -@@ -590,7 +590,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -626,7 +626,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL command_line, gpu_feature_info_, gpu_preferences_.disable_software_rasterizer, false); if (gl_use_swiftshader_) { @@ -36,7 +36,7 @@ VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly " << "on Linux"; return false; -@@ -747,7 +747,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -777,7 +777,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL InitializePlatformOverlaySettings(&gpu_info_, gpu_feature_info_); @@ -45,7 +45,7 @@ // 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. -@@ -802,7 +802,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -832,7 +832,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL } } } @@ -54,7 +54,7 @@ (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 -@@ -956,7 +956,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c +@@ -1017,7 +1017,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c } bool gl_disabled = gl::GetGLImplementation() == gl::kGLImplementationDisabled; @@ -63,7 +63,7 @@ (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 -@@ -1032,7 +1032,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c +@@ -1078,7 +1078,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c } } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_service_gpu__memory__buffer__factory.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_service_gpu__memory__buffer__factory.cc index 8754ec71a134..6379ea958d54 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_service_gpu__memory__buffer__factory.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_service_gpu__memory__buffer__factory.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/gpu/ipc/service/gpu_memory_buffer_factory.cc.orig 2023-03-09 06:31:50 UTC +--- src/3rdparty/chromium/gpu/ipc/service/gpu_memory_buffer_factory.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/gpu/ipc/service/gpu_memory_buffer_factory.cc -@@ -13,7 +13,7 @@ +@@ -14,7 +14,7 @@ #include "gpu/ipc/service/gpu_memory_buffer_factory_io_surface.h" #endif @@ -9,10 +9,10 @@ #include "gpu/ipc/service/gpu_memory_buffer_factory_native_pixmap.h" #endif -@@ -36,7 +36,7 @@ GpuMemoryBufferFactory::CreateNativeType( - return std::make_unique(); - #elif BUILDFLAG(IS_ANDROID) - return std::make_unique(); +@@ -71,7 +71,7 @@ GpuMemoryBufferFactory::CreateNativeType( + // to have a factory that vends invalid GMB handles rather than having no + // factory at all. + return std::make_unique(); -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) return std::make_unique( diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_generate__bindings.py b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_generate__bindings.py index eeb4007c4983..49999857ae41 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_generate__bindings.py +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_generate__bindings.py @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/gpu/vulkan/generate_bindings.py.orig 2023-11-03 10:09:45 UTC +--- src/3rdparty/chromium/gpu/vulkan/generate_bindings.py.orig 2024-06-17 12:56:06 UTC +++ src/3rdparty/chromium/gpu/vulkan/generate_bindings.py -@@ -270,7 +270,7 @@ VULKAN_DEVICE_FUNCTIONS = [ +@@ -271,7 +271,7 @@ VULKAN_DEVICE_FUNCTIONS = [ ] }, { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__device__queue.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__device__queue.cc index 017d115545b4..d638ba9fbf59 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__device__queue.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__device__queue.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/gpu/vulkan/vulkan_device_queue.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/gpu/vulkan/vulkan_device_queue.cc.orig 2024-09-30 07:45:04 UTC +++ src/3rdparty/chromium/gpu/vulkan/vulkan_device_queue.cc -@@ -121,7 +121,7 @@ bool VulkanDeviceQueue::Initialize( +@@ -154,7 +154,7 @@ bool VulkanDeviceQueue::Initialize( // In dual-CPU cases, we cannot detect the active GPU correctly on Linux, // so don't select GPU device based on the |gpu_info|. @@ -9,7 +9,7 @@ // 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)) { -@@ -264,7 +264,7 @@ bool VulkanDeviceQueue::Initialize( +@@ -297,7 +297,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/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__device__queue.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__device__queue.h index 13126216b757..0fca3b07e822 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__device__queue.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__device__queue.h @@ -1,7 +1,7 @@ ---- src/3rdparty/chromium/gpu/vulkan/vulkan_device_queue.h.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/gpu/vulkan/vulkan_device_queue.h.orig 2024-07-30 11:12:21 UTC +++ src/3rdparty/chromium/gpu/vulkan/vulkan_device_queue.h -@@ -169,7 +169,7 @@ class COMPONENT_EXPORT(VULKAN) VulkanDeviceQueue - bool allow_protected_memory_ = false; +@@ -179,7 +179,7 @@ class COMPONENT_EXPORT(VULKAN) VulkanDeviceQueue + #endif #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__function__pointers.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__function__pointers.cc index 3fee5e6a7287..12f39df011ba 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__function__pointers.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__function__pointers.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/gpu/vulkan/vulkan_function_pointers.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/gpu/vulkan/vulkan_function_pointers.cc.orig 2024-06-17 12:56:06 UTC +++ src/3rdparty/chromium/gpu/vulkan/vulkan_function_pointers.cc -@@ -1289,7 +1289,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer +@@ -1297,7 +1297,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer } } @@ -9,7 +9,7 @@ if (gfx::HasExtension(enabled_extensions, VK_EXT_IMAGE_DRM_FORMAT_MODIFIER_EXTENSION_NAME)) { constexpr char kvkGetImageDrmFormatModifierPropertiesEXT[] = -@@ -1489,7 +1489,7 @@ void VulkanFunctionPointers::ResetForTesting() { +@@ -1498,7 +1498,7 @@ void VulkanFunctionPointers::ResetForTesting() { vkGetSwapchainImagesKHR = nullptr; vkQueuePresentKHR = nullptr; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__function__pointers.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__function__pointers.h index 3fbc27bdad93..14a2fc7796a5 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__function__pointers.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__function__pointers.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/gpu/vulkan/vulkan_function_pointers.h.orig 2023-11-03 10:09:45 UTC +--- src/3rdparty/chromium/gpu/vulkan/vulkan_function_pointers.h.orig 2024-06-17 12:56:06 UTC +++ src/3rdparty/chromium/gpu/vulkan/vulkan_function_pointers.h -@@ -321,7 +321,7 @@ struct COMPONENT_EXPORT(VULKAN) VulkanFunctionPointers +@@ -322,7 +322,7 @@ struct COMPONENT_EXPORT(VULKAN) VulkanFunctionPointers VulkanFunction vkGetSwapchainImagesKHR; VulkanFunction vkQueuePresentKHR; @@ -9,7 +9,7 @@ VulkanFunction vkGetImageDrmFormatModifierPropertiesEXT; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -1324,7 +1324,7 @@ ALWAYS_INLINE VkResult vkQueuePresentKHR(VkQueue queue +@@ -1336,7 +1336,7 @@ ALWAYS_INLINE VkResult vkQueuePresentKHR(VkQueue queue pPresentInfo); } @@ -18,7 +18,7 @@ ALWAYS_INLINE VkResult vkGetImageDrmFormatModifierPropertiesEXT( VkDevice device, VkImage image, -@@ -1334,4 +1334,4 @@ ALWAYS_INLINE VkResult vkGetImageDrmFormatModifierProp +@@ -1346,4 +1346,4 @@ ALWAYS_INLINE VkResult vkGetImageDrmFormatModifierProp } #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__util.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__util.cc index 03eeded45086..b9481540ee1e 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__util.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__util.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/gpu/vulkan/vulkan_util.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/gpu/vulkan/vulkan_util.cc.orig 2024-09-30 07:45:04 UTC +++ src/3rdparty/chromium/gpu/vulkan/vulkan_util.cc -@@ -443,7 +443,7 @@ bool CheckVulkanCompatibilities(const VulkanInfo& vulk +@@ -473,7 +473,7 @@ bool CheckVulkanCompatibilities( } } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_headless_lib_browser_headless__content__browser__client.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_headless_lib_browser_headless__content__browser__client.cc new file mode 100644 index 000000000000..6b3022305d31 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_headless_lib_browser_headless__content__browser__client.cc @@ -0,0 +1,20 @@ +--- src/3rdparty/chromium/headless/lib/browser/headless_content_browser_client.cc.orig 2024-10-22 08:31:56 UTC ++++ src/3rdparty/chromium/headless/lib/browser/headless_content_browser_client.cc +@@ -56,7 +56,7 @@ + #include "content/public/common/content_descriptors.h" + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) + +-#if (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)) && defined(HEADLESS_USE_PREFS) ++#if (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(HEADLESS_USE_PREFS) + #include "components/os_crypt/sync/os_crypt.h" // nogncheck + #include "content/public/browser/network_service_util.h" + #endif +@@ -478,7 +478,7 @@ void HeadlessContentBrowserClient::HandleExplicitlyAll + + void HeadlessContentBrowserClient::SetEncryptionKey( + ::network::mojom::NetworkService* network_service) { +-#if (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)) && defined(HEADLESS_USE_PREFS) ++#if (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(HEADLESS_USE_PREFS) + // The OSCrypt keys are process bound, so if network service is out of + // process, send it the required key if it is available. + if (content::IsOutOfProcessNetworkService() diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_headless_lib_browser_headless__request__context__manager.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_headless_lib_browser_headless__request__context__manager.cc deleted file mode 100644 index c117aa3d9cdd..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_headless_lib_browser_headless__request__context__manager.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/headless/lib/browser/headless_request_context_manager.cc.orig 2024-02-23 21:04:38 UTC -+++ src/3rdparty/chromium/headless/lib/browser/headless_request_context_manager.cc -@@ -64,7 +64,7 @@ void SetCryptKeyOnce(const base::FilePath& user_data_p - return; - done_once = true; - --#if (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)) && defined(HEADLESS_USE_PREFS) -+#if (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(HEADLESS_USE_PREFS) - // The OSCrypt keys are process bound, so if network service is out of - // process, send it the required key if it is available. - if (content::IsOutOfProcessNetworkService() diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_headless_lib_browser_headless__web__contents__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_headless_lib_browser_headless__web__contents__impl.cc index d3dd85b56342..c33e7efe47e4 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_headless_lib_browser_headless__web__contents__impl.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_headless_lib_browser_headless__web__contents__impl.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/headless/lib/browser/headless_web_contents_impl.cc.orig 2023-05-31 08:12:17 UTC +--- src/3rdparty/chromium/headless/lib/browser/headless_web_contents_impl.cc.orig 2024-06-17 12:56:06 UTC +++ src/3rdparty/chromium/headless/lib/browser/headless_web_contents_impl.cc -@@ -60,7 +60,7 @@ namespace headless { +@@ -62,7 +62,7 @@ namespace headless { namespace { void UpdatePrefsFromSystemSettings(blink::RendererPreferences* prefs) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_headless_lib_headless__content__main__delegate.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_headless_lib_headless__content__main__delegate.cc index 89793f90d3c9..7f0d826a4534 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_headless_lib_headless__content__main__delegate.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_headless_lib_headless__content__main__delegate.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/headless/lib/headless_content_main_delegate.cc.orig 2023-12-10 06:10:27 UTC +--- src/3rdparty/chromium/headless/lib/headless_content_main_delegate.cc.orig 2024-09-30 07:45:04 UTC +++ src/3rdparty/chromium/headless/lib/headless_content_main_delegate.cc -@@ -362,7 +362,7 @@ void HeadlessContentMainDelegate::InitCrashReporter( +@@ -406,7 +406,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/qt6-webengine/files/patch-src_3rdparty_chromium_ipc_ipc__channel.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ipc_ipc__channel.h index a9915790f024..6fa14e316082 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ipc_ipc__channel.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ipc_ipc__channel.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ipc/ipc_channel.h.orig 2024-01-30 07:53:34 UTC +--- src/3rdparty/chromium/ipc/ipc_channel.h.orig 2024-06-17 12:56:06 UTC +++ src/3rdparty/chromium/ipc/ipc_channel.h -@@ -240,7 +240,7 @@ class COMPONENT_EXPORT(IPC) Channel : public Sender { +@@ -218,7 +218,7 @@ class COMPONENT_EXPORT(IPC) Channel : public Sender { static std::string GenerateUniqueRandomChannelID(); #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ipc_ipc__message__utils.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ipc_ipc__message__utils.cc index f04800884e62..2757114815b8 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ipc_ipc__message__utils.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ipc_ipc__message__utils.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ipc/ipc_message_utils.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/ipc/ipc_message_utils.cc.orig 2024-08-26 12:06:38 UTC +++ src/3rdparty/chromium/ipc/ipc_message_utils.cc -@@ -394,7 +394,7 @@ void ParamTraits::Log(const param_type& +@@ -400,7 +400,7 @@ void ParamTraits::Log(const param_type& } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_BUILD.gn index 07e76e709142..7d733e317cf2 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_BUILD.gn @@ -1,12 +1,12 @@ ---- src/3rdparty/chromium/media/BUILD.gn.orig 2024-10-02 15:40:01 UTC +--- src/3rdparty/chromium/media/BUILD.gn.orig 2025-02-21 12:29:33 UTC +++ src/3rdparty/chromium/media/BUILD.gn -@@ -99,6 +99,9 @@ config("media_config") { +@@ -100,6 +100,9 @@ config("media_config") { defines += [ "DLOPEN_PULSEAUDIO" ] } } + if (use_sndio) { + defines += [ "USE_SNDIO" ] + } - if (use_cras) { - defines += [ "USE_CRAS" ] - } + } + + # Internal grouping of the configs necessary to support sub-folders having their diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_BUILD.gn index 6b7cad37b27d..b38521813a89 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_BUILD.gn @@ -1,18 +1,21 @@ ---- src/3rdparty/chromium/media/audio/BUILD.gn.orig 2024-07-03 01:14:49 UTC +--- src/3rdparty/chromium/media/audio/BUILD.gn.orig 2025-02-21 12:29:33 UTC +++ src/3rdparty/chromium/media/audio/BUILD.gn -@@ -269,9 +269,20 @@ jumbo_source_set("audio") { +@@ -267,9 +267,23 @@ jumbo_source_set("audio") { deps += [ "//media/base/android:media_jni_headers" ] } - if (is_linux || is_chromeos) { -+ if ((is_linux || is_chromeos) && !use_sndio) { ++ if ((is_linux || is_chromeos) && !is_bsd) { sources += [ "linux/audio_manager_linux.cc" ] } + ++ if (is_bsd) { ++ sources += [ "sndio/audio_manager_sndio.cc" ] ++ } ++ + if (use_sndio) { + libs += [ "sndio" ] + sources += [ -+ "sndio/audio_manager_sndio.cc", + "sndio/sndio_input.cc", + "sndio/sndio_input.h", + "sndio/sndio_output.cc", diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_alsa_audio__manager__alsa.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_alsa_audio__manager__alsa.cc index 7d8504b18dbe..712074c6560e 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_alsa_audio__manager__alsa.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_alsa_audio__manager__alsa.cc @@ -1,26 +1,26 @@ ---- src/3rdparty/chromium/media/audio/alsa/audio_manager_alsa.cc.orig 2022-04-21 18:48:31 UTC +--- src/3rdparty/chromium/media/audio/alsa/audio_manager_alsa.cc.orig 2024-09-30 07:45:04 UTC +++ src/3rdparty/chromium/media/audio/alsa/audio_manager_alsa.cc -@@ -88,7 +88,9 @@ void AudioManagerAlsa::GetAlsaAudioDevices(StreamType +@@ -100,7 +100,9 @@ void AudioManagerAlsa::GetAlsaAudioDevices(StreamType int card = -1; - // Loop through the sound cards to get ALSA device hints. -+#if !BUILDFLAG(IS_BSD) + // Loop through the physical sound cards to get ALSA device hints. ++#if !BUILDFLAG(IS_BSD) while (!wrapper_->CardNext(&card) && card >= 0) { +#endif void** hints = NULL; int error = wrapper_->DeviceNameHint(card, kPcmInterfaceName, &hints); if (!error) { -@@ -100,7 +102,9 @@ void AudioManagerAlsa::GetAlsaAudioDevices(StreamType +@@ -112,7 +114,9 @@ void AudioManagerAlsa::GetAlsaAudioDevices(StreamType DLOG(WARNING) << "GetAlsaAudioDevices: unable to get device hints: " << wrapper_->StrError(error); } -+#if !BUILDFLAG(IS_BSD) ++#if !BUILDFLAG(IS_BSD) } +#endif } void AudioManagerAlsa::GetAlsaDevicesInfo(AudioManagerAlsa::StreamType type, -@@ -183,7 +187,11 @@ bool AudioManagerAlsa::IsAlsaDeviceAvailable( +@@ -195,7 +199,11 @@ bool AudioManagerAlsa::IsAlsaDeviceAvailable( // goes through software conversion if needed (e.g. incompatible // sample rate). // TODO(joi): Should we prefer "hw" instead? @@ -32,7 +32,7 @@ return strncmp(kDeviceTypeDesired, device_name, std::size(kDeviceTypeDesired) - 1) == 0; } -@@ -205,7 +213,9 @@ bool AudioManagerAlsa::HasAnyAlsaAudioDevice( +@@ -247,7 +255,9 @@ bool AudioManagerAlsa::HasAnyAlsaAudioDevice( // Loop through the sound cards. // Don't use snd_device_name_hint(-1,..) since there is an access violation // inside this ALSA API with libasound.so.2.0.0. @@ -42,7 +42,7 @@ int error = wrapper_->DeviceNameHint(card, kPcmInterfaceName, &hints); if (!error) { for (void** hint_iter = hints; *hint_iter != NULL; hint_iter++) { -@@ -229,7 +239,9 @@ bool AudioManagerAlsa::HasAnyAlsaAudioDevice( +@@ -271,7 +281,9 @@ bool AudioManagerAlsa::HasAnyAlsaAudioDevice( DLOG(WARNING) << "HasAnyAudioDevice: unable to get device hints: " << wrapper_->StrError(error); } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_audio__input__device.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_audio__input__device.cc index 5ca79c181554..0cbac1b06dd1 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_audio__input__device.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_audio__input__device.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/media/audio/audio_input_device.cc.orig 2023-04-28 17:01:32 UTC +--- src/3rdparty/chromium/media/audio/audio_input_device.cc.orig 2024-09-30 07:45:04 UTC +++ src/3rdparty/chromium/media/audio/audio_input_device.cc -@@ -262,7 +262,7 @@ void AudioInputDevice::OnStreamCreated( +@@ -269,7 +269,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/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_pulse_pulse__util.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_pulse_pulse__util.cc new file mode 100644 index 000000000000..d8c2a047b67e --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_pulse_pulse__util.cc @@ -0,0 +1,14 @@ +--- src/3rdparty/chromium/media/audio/pulse/pulse_util.cc.orig 2024-09-30 07:45:04 UTC ++++ src/3rdparty/chromium/media/audio/pulse/pulse_util.cc +@@ -50,7 +50,11 @@ constexpr char kBrowserDisplayName[] = "chromium-brows + + #if defined(DLOPEN_PULSEAUDIO) + static const base::FilePath::CharType kPulseLib[] = ++#if BUILDFLAG(IS_BSD) ++ FILE_PATH_LITERAL("libpulse.so"); ++#else + FILE_PATH_LITERAL("libpulse.so.0"); ++#endif + #endif + + void DestroyMainloop(pa_threaded_mainloop* mainloop) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_sndio_audio__manager__sndio.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_sndio_audio__manager__sndio.cc index 3551f31d9207..20046bdc3975 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_sndio_audio__manager__sndio.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_sndio_audio__manager__sndio.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/media/audio/sndio/audio_manager_sndio.cc.orig 2022-10-24 13:33:33 UTC +--- src/3rdparty/chromium/media/audio/sndio/audio_manager_sndio.cc.orig 2024-07-30 11:12:21 UTC +++ src/3rdparty/chromium/media/audio/sndio/audio_manager_sndio.cc -@@ -0,0 +1,181 @@ +@@ -0,0 +1,213 @@ +// 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. @@ -17,24 +17,25 @@ +#include "media/audio/sndio/sndio_input.h" +#include "media/audio/sndio/sndio_output.h" +#endif ++#if defined(USE_PULSEAUDIO) ++#include "media/audio/pulse/audio_manager_pulse.h" ++#include "media/audio/pulse/pulse_util.h" ++#endif ++#if defined(USE_ALSA) ++#include "media/audio/alsa/audio_manager_alsa.h" ++#endif +#include "media/audio/fake_audio_manager.h" +#include "media/base/limits.h" +#include "media/base/media_switches.h" + +namespace media { + -+enum SndioAudioIO { -+ kPulse, -+ kSndio, -+ kAudioIOMax = kSndio -+}; -+ +#if defined(USE_SNDIO) +// Maximum number of output streams that can be open simultaneously. +static const int kMaxOutputStreams = 50; + +// Default sample rate for input and output streams. -+static const int kDefaultSampleRate = 48000; ++static const int kDefaultSampleRateAMS = 48000; + +void AddDefaultDevice(AudioDeviceNames* device_names) { + DCHECK(device_names->empty()); @@ -76,7 +77,7 @@ + + return AudioParameters( + AudioParameters::AUDIO_PCM_LOW_LATENCY, ChannelLayoutConfig::Stereo(), -+ kDefaultSampleRate, buffer_size); ++ kDefaultSampleRateAMS, buffer_size); +} + +AudioManagerSndio::AudioManagerSndio(std::unique_ptr audio_thread, @@ -129,7 +130,7 @@ + static const int kDefaultOutputBufferSize = 2048; + + ChannelLayoutConfig channel_layout_config = ChannelLayoutConfig::Stereo(); -+ int sample_rate = kDefaultSampleRate; ++ int sample_rate = kDefaultSampleRateAMS; + int buffer_size = kDefaultOutputBufferSize; + if (input_params.IsValid()) { + sample_rate = input_params.sample_rate(); @@ -164,21 +165,52 @@ + std::unique_ptr audio_thread, + AudioLogFactory* audio_log_factory) { + DLOG(WARNING) << "CreateAudioManager"; ++ ++ auto _ab = kAudioBackendParam.Get(); ++ + // For testing allow audio output to be disabled. + if (base::CommandLine::ForCurrentProcess()->HasSwitch( -+ switches::kDisableAudioOutput)) { ++ switches::kDisableAudioOutput) || ++ !base::FeatureList::IsEnabled(media::kAudioBackend)) { + return std::make_unique(std::move(audio_thread), + audio_log_factory); + } ++ ++#if defined(USE_PULSEAUDIO) ++ pa_threaded_mainloop* pa_mainloop = nullptr; ++ pa_context* pa_context = nullptr; ++ if (_ab != AudioBackend::kSndio && _ab != AudioBackend::kAlsa && ++ pulse::InitPulse(&pa_mainloop, &pa_context)) { ++ return std::make_unique( ++ std::move(audio_thread), audio_log_factory, pa_mainloop, pa_context); ++ } else if (_ab == AudioBackend::kAuto) { ++ LOG(WARNING) << "Falling back to SNDIO for audio output. PulseAudio is not " ++ "available or could not be initialized."; ++ } ++#endif ++ +#if defined(USE_SNDIO) -+ UMA_HISTOGRAM_ENUMERATION("Media.SndioAudioIO", kSndio, kAudioIOMax + 1); -+ return std::make_unique(std::move(audio_thread), -+ audio_log_factory); -+#else -+ return std::make_unique(std::move(audio_thread), -+ audio_log_factory); ++ if (_ab != AudioBackend::kPulseAudio && _ab != AudioBackend::kAlsa) { ++ return std::make_unique(std::move(audio_thread), ++ audio_log_factory); ++ } else if (_ab == AudioBackend::kAuto) { ++ LOG(WARNING) << "Falling back to ALSA audio output. SNDIO is not " ++ "available or could not be initialized."; ++ } ++#endif ++ ++#if defined(USE_ALSA) ++ if (_ab != AudioBackend::kPulseAudio && _ab != AudioBackend::kSndio) { ++ return std::make_unique(std::move(audio_thread), ++ audio_log_factory); ++ } else if (_ab == AudioBackend::kAuto) { ++ LOG(WARNING) << "Falling back to fake audio output. ALSA is not " ++ "available or could not be initialized."; ++ } +#endif + ++ return std::make_unique(std::move(audio_thread), ++ audio_log_factory); +} + +} // namespace media diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_sndio_sndio__input.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_sndio_sndio__input.cc index f6da297f1cb2..e8ec6c95bcbc 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_sndio_sndio__input.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_sndio_sndio__input.cc @@ -13,7 +13,7 @@ + +namespace media { + -+static const SampleFormat kSampleFormatAI = kSampleFormatS16; ++static const SampleFormat kSampleFormatSI = kSampleFormatS16; + +void SndioAudioInputStream::OnMoveCallback(void *arg, int delta) +{ @@ -59,7 +59,7 @@ + sio_initpar(&par); + par.rate = params.sample_rate(); + par.rchan = params.channels(); -+ par.bits = SampleFormatToBitsPerChannel(kSampleFormatAI); ++ par.bits = SampleFormatToBitsPerChannel(kSampleFormatSI); + par.bps = par.bits / 8; + par.sig = sig = par.bits != 8 ? 1 : 0; + par.le = SIO_LE_NATIVE; @@ -79,7 +79,7 @@ + + if (par.rate != (unsigned int)params.sample_rate() || + par.rchan != (unsigned int)params.channels() || -+ par.bits != (unsigned int)SampleFormatToBitsPerChannel(kSampleFormatAI) || ++ par.bits != (unsigned int)SampleFormatToBitsPerChannel(kSampleFormatSI) || + par.sig != (unsigned int)sig || + (par.bps > 1 && par.le != SIO_LE_NATIVE) || + (par.bits != par.bps * 8)) { @@ -87,7 +87,7 @@ + goto bad_close; + } + state = kStopped; -+ buffer = new char[audio_bus->frames() * params.GetBytesPerFrame(kSampleFormatAI)]; ++ buffer = new char[audio_bus->frames() * params.GetBytesPerFrame(kSampleFormatSI)]; + sio_onmove(hdl, &OnMoveCallback, this); + return OpenOutcome::kSuccess; +bad_close: @@ -176,7 +176,7 @@ + GetAgcVolume(&normalized_volume); + + // read one block -+ todo = nframes * params.GetBytesPerFrame(kSampleFormatAI); ++ todo = nframes * params.GetBytesPerFrame(kSampleFormatSI); + data = buffer; + while (todo > 0) { + n = sio_read(hdl, data, todo); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_sndio_sndio__output.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_sndio_sndio__output.cc index 363cb11cbb93..7364a256672a 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_sndio_sndio__output.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_sndio_sndio__output.cc @@ -14,7 +14,7 @@ + +namespace media { + -+static const SampleFormat kSampleFormatAO = kSampleFormatS16; ++static const SampleFormat kSampleFormatSO = kSampleFormatS16; + +void SndioAudioOutputStream::OnMoveCallback(void *arg, int delta) { + SndioAudioOutputStream* self = static_cast(arg); @@ -58,7 +58,7 @@ + state = kStopped; + volpending = 0; + vol = SIO_MAXVOL; -+ buffer = new char[audio_bus->frames() * params.GetBytesPerFrame(kSampleFormatAO)]; ++ buffer = new char[audio_bus->frames() * params.GetBytesPerFrame(kSampleFormatSO)]; + return true; +} + @@ -80,7 +80,7 @@ + sio_initpar(&par); + par.rate = params.sample_rate(); + par.pchan = params.channels(); -+ par.bits = SampleFormatToBitsPerChannel(kSampleFormatAO); ++ par.bits = SampleFormatToBitsPerChannel(kSampleFormatSO); + par.bps = par.bits / 8; + par.sig = sig = par.bits != 8 ? 1 : 0; + par.le = SIO_LE_NATIVE; @@ -98,7 +98,7 @@ + } + if (par.rate != (unsigned int)params.sample_rate() || + par.pchan != (unsigned int)params.channels() || -+ par.bits != (unsigned int)SampleFormatToBitsPerChannel(kSampleFormatAO) || ++ par.bits != (unsigned int)SampleFormatToBitsPerChannel(kSampleFormatSO) || + par.sig != (unsigned int)sig || + (par.bps > 1 && par.le != SIO_LE_NATIVE) || + (par.bits != par.bps * 8)) { @@ -170,12 +170,12 @@ + if (count == 0) { + // We have to submit something to the device + count = audio_bus->frames(); -+ memset(buffer, 0, count * params.GetBytesPerFrame(kSampleFormatAO)); ++ memset(buffer, 0, count * params.GetBytesPerFrame(kSampleFormatSO)); + LOG(WARNING) << "No data to play, running empty cycle."; + } + + // Submit data to the device -+ avail = count * params.GetBytesPerFrame(kSampleFormatAO); ++ avail = count * params.GetBytesPerFrame(kSampleFormatSO); + result = sio_write(hdl, buffer, avail); + if (result == 0) { + LOG(WARNING) << "Audio device disconnected."; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_audio__latency.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_audio__latency.cc index 4545e09a6086..66f6db8fe0aa 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_audio__latency.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_audio__latency.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/media/base/audio_latency.cc.orig 2023-04-05 11:05:06 UTC +--- src/3rdparty/chromium/media/base/audio_latency.cc.orig 2024-09-30 07:45:04 UTC +++ src/3rdparty/chromium/media/base/audio_latency.cc -@@ -147,7 +147,7 @@ int AudioLatency::GetRtcBufferSize(int sample_rate, in +@@ -148,7 +148,7 @@ int AudioLatency::GetRtcBufferSize(int sample_rate, in } #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_APPLE) || \ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_libaom__thread__wrapper.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_libaom__thread__wrapper.cc new file mode 100644 index 000000000000..05c8dcc47ef2 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_libaom__thread__wrapper.cc @@ -0,0 +1,24 @@ +--- src/3rdparty/chromium/media/base/libaom_thread_wrapper.cc.orig 2024-03-22 08:19:40 UTC ++++ src/3rdparty/chromium/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::GetCodecWorkerInterface(); + CHECK(aom_set_worker_interface(&interface)); ++#endif + } + + } // namespace media diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_media__switches.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_media__switches.cc index c3ce1186c080..c9b7eace90cc 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_media__switches.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_media__switches.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/media/base/media_switches.cc.orig 2024-07-03 01:14:49 UTC +--- src/3rdparty/chromium/media/base/media_switches.cc.orig 2025-02-21 12:29:33 UTC +++ src/3rdparty/chromium/media/base/media_switches.cc @@ -21,7 +21,7 @@ #include "ui/gl/gl_features.h" @@ -9,8 +9,8 @@ #include "base/cpu.h" #endif -@@ -369,8 +369,8 @@ BASE_FEATURE(kMacLoopbackAudioForScreenShare, - "MacLoopbackAudioForScreenShare", +@@ -376,8 +376,8 @@ BASE_FEATURE(kUseSCContentSharingPicker, + "UseSCContentSharingPicker", base::FEATURE_DISABLED_BY_DEFAULT); #endif // BUILDFLAG(IS_MAC) - @@ -20,17 +20,37 @@ // Enables system audio mirroring using pulseaudio. BASE_FEATURE(kPulseaudioLoopbackForCast, "PulseaudioLoopbackForCast", -@@ -608,7 +608,7 @@ BASE_FEATURE(kUseWritePixelsYUV, - // Enables creating single shared image and mailbox for multi-planar formats for - // hardware video decoders. - #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_FUCHSIA) || \ -- BUILDFLAG(IS_LINUX) -+ BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - BASE_FEATURE(kUseMultiPlaneFormatForHardwareVideo, - "UseMultiPlaneFormatForHardwareVideo", - base::FEATURE_ENABLED_BY_DEFAULT); -@@ -719,7 +719,7 @@ BASE_FEATURE(kFallbackAfterDecodeError, - base::FEATURE_ENABLED_BY_DEFAULT); +@@ -387,6 +387,28 @@ BASE_FEATURE(kPulseaudioLoopbackForScreenShare, + BASE_FEATURE(kPulseaudioLoopbackForScreenShare, + "PulseaudioLoopbackForScreenShare", + base::FEATURE_DISABLED_BY_DEFAULT); ++ ++BASE_FEATURE(kAudioBackend, ++ "AudioBackend", ++ base::FEATURE_ENABLED_BY_DEFAULT); ++ ++constexpr base::FeatureParam::Option ++ kAudioBackendOptions[] = { ++ {AudioBackend::kAuto, ++ "auto"}, ++ {AudioBackend::kPulseAudio, "pulseaudio"}, ++ {AudioBackend::kSndio, "sndio"}, ++ {AudioBackend::kAlsa, "alsa"}}; ++ ++const base::FeatureParam ++ kAudioBackendParam{ ++ &kAudioBackend, "audio-backend", ++#if BUILDFLAG(IS_OPENBSD) ++ AudioBackend::kSndio, ++#elif BUILDFLAG(IS_FREEBSD) ++ AudioBackend::kAuto, ++#endif ++ &kAudioBackendOptions}; + #endif // BUILDFLAG(IS_LINUX) + + // When enabled, MediaCapabilities will check with GPU Video Accelerator +@@ -688,7 +710,7 @@ BASE_FEATURE(kFileDialogsBlockPictureInPicture, + #endif // !BUILDFLAG(IS_ANDROID) // Show toolbar button that opens dialog for controlling media sessions. -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) @@ -38,7 +58,7 @@ BASE_FEATURE(kGlobalMediaControls, "GlobalMediaControls", base::FEATURE_ENABLED_BY_DEFAULT); -@@ -743,7 +743,7 @@ BASE_FEATURE(kGlobalMediaControlsCrOSUpdatedUI, +@@ -712,7 +734,7 @@ BASE_FEATURE(kGlobalMediaControlsUpdatedUI, #if !BUILDFLAG(IS_ANDROID) // If enabled, users can request Media Remoting without fullscreen-in-tab. @@ -47,7 +67,16 @@ BASE_FEATURE(kMediaRemotingWithoutFullscreen, "MediaRemotingWithoutFullscreen", base::FEATURE_ENABLED_BY_DEFAULT); -@@ -788,7 +788,7 @@ BASE_FEATURE(kUnifiedAutoplay, +@@ -725,7 +747,7 @@ BASE_FEATURE(kMediaRemotingWithoutFullscreen, + + // Show picture-in-picture button in Global Media Controls. + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_CHROMEOS_LACROS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) + BASE_FEATURE(kGlobalMediaControlsPictureInPicture, + "GlobalMediaControlsPictureInPicture", + base::FEATURE_ENABLED_BY_DEFAULT); +@@ -757,7 +779,7 @@ BASE_FEATURE(kUnifiedAutoplay, "UnifiedAutoplay", base::FEATURE_ENABLED_BY_DEFAULT); @@ -56,26 +85,17 @@ // Enable vaapi video decoding on linux. This is already enabled by default on // chromeos, but needs an experiment on linux. BASE_FEATURE(kVaapiVideoDecodeLinux, -@@ -874,7 +874,7 @@ BASE_FEATURE(kVaapiVp9SModeHWEncoding, - "VaapiVp9SModeHWEncoding", +@@ -860,7 +882,7 @@ BASE_FEATURE(kVSyncMjpegDecoding, + "VSyncMjpegDecoding", 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", -@@ -981,7 +981,7 @@ BASE_FEATURE(kLiveCaptionUseWaitK, + // Owners: frkoenig@chromium.org, mcasas@chromium.org + // Expiry: When the |V4L2FlatVideoDecoder| flag handles stateful decoding on +@@ -1505,7 +1527,7 @@ BASE_FEATURE(kUseGTFOOutOfProcessVideoDecoding, base::FEATURE_DISABLED_BY_DEFAULT); - - // Live Caption can be used in multiple languages, as opposed to just English. --#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(kLiveCaptionMultiLanguage, - "LiveCaptionMultiLanguage", - base::FEATURE_ENABLED_BY_DEFAULT); -@@ -1455,7 +1455,7 @@ BASE_FEATURE(kUseOutOfProcessVideoDecoding, - #endif #endif // BUILDFLAG(ALLOW_OOP_VIDEO_DECODER) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -83,3 +103,12 @@ // Spawn utility processes to perform hardware encode acceleration instead of // using the GPU process. BASE_FEATURE(kUseOutOfProcessVideoEncoding, +@@ -1587,7 +1609,7 @@ BASE_FEATURE(kRecordWebAudioEngagement, + "RecordWebAudioEngagement", + base::FEATURE_ENABLED_BY_DEFAULT); + +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Reduces the number of buffers needed in the output video frame pool to + // populate the Renderer pipeline for hardware accelerated VideoDecoder in + // non-low latency scenarios. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_media__switches.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_media__switches.h index 2ddf447328fd..108be0434e4d 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_media__switches.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_media__switches.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/media/base/media_switches.h.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/media/base/media_switches.h.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/media/base/media_switches.h -@@ -307,7 +307,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kPlatformHEVCEncoder +@@ -331,13 +331,25 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kPlatformHEVCEncoder MEDIA_EXPORT BASE_DECLARE_FEATURE(kPlaybackSpeedButton); MEDIA_EXPORT BASE_DECLARE_FEATURE(kPreloadMediaEngagementData); MEDIA_EXPORT BASE_DECLARE_FEATURE(kPreloadMetadataSuspend); @@ -8,8 +8,27 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) MEDIA_EXPORT BASE_DECLARE_FEATURE(kPulseaudioLoopbackForCast); MEDIA_EXPORT BASE_DECLARE_FEATURE(kPulseaudioLoopbackForScreenShare); ++ ++enum class AudioBackend { ++ kAuto, ++ kPulseAudio, ++ kSndio, ++ kAlsa ++}; ++ ++MEDIA_EXPORT BASE_DECLARE_FEATURE(kAudioBackend); ++MEDIA_EXPORT extern const base::FeatureParam< ++ AudioBackend> ++ kAudioBackendParam; #endif // BUILDFLAG(IS_LINUX) -@@ -325,7 +325,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kUnifiedAutoplay); + MEDIA_EXPORT BASE_DECLARE_FEATURE(kRecordMediaEngagementScores); + MEDIA_EXPORT BASE_DECLARE_FEATURE(kRecordWebAudioEngagement); +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + MEDIA_EXPORT BASE_DECLARE_FEATURE(kReduceHardwareVideoDecoderBuffers); + #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) + MEDIA_EXPORT BASE_DECLARE_FEATURE(kResumeBackgroundVideo); +@@ -352,7 +364,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); @@ -18,17 +37,17 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVideoDecodeLinux); MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVideoDecodeLinuxGL); MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVideoEncodeLinux); -@@ -344,7 +344,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiH264TemporalLa - MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVp8TemporalLayerHWEncoding); +@@ -373,7 +385,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVp8TemporalLay MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVp9SModeHWEncoding); + MEDIA_EXPORT BASE_DECLARE_FEATURE(kVSyncMjpegDecoding); #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(kV4L2FlatStatefulVideoDecoder); + MEDIA_EXPORT BASE_DECLARE_FEATURE(kV4L2H264TemporalLayerHWEncoding); #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -@@ -471,7 +471,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kExposeOutOfProcessV - MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseOutOfProcessVideoDecoding); +@@ -513,7 +525,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/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_video__frame.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_video__frame.cc index 3c52679c29de..77c80da024bd 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_video__frame.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_video__frame.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/media/base/video_frame.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/media/base/video_frame.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/media/base/video_frame.cc -@@ -80,7 +80,7 @@ std::string VideoFrame::StorageTypeToString( +@@ -88,7 +88,7 @@ std::string VideoFrame::StorageTypeToString( return "OWNED_MEMORY"; case VideoFrame::STORAGE_SHMEM: return "SHMEM"; @@ -9,7 +9,7 @@ case VideoFrame::STORAGE_DMABUFS: return "DMABUFS"; #endif -@@ -95,7 +95,7 @@ std::string VideoFrame::StorageTypeToString( +@@ -103,7 +103,7 @@ std::string VideoFrame::StorageTypeToString( // static bool VideoFrame::IsStorageTypeMappable(VideoFrame::StorageType storage_type) { return @@ -18,25 +18,16 @@ // 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 GetDefaultLayo - return VideoFrameLayout::CreateWithPlanes(format, coded_size, planes); - } - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - // This class allows us to embed a vector into a scoped_refptr, and - // thus to have several VideoFrames share the same set of DMABUF FDs. - class VideoFrame::DmabufHolder -@@ -636,7 +636,7 @@ scoped_refptr VideoFrame::WrapExternalGpuM - for (size_t i = 0; i < num_planes; ++i) - planes[i].stride = gpu_memory_buffer->stride(i); +@@ -401,7 +401,7 @@ VideoFrame::CreateFrameForGpuMemoryBufferOrMappableSII + : shared_image->GetStrideForVideoFrame(i); + } uint64_t modifier = gfx::NativePixmapHandle::kNoModifier; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - if (gpu_memory_buffer->GetType() == gfx::NATIVE_PIXMAP) { - const auto gmb_handle = gpu_memory_buffer->CloneHandle(); - if (gmb_handle.is_null() || -@@ -682,7 +682,7 @@ scoped_refptr VideoFrame::WrapExternalGpuM + bool is_native_buffer = + gpu_memory_buffer + ? (gpu_memory_buffer->GetType() != gfx::SHARED_MEMORY_BUFFER) +@@ -782,7 +782,7 @@ scoped_refptr VideoFrame::WrapExternalGpuM return frame; } @@ -45,30 +36,12 @@ // static scoped_refptr VideoFrame::WrapExternalDmabufs( const VideoFrameLayout& layout, -@@ -901,7 +901,7 @@ scoped_refptr VideoFrame::WrapVideoFrame( - } - } - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - DCHECK(frame->dmabuf_fds_); - // If there are any |dmabuf_fds_| plugged in, we should refer them too. - wrapping_frame->dmabuf_fds_ = frame->dmabuf_fds_; -@@ -1312,7 +1312,7 @@ const gpu::MailboxHolder& VideoFrame::mailbox_holder( - : mailbox_holders_[texture_index]; +@@ -1489,7 +1489,7 @@ scoped_refptr VideoFrame::shar + return wrapped_frame_ ? wrapped_frame_->shared_image() : shared_image_; } -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) size_t VideoFrame::NumDmabufFds() const { - return dmabuf_fds_->size(); - } -@@ -1429,7 +1429,7 @@ VideoFrame::VideoFrame(const VideoFrameLayout& layout, - storage_type_(storage_type), - visible_rect_(Intersection(visible_rect, gfx::Rect(layout.coded_size()))), - natural_size_(natural_size), --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - dmabuf_fds_(base::MakeRefCounted()), - #endif - timestamp_(timestamp), + if (wrapped_frame_) { + return wrapped_frame_->NumDmabufFds(); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_video__frame.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_video__frame.h index a1b76fc212de..20cbc521aa09 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_video__frame.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_video__frame.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/media/base/video_frame.h.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/media/base/video_frame.h.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/media/base/video_frame.h -@@ -44,7 +44,7 @@ +@@ -50,7 +50,7 @@ #include "base/apple/scoped_cftyperef.h" #endif // BUILDFLAG(IS_APPLE) @@ -9,7 +9,7 @@ #include "base/files/scoped_file.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -110,7 +110,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -116,7 +116,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte STORAGE_UNOWNED_MEMORY = 2, // External, non owned data pointers. STORAGE_OWNED_MEMORY = 3, // VideoFrame has allocated its own data buffer. STORAGE_SHMEM = 4, // Backed by read-only shared memory. @@ -18,7 +18,7 @@ // TODO(mcasas): Consider turning this type into STORAGE_NATIVE // based on the idea of using this same enum value for both DMA // buffers on Linux and CVPixelBuffers on Mac (which currently use -@@ -313,7 +313,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -393,7 +393,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte ReleaseMailboxAndGpuMemoryBufferCB mailbox_holder_and_gmb_release_cb, base::TimeDelta timestamp); @@ -27,21 +27,21 @@ // 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 - // mailbox, the caller must wait for the included sync point. - const gpu::MailboxHolder& mailbox_holder(size_t texture_index) const; +@@ -711,7 +711,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte + // wait for the included sync point. + scoped_refptr shared_image() const; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // 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 // remaining planes. Should be > 0 for STORAGE_DMABUFS. -@@ -811,7 +811,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte - // GPU memory buffer, if this frame is STORAGE_GPU_MEMORY_BUFFER. - std::unique_ptr gpu_memory_buffer_; +@@ -953,7 +953,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte + // GpuMemoryBuffers. Clients will set this flag while creating a VideoFrame. + bool is_mappable_si_enabled_ = false; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - class DmabufHolder; // Dmabufs for the frame, used when storage is STORAGE_DMABUFS. Size is either + // equal or less than the number of planes of the frame. If it is less, then diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_fake__video__capture__device__factory.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_fake__video__capture__device__factory.cc index d2ba9190dc3f..b12bab7e6532 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_fake__video__capture__device__factory.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_fake__video__capture__device__factory.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/media/capture/video/fake_video_capture_device_factory.cc.orig 2024-01-30 07:53:34 UTC +--- src/3rdparty/chromium/media/capture/video/fake_video_capture_device_factory.cc.orig 2024-06-17 12:56:06 UTC +++ src/3rdparty/chromium/media/capture/video/fake_video_capture_device_factory.cc -@@ -230,7 +230,7 @@ void FakeVideoCaptureDeviceFactory::GetDevicesInfo( +@@ -231,7 +231,7 @@ void FakeVideoCaptureDeviceFactory::GetDevicesInfo( int entry_index = 0; for (const auto& entry : devices_config_) { VideoCaptureApi api = diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_fake__v4l2__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_fake__v4l2__impl.cc index efdc7882508f..ede62bdf3186 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_fake__v4l2__impl.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_fake__v4l2__impl.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/media/capture/video/linux/fake_v4l2_impl.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/media/capture/video/linux/fake_v4l2_impl.cc.orig 2024-04-19 13:02:56 UTC +++ src/3rdparty/chromium/media/capture/video/linux/fake_v4l2_impl.cc -@@ -561,7 +561,7 @@ int FakeV4L2Impl::close(int fd) { +@@ -562,7 +562,7 @@ int FakeV4L2Impl::close(int fd) { return kSuccessReturnValue; } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_v4l2__capture__delegate.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_v4l2__capture__delegate.cc index 361eab2976a2..a8b590190a3c 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_v4l2__capture__delegate.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_v4l2__capture__delegate.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/media/capture/video/linux/v4l2_capture_delegate.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/media/capture/video/linux/v4l2_capture_delegate.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/media/capture/video/linux/v4l2_capture_delegate.cc @@ -5,8 +5,10 @@ #include "media/capture/video/linux/v4l2_capture_delegate.h" @@ -11,7 +11,7 @@ #include #include #include -@@ -27,17 +29,19 @@ +@@ -29,17 +31,19 @@ #include "media/capture/video/blob_utils.h" #include "media/capture/video/linux/video_capture_device_linux.h" @@ -32,7 +32,7 @@ // TODO(aleksandar.stojiljkovic): Wrap this with kernel version check once the // format is introduced to kernel. -@@ -47,6 +51,14 @@ using media::mojom::MeteringMode; +@@ -49,6 +53,14 @@ using media::mojom::MeteringMode; #define V4L2_PIX_FMT_INVZ v4l2_fourcc('I', 'N', 'V', 'Z') #endif @@ -47,7 +47,7 @@ namespace media { namespace { -@@ -264,7 +276,7 @@ bool V4L2CaptureDelegate::IsBlockedControl(int control +@@ -268,7 +280,7 @@ bool V4L2CaptureDelegate::IsBlockedControl(int control // static bool V4L2CaptureDelegate::IsControllableControl( int control_id, @@ -56,7 +56,7 @@ 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 -@@ -320,7 +332,7 @@ V4L2CaptureDelegate::V4L2CaptureDelegate( +@@ -324,7 +336,7 @@ V4L2CaptureDelegate::V4L2CaptureDelegate( is_capturing_(false), timeout_count_(0), rotation_(rotation) { @@ -65,7 +65,7 @@ use_gpu_buffer_ = switches::IsVideoCaptureUseGpuMemoryBufferEnabled(); #endif // BUILDFLAG(IS_LINUX) } -@@ -447,7 +459,7 @@ void V4L2CaptureDelegate::AllocateAndStart( +@@ -451,7 +463,7 @@ void V4L2CaptureDelegate::AllocateAndStart( client_->OnStarted(); @@ -74,7 +74,7 @@ if (use_gpu_buffer_) { v4l2_gpu_helper_ = std::make_unique( std::move(gmb_support_test_)); -@@ -797,7 +809,7 @@ void V4L2CaptureDelegate::SetGPUEnvironmentForTesting( +@@ -801,7 +813,7 @@ void V4L2CaptureDelegate::SetGPUEnvironmentForTesting( V4L2CaptureDelegate::~V4L2CaptureDelegate() = default; @@ -83,7 +83,7 @@ int num_retries = 0; for (; DoIoctl(request, argp) < 0 && num_retries < kMaxIOCtrlRetries; ++num_retries) { -@@ -807,7 +819,7 @@ bool V4L2CaptureDelegate::RunIoctl(int request, void* +@@ -811,7 +823,7 @@ bool V4L2CaptureDelegate::RunIoctl(int request, void* return num_retries != kMaxIOCtrlRetries; } @@ -92,7 +92,7 @@ return HANDLE_EINTR(v4l2_->ioctl(device_fd_.get(), request, argp)); } -@@ -818,6 +830,7 @@ bool V4L2CaptureDelegate::IsControllableControl(int co +@@ -822,6 +834,7 @@ bool V4L2CaptureDelegate::IsControllableControl(int co } void V4L2CaptureDelegate::ReplaceControlEventSubscriptions() { @@ -100,7 +100,7 @@ constexpr uint32_t kControlIds[] = {V4L2_CID_AUTO_EXPOSURE_BIAS, V4L2_CID_AUTO_WHITE_BALANCE, V4L2_CID_BRIGHTNESS, -@@ -845,6 +858,7 @@ void V4L2CaptureDelegate::ReplaceControlEventSubscript +@@ -849,6 +862,7 @@ void V4L2CaptureDelegate::ReplaceControlEventSubscript << ", {type = V4L2_EVENT_CTRL, id = " << control_id << "}"; } } @@ -108,7 +108,7 @@ } mojom::RangePtr V4L2CaptureDelegate::RetrieveUserControlRange(int control_id) { -@@ -1025,7 +1039,11 @@ void V4L2CaptureDelegate::DoCapture() { +@@ -1029,7 +1043,11 @@ void V4L2CaptureDelegate::DoCapture() { pollfd device_pfd = {}; device_pfd.fd = device_fd_.get(); @@ -120,7 +120,7 @@ const int result = HANDLE_EINTR(v4l2_->poll(&device_pfd, 1, kCaptureTimeoutMs)); -@@ -1063,6 +1081,7 @@ void V4L2CaptureDelegate::DoCapture() { +@@ -1067,6 +1085,7 @@ void V4L2CaptureDelegate::DoCapture() { timeout_count_ = 0; } @@ -128,7 +128,7 @@ // Dequeue events if the driver has filled in some. if (device_pfd.revents & POLLPRI) { bool controls_changed = false; -@@ -1097,6 +1116,7 @@ void V4L2CaptureDelegate::DoCapture() { +@@ -1102,6 +1121,7 @@ void V4L2CaptureDelegate::DoCapture() { client_->OnCaptureConfigurationChanged(); } } @@ -136,7 +136,7 @@ // Deenqueue, send and reenqueue a buffer if the driver has filled one in. if (device_pfd.revents & POLLIN) { -@@ -1150,7 +1170,7 @@ void V4L2CaptureDelegate::DoCapture() { +@@ -1155,7 +1175,7 @@ void V4L2CaptureDelegate::DoCapture() { // workable on Linux. // See http://crbug.com/959919. @@ -145,7 +145,7 @@ if (use_gpu_buffer_) { v4l2_gpu_helper_->OnIncomingCapturedData( client_.get(), buffer_tracker->start(), -@@ -1223,7 +1243,7 @@ void V4L2CaptureDelegate::SetErrorState(VideoCaptureEr +@@ -1228,7 +1248,7 @@ void V4L2CaptureDelegate::SetErrorState(VideoCaptureEr client_->OnError(error, from_here, reason); } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_video__capture__device__factory__v4l2.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_video__capture__device__factory__v4l2.cc index 1bd27f575454..003486970033 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_video__capture__device__factory__v4l2.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_video__capture__device__factory__v4l2.cc @@ -1,6 +1,20 @@ ---- src/3rdparty/chromium/media/capture/video/linux/video_capture_device_factory_v4l2.cc.orig 2023-05-02 13:49:23 UTC +--- src/3rdparty/chromium/media/capture/video/linux/video_capture_device_factory_v4l2.cc.orig 2024-04-19 13:02:56 UTC +++ src/3rdparty/chromium/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* target_container) override { @@ -10,7 +24,7 @@ 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()); } @@ -20,21 +34,33 @@ 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/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_video__capture__device__client.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_video__capture__device__client.cc index 05c0ce3cc494..693c2f74d501 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_video__capture__device__client.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_video__capture__device__client.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/media/capture/video/video_capture_device_client.cc.orig 2023-12-10 06:10:27 UTC +--- src/3rdparty/chromium/media/capture/video/video_capture_device_client.cc.orig 2024-09-30 07:45:04 UTC +++ src/3rdparty/chromium/media/capture/video/video_capture_device_client.cc -@@ -150,7 +150,7 @@ FourccAndFlip GetFourccAndFlipFromPixelFormat( +@@ -169,7 +169,7 @@ FourccAndFlip GetFourccAndFlipFromPixelFormat( CHECK(!is_width_odd && !is_height_odd); return {libyuv::FOURCC_UYVY}; case media::PIXEL_FORMAT_RGB24: diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_ffmpeg_scripts_build__ffmpeg.py b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_ffmpeg_scripts_build__ffmpeg.py new file mode 100644 index 000000000000..a83f1ae32d10 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_ffmpeg_scripts_build__ffmpeg.py @@ -0,0 +1,66 @@ +--- src/3rdparty/chromium/media/ffmpeg/scripts/build_ffmpeg.py.orig 2024-07-30 11:12:21 UTC ++++ src/3rdparty/chromium/media/ffmpeg/scripts/build_ffmpeg.py +@@ -33,7 +33,7 @@ NDK_ROOT_DIR = os.path.abspath( + SUCCESS_TOKEN = 'THIS_BUILD_WORKED' + + sys.path.append(os.path.join(CHROMIUM_ROOT_DIR, 'build')) +-import gn_helpers ++#import gn_helpers + + BRANDINGS = [ + 'Chrome', +@@ -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'], + } +@@ -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) +@@ -475,7 +477,7 @@ def BuildFFmpeg(target_os, target_arch, host_os, host_ + # removing 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 */'), +@@ -598,7 +600,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 + +@@ -712,7 +714,7 @@ def ConfigureAndBuild(target_arch, target_os, host_os, + '--optflags="-O2"', + ]) + +- 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([ +@@ -827,9 +829,6 @@ def ConfigureAndBuild(target_arch, target_os, host_os, + + 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', diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_ffmpeg_scripts_robo__lib_config.py b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_ffmpeg_scripts_robo__lib_config.py new file mode 100644 index 000000000000..af97ac505dc6 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_ffmpeg_scripts_robo__lib_config.py @@ -0,0 +1,56 @@ +--- src/3rdparty/chromium/media/ffmpeg/scripts/robo_lib/config.py.orig 2024-06-17 12:56:06 UTC ++++ src/3rdparty/chromium/media/ffmpeg/scripts/robo_lib/config.py +@@ -55,19 +55,13 @@ 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.EnsureGNConfig() +- 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 +@@ -186,9 +180,9 @@ class RoboConfiguration: + + 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" +@@ -223,6 +217,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()}") + +@@ -231,8 +229,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/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_chromeos_gl__image__processor__backend.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_chromeos_gl__image__processor__backend.cc new file mode 100644 index 000000000000..1913204be552 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_chromeos_gl__image__processor__backend.cc @@ -0,0 +1,13 @@ +--- src/3rdparty/chromium/media/gpu/chromeos/gl_image_processor_backend.cc.orig 2024-06-18 16:34:35 UTC ++++ src/3rdparty/chromium/media/gpu/chromeos/gl_image_processor_backend.cc +@@ -28,6 +28,10 @@ + #include "ui/ozone/public/ozone_platform.h" + #include "ui/ozone/public/surface_factory_ozone.h" + ++#ifndef GL_CONTEXT_LOST_KHR ++#define GL_CONTEXT_LOST_KHR 0x0507 ++#endif ++ + namespace media { + + namespace { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_chromeos_libyuv__image__processor__backend.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_chromeos_libyuv__image__processor__backend.cc index d6e58ac07b83..f08d6740a082 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_chromeos_libyuv__image__processor__backend.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_chromeos_libyuv__image__processor__backend.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/media/gpu/chromeos/libyuv_image_processor_backend.cc.orig 2024-01-30 07:53:34 UTC +--- src/3rdparty/chromium/media/gpu/chromeos/libyuv_image_processor_backend.cc.orig 2024-09-30 07:45:04 UTC +++ src/3rdparty/chromium/media/gpu/chromeos/libyuv_image_processor_backend.cc -@@ -47,7 +47,7 @@ static constexpr struct { +@@ -53,7 +53,7 @@ static constexpr struct { #define CONV(in, out, trans, result) \ {Fourcc::in, Fourcc::out, Transform::trans, SupportResult::result} // Conversion. @@ -9,16 +9,16 @@ CONV(NV12, AR24, kConversion, Supported), #endif CONV(NV12, NV12, kConversion, Supported), -@@ -430,7 +430,7 @@ int LibYUVImageProcessorBackend::DoConversion(const Vi - fr->GetWritableVisibleData(VideoFrame::kUVPlane)), \ - fr->stride(VideoFrame::kUVPlane) +@@ -420,7 +420,7 @@ int LibYUVImageProcessorBackend::DoConversion(const Fr + fr->GetWritableVisibleData(VideoFrame::Plane::kUV)), \ + fr->stride(VideoFrame::Plane::kUV) -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - #define ARGB_DATA(fr) \ - fr->GetWritableVisibleData(VideoFrame::kARGBPlane), \ - fr->stride(VideoFrame::kARGBPlane) -@@ -573,7 +573,7 @@ int LibYUVImageProcessorBackend::DoConversion(const Vi + #define ARGB_DATA(fr) \ + fr->GetWritableVisibleData(VideoFrame::Plane::kARGB), \ + fr->stride(VideoFrame::Plane::kARGB) +@@ -582,7 +582,7 @@ int LibYUVImageProcessorBackend::DoConversion(const Fr } } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_chromeos_mailbox__video__frame__converter.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_chromeos_mailbox__video__frame__converter.cc index 06d93c8691cb..944226376b78 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_chromeos_mailbox__video__frame__converter.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_chromeos_mailbox__video__frame__converter.cc @@ -1,8 +1,8 @@ ---- src/3rdparty/chromium/media/gpu/chromeos/mailbox_video_frame_converter.cc.orig 2024-01-30 07:53:34 UTC +--- src/3rdparty/chromium/media/gpu/chromeos/mailbox_video_frame_converter.cc.orig 2024-09-30 07:45:04 UTC +++ src/3rdparty/chromium/media/gpu/chromeos/mailbox_video_frame_converter.cc -@@ -61,7 +61,7 @@ viz::SharedImageFormat GetSharedImageFormat(gfx::Buffe +@@ -67,7 +67,7 @@ viz::SharedImageFormat GetSharedImageFormat(gfx::Buffe << static_cast(buffer_format); - NOTREACHED_NORETURN(); + NOTREACHED(); } -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_chromeos_native__pixmap__frame__resource.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_chromeos_native__pixmap__frame__resource.cc new file mode 100644 index 000000000000..acf72a66a116 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_chromeos_native__pixmap__frame__resource.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/media/gpu/chromeos/native_pixmap_frame_resource.cc.orig 2024-08-26 12:06:38 UTC ++++ src/3rdparty/chromium/media/gpu/chromeos/native_pixmap_frame_resource.cc +@@ -176,7 +176,7 @@ scoped_refptr 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/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_chromeos_platform__video__frame__utils.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_chromeos_platform__video__frame__utils.cc index 2834f03ec3c5..f9be7d354ab5 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_chromeos_platform__video__frame__utils.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_chromeos_platform__video__frame__utils.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/media/gpu/chromeos/platform_video_frame_utils.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/media/gpu/chromeos/platform_video_frame_utils.cc.orig 2024-06-17 12:56:06 UTC +++ src/3rdparty/chromium/media/gpu/chromeos/platform_video_frame_utils.cc @@ -68,7 +68,7 @@ static std::unique_ptr CreateGbmDevice( const base::FilePath dev_path(FILE_PATH_LITERAL( @@ -9,7 +9,16 @@ const bool is_render_node = base::Contains(drm_node_file_prefix, "render"); // TODO(b/313513760): don't guard base::File::FLAG_WRITE behind -@@ -301,7 +301,7 @@ scoped_refptr CreateGpuMemoryBufferVideoFr +@@ -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) { +@@ -350,7 +350,7 @@ scoped_refptr CreateVideoFrameFromGpuMemor const bool is_intel_media_compression_enabled = #if BUILDFLAG(IS_CHROMEOS) base::FeatureList::IsEnabled(features::kEnableIntelMediaCompression); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_chromeos_video__decoder__pipeline.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_chromeos_video__decoder__pipeline.cc index 1274930b6a3c..2d15fce08dc2 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_chromeos_video__decoder__pipeline.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_chromeos_video__decoder__pipeline.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/media/gpu/chromeos/video_decoder_pipeline.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/media/gpu/chromeos/video_decoder_pipeline.cc.orig 2024-08-26 12:06:38 UTC +++ src/3rdparty/chromium/media/gpu/chromeos/video_decoder_pipeline.cc -@@ -1009,14 +1009,14 @@ VideoDecoderPipeline::PickDecoderOutputFormat( +@@ -1096,7 +1096,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( } #endif @@ -9,20 +9,21 @@ // Linux should always use a custom allocator (to allocate buffers using // libva) and a PlatformVideoFramePool. CHECK(allocator.has_value()); - CHECK(main_frame_pool_->AsPlatformVideoFramePool()); +@@ -1105,7 +1105,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( + // VideoFrame::StorageType of VideoFrame::STORAGE_DMABUFS. main_frame_pool_->AsPlatformVideoFramePool()->SetCustomFrameAllocator( - *allocator); + *allocator, VideoFrame::STORAGE_DMABUFS); -#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 -@@ -1158,7 +1158,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( +@@ -1287,7 +1287,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) + // The custom allocator creates frames backed by NativePixmap, which uses a + // VideoFrame::StorageType of VideoFrame::STORAGE_DMABUFS. auxiliary_frame_pool_->AsPlatformVideoFramePool()->SetCustomFrameAllocator( - *allocator); - #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_gpu__video__encode__accelerator__factory.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_gpu__video__encode__accelerator__factory.cc index bad61d8e7bd2..513ca747253a 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_gpu__video__encode__accelerator__factory.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_gpu__video__encode__accelerator__factory.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/media/gpu/gpu_video_encode_accelerator_factory.cc.orig 2023-09-13 12:11:42 UTC +--- src/3rdparty/chromium/media/gpu/gpu_video_encode_accelerator_factory.cc.orig 2024-04-19 13:02:56 UTC +++ src/3rdparty/chromium/media/gpu/gpu_video_encode_accelerator_factory.cc -@@ -119,7 +119,7 @@ std::vector GetVEAFactoryFunctions +@@ -118,7 +118,7 @@ std::vector GetVEAFactoryFunctions return vea_factory_functions; #if BUILDFLAG(USE_VAAPI) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc index 1e2c2a8f7327..a1200aa4d2c5 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.cc.orig 2023-07-16 15:47:57 UTC +--- src/3rdparty/chromium/media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/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 @@ -10,7 +10,7 @@ // 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 { @@ -18,15 +18,15 @@ void AllowAccessToRenderNodes(std::vector& permissions, bool include_sys_dev_char, bool read_write) { -@@ -165,6 +168,7 @@ bool HardwareVideoDecodingPreSandboxHookForV4L2( - NOTREACHED_NORETURN(); +@@ -188,6 +191,7 @@ bool HardwareVideoDecodingPreSandboxHookForV4L2( + NOTREACHED(); #endif // BUILDFLAG(USE_V4L2_CODEC) } +#endif } // namespace -@@ -180,6 +184,7 @@ bool HardwareVideoDecodingPreSandboxHookForV4L2( +@@ -203,6 +207,7 @@ bool HardwareVideoDecodingPreSandboxHookForV4L2( // (at least). bool HardwareVideoDecodingPreSandboxHook( sandbox::policy::SandboxLinux::Options options) { @@ -34,10 +34,10 @@ using HardwareVideoDecodingProcessPolicy = sandbox::policy::HardwareVideoDecodingProcessPolicy; using PolicyType = -@@ -217,6 +222,7 @@ bool HardwareVideoDecodingPreSandboxHook( +@@ -248,6 +253,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/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_sandbox_hardware__video__encoding__sandbox__hook__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_sandbox_hardware__video__encoding__sandbox__hook__linux.cc index 881836be0cc9..d8791842b47e 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_sandbox_hardware__video__encoding__sandbox__hook__linux.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_sandbox_hardware__video__encoding__sandbox__hook__linux.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/media/gpu/sandbox/hardware_video_encoding_sandbox_hook_linux.cc.orig 2023-09-13 12:11:42 UTC +--- src/3rdparty/chromium/media/gpu/sandbox/hardware_video_encoding_sandbox_hook_linux.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/media/gpu/sandbox/hardware_video_encoding_sandbox_hook_linux.cc @@ -18,12 +18,15 @@ #include "media/gpu/v4l2/v4l2_device.h" @@ -16,9 +16,9 @@ sandbox::syscall_broker::BrokerCommandSet command_set; std::vector permissions; -@@ -121,6 +124,7 @@ bool HardwareVideoEncodingPreSandboxHook( - return false; - } +@@ -131,6 +134,7 @@ bool HardwareVideoEncodingPreSandboxHook( + dlopen("libvulkan.so.1", kDlopenFlags); + dlopen("libvulkan_radeon.so", kDlopenFlags); } +#endif #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_vaapi_vaapi__video__decoder.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_vaapi_vaapi__video__decoder.cc index b1cdfb439f88..33980b0c5bb2 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_vaapi_vaapi__video__decoder.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_vaapi_vaapi__video__decoder.cc @@ -1,11 +1,11 @@ ---- src/3rdparty/chromium/media/gpu/vaapi/vaapi_video_decoder.cc.orig 2024-07-03 01:14:49 UTC +--- src/3rdparty/chromium/media/gpu/vaapi/vaapi_video_decoder.cc.orig 2025-02-21 12:29:33 UTC +++ src/3rdparty/chromium/media/gpu/vaapi/vaapi_video_decoder.cc -@@ -792,7 +792,7 @@ void VaapiVideoDecoder::ApplyResolutionChangeWithScree +@@ -785,7 +785,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 allocator = + std::optional allocator = base::BindRepeating(&AllocateCustomFrameProxy, weak_this_); std::vector candidates = { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_vaapi_vaapi__wrapper.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_vaapi_vaapi__wrapper.cc index 7a9f0b5a9ebe..7e3f6887a864 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_vaapi_vaapi__wrapper.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_vaapi_vaapi__wrapper.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/media/gpu/vaapi/vaapi_wrapper.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/media/gpu/vaapi/vaapi_wrapper.cc.orig 2024-09-30 07:45:04 UTC +++ src/3rdparty/chromium/media/gpu/vaapi/vaapi_wrapper.cc -@@ -66,7 +66,7 @@ +@@ -77,7 +77,7 @@ using media_gpu_vaapi::kModuleVa_prot; #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_media__options.gni b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_media__options.gni index bee30638ac59..983971e99938 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_media__options.gni +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_media__options.gni @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/media/media_options.gni.orig 2024-10-02 15:40:01 UTC +--- src/3rdparty/chromium/media/media_options.gni.orig 2025-02-21 12:29:33 UTC +++ src/3rdparty/chromium/media/media_options.gni @@ -202,12 +202,15 @@ declare_args() { # Enables runtime selection of ALSA library for audio. @@ -17,14 +17,3 @@ (!is_castos || (target_cpu == "x86" || target_cpu == "x64") || is_cast_audio_only)) { use_alsa = true -@@ -223,6 +226,10 @@ declare_args() { - if (!use_cras && !is_castos && !is_asan && !is_tsan) { - use_pulseaudio = true - } -+ } -+ if (is_openbsd) { -+ use_sndio = true -+ use_pulseaudio = false - } - } - diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.cc index 32f0c1350902..d583ac5218e8 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc.orig 2023-10-11 18:22:24 UTC +--- src/3rdparty/chromium/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc -@@ -837,7 +837,7 @@ const gfx::GpuMemoryBufferId& StructTraits< +@@ -841,7 +841,7 @@ const gfx::GpuMemoryBufferId& StructTraits< return input.id; } @@ -9,7 +9,7 @@ // static gfx::NativePixmapHandle StructTraits< media::stable::mojom::NativeGpuMemoryBufferHandleDataView, -@@ -858,7 +858,7 @@ bool StructTraitstype = gfx::NATIVE_PIXMAP; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.h index badd3fb67fa7..299f5aac415e 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.h.orig 2023-10-11 18:22:24 UTC +--- src/3rdparty/chromium/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.h.orig 2024-09-30 07:45:04 UTC +++ src/3rdparty/chromium/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.h -@@ -693,7 +693,7 @@ struct StructTraits #include #include -@@ -47,7 +47,7 @@ class FakeGpuMemoryBufferImpl : public gpu::GpuMemoryB +@@ -57,7 +57,7 @@ class FakeGpuMemoryBufferImpl : public gpu::GpuMemoryB } // namespace @@ -18,7 +18,7 @@ base::ScopedFD GetDummyFD() { base::ScopedFD fd(open("/dev/zero", O_RDWR)); DCHECK(fd.is_valid()); -@@ -77,7 +77,7 @@ FakeGpuMemoryBuffer::FakeGpuMemoryBuffer(const gfx::Si +@@ -87,7 +87,7 @@ FakeGpuMemoryBuffer::FakeGpuMemoryBuffer(const gfx::Si static base::AtomicSequenceNumber buffer_id_generator; handle_.id = gfx::GpuMemoryBufferId(buffer_id_generator.GetNext()); @@ -27,12 +27,12 @@ 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_); -@@ -132,7 +132,7 @@ gfx::GpuMemoryBufferHandle FakeGpuMemoryBuffer::CloneH +@@ -149,7 +149,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/qt6-webengine/files/patch-src_3rdparty_chromium_media_video_gpu__memory__buffer__video__frame__pool.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_video_gpu__memory__buffer__video__frame__pool.cc index 5153aad2197d..dd53719a0814 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_video_gpu__memory__buffer__video__frame__pool.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_video_gpu__memory__buffer__video__frame__pool.cc @@ -1,6 +1,15 @@ ---- src/3rdparty/chromium/media/video/gpu_memory_buffer_video_frame_pool.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/media/video/gpu_memory_buffer_video_frame_pool.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/media/video/gpu_memory_buffer_video_frame_pool.cc -@@ -803,7 +803,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa +@@ -98,7 +98,7 @@ class GpuMemoryBufferVideoFramePool::PoolImpl + gpu::SHARED_IMAGE_USAGE_RASTER_READ | + gpu::SHARED_IMAGE_USAGE_DISPLAY_READ | + gpu::SHARED_IMAGE_USAGE_SCANOUT; +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + // TODO(crbug.com/40194712): Always add the flag once the + // OzoneImageBacking is by default turned on. + if (base::CommandLine::ForCurrentProcess()->HasSwitch( +@@ -695,7 +695,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa } bool is_software_backed_video_frame = !video_frame->HasTextures(); @@ -9,21 +18,12 @@ is_software_backed_video_frame &= !video_frame->HasDmaBufs(); #endif -@@ -1285,7 +1285,7 @@ scoped_refptr GpuMemoryBufferVideoFramePoo - } +@@ -1104,7 +1104,7 @@ scoped_refptr GpuMemoryBufferVideoFramePoo + media::IOSurfaceIsWebGPUCompatible(handle.io_surface.get()); #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - is_webgpu_compatible = (gpu_memory_buffer != nullptr); - if (is_webgpu_compatible) { - is_webgpu_compatible &= -@@ -1305,7 +1305,7 @@ scoped_refptr GpuMemoryBufferVideoFramePoo - gpu::SHARED_IMAGE_USAGE_DISPLAY_READ | - gpu::SHARED_IMAGE_USAGE_SCANOUT; - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - // TODO(crbug.com/1241537): Always add the flag once the - // OzoneImageBacking is by default turned on. - if (base::CommandLine::ForCurrentProcess()->HasSwitch( + is_webgpu_compatible = + handle.native_pixmap_handle.supports_zero_copy_webgpu_import; + #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_video_video__encode__accelerator__adapter.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_video_video__encode__accelerator__adapter.cc index fc5a713014cf..f7651241fb6e 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_video_video__encode__accelerator__adapter.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_video_video__encode__accelerator__adapter.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/media/video/video_encode_accelerator_adapter.cc.orig 2024-01-30 07:53:34 UTC +--- src/3rdparty/chromium/media/video/video_encode_accelerator_adapter.cc.orig 2024-09-30 07:45:04 UTC +++ src/3rdparty/chromium/media/video/video_encode_accelerator_adapter.cc -@@ -154,7 +154,7 @@ VideoEncodeAccelerator::Config SetUpVeaConfig( +@@ -164,7 +164,7 @@ VideoEncodeAccelerator::Config SetUpVeaConfig( if (is_rgb) config.input_format = PIXEL_FORMAT_I420; @@ -9,7 +9,7 @@ if (format != PIXEL_FORMAT_I420 || !VideoFrame::IsStorageTypeMappable(storage_type)) { // ChromeOS/Linux hardware video encoders supports I420 on-memory -@@ -479,7 +479,7 @@ void VideoEncodeAcceleratorAdapter::InitializeInternal +@@ -550,7 +550,7 @@ void VideoEncodeAcceleratorAdapter::InitializeInternal SetUpVeaConfig(profile_, options_, format, first_frame->storage_type(), supported_rc_modes_, required_encoder_type_); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_video_video__encode__accelerator__adapter__test.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_video_video__encode__accelerator__adapter__test.cc index 566d26253613..8c8877508ae3 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_video_video__encode__accelerator__adapter__test.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_video_video__encode__accelerator__adapter__test.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/media/video/video_encode_accelerator_adapter_test.cc.orig 2023-08-17 07:33:31 UTC +--- src/3rdparty/chromium/media/video/video_encode_accelerator_adapter_test.cc.orig 2024-09-30 07:45:04 UTC +++ src/3rdparty/chromium/media/video/video_encode_accelerator_adapter_test.cc -@@ -459,7 +459,7 @@ TEST_P(VideoEncodeAcceleratorAdapterTest, TwoFramesRes +@@ -461,7 +461,7 @@ TEST_P(VideoEncodeAcceleratorAdapterTest, TwoFramesRes CreateGreenFrame(large_size, pixel_format, base::Milliseconds(2)); VideoPixelFormat expected_input_format = PIXEL_FORMAT_I420; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_webrtc_audio__processor.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_webrtc_audio__processor.cc index ed73da8388ec..6a2ccbad3d69 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_webrtc_audio__processor.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_webrtc_audio__processor.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/media/webrtc/audio_processor.cc.orig 2023-03-09 06:31:50 UTC +--- src/3rdparty/chromium/media/webrtc/audio_processor.cc.orig 2024-09-30 07:45:04 UTC +++ src/3rdparty/chromium/media/webrtc/audio_processor.cc -@@ -513,7 +513,7 @@ absl::optional AudioProcessor::ProcessData( +@@ -521,7 +521,7 @@ std::optional 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/qt6-webengine/files/patch-src_3rdparty_chromium_media_webrtc_helpers.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_webrtc_helpers.cc index 67645995d34d..ae6a95a2e8c7 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_webrtc_helpers.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_webrtc_helpers.cc @@ -1,11 +1,19 @@ ---- src/3rdparty/chromium/media/webrtc/helpers.cc.orig 2023-02-08 09:03:45 UTC +--- src/3rdparty/chromium/media/webrtc/helpers.cc.orig 2024-06-17 12:56:06 UTC +++ src/3rdparty/chromium/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/40872787): Remove `kWebRtcAllowInputVolumeAdjustment` safely + // and set `input_volume_controller.enabled` true. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_mojo_core_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_mojo_core_BUILD.gn index a96a138f0536..ab74ea474441 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_mojo_core_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_mojo_core_BUILD.gn @@ -1,11 +1,11 @@ ---- src/3rdparty/chromium/mojo/core/BUILD.gn.orig 2023-04-28 17:01:32 UTC +--- src/3rdparty/chromium/mojo/core/BUILD.gn.orig 2024-09-30 07:45:04 UTC +++ src/3rdparty/chromium/mojo/core/BUILD.gn -@@ -166,7 +166,7 @@ template("core_impl_source_set") { - ] - } +@@ -161,7 +161,7 @@ source_set("impl_for_embedder") { + ] + } -- if ((is_linux || is_chromeos || is_android) && !is_nacl) { -+ if ((is_linux || is_chromeos || is_android) && !is_nacl && !is_bsd) { - sources += [ - "channel_linux.cc", - "channel_linux.h", +- if ((is_linux || is_chromeos || is_android) && !is_nacl) { ++ if ((is_linux || is_chromeos || is_android) && !is_nacl && !is_bsd) { + sources += [ + "channel_linux.cc", + "channel_linux.h", diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_mojo_core_channel.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_mojo_core_channel.cc index 8ea42f93e5f3..1338e8a5bd95 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_mojo_core_channel.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_mojo_core_channel.cc @@ -1,8 +1,8 @@ ---- src/3rdparty/chromium/mojo/core/channel.cc.orig 2023-03-09 06:31:50 UTC +--- src/3rdparty/chromium/mojo/core/channel.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/mojo/core/channel.cc -@@ -75,7 +75,11 @@ const size_t kMaxUnusedReadBufferCapacity = 4096; - // Fuchsia: The zx_channel_write() API supports up to 64 handles. - const size_t kMaxAttachedHandles = 64; +@@ -82,7 +82,11 @@ const size_t kMaxAttachedHandles = 64; + const size_t kMaxAttachedHandles = 253; + #endif // BUILDFLAG(IS_FUCHSIA) +#if defined(__i386__) && defined(OS_FREEBSD) +const size_t kChannelMessageAlignment = 4; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_mojo_public_c_system_thunks.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_mojo_public_c_system_thunks.cc deleted file mode 100644 index d64bb4466ba0..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_mojo_public_c_system_thunks.cc +++ /dev/null @@ -1,38 +0,0 @@ ---- src/3rdparty/chromium/mojo/public/c/system/thunks.cc.orig 2024-02-23 21:04:38 UTC -+++ src/3rdparty/chromium/mojo/public/c/system/thunks.cc -@@ -24,7 +24,7 @@ - #include "mojo/public/c/system/message_pipe.h" - - #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \ -- BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - #include - #include "base/environment.h" - #include "base/files/file_path.h" -@@ -72,7 +72,7 @@ class CoreLibraryInitializer { - - MojoResult LoadLibrary(base::FilePath library_path) { - #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \ -- BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - if (library_ && library_->is_valid()) - return MOJO_RESULT_OK; - -@@ -86,7 +86,7 @@ class CoreLibraryInitializer { - - if (library_path.empty()) { - // Default to looking for the library in the current working directory. --#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - const base::FilePath::CharType kDefaultLibraryPathValue[] = - FILE_PATH_LITERAL("./libmojo_core.so"); - #elif BUILDFLAG(IS_FUCHSIA) -@@ -142,7 +142,7 @@ class CoreLibraryInitializer { - - private: - #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \ -- BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - std::optional library_; - #endif - }; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_mojo_public_tools_bindings_mojom.gni b/www/qt6-webengine/files/patch-src_3rdparty_chromium_mojo_public_tools_bindings_mojom.gni index 9413f904912e..dde70c46875f 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_mojo_public_tools_bindings_mojom.gni +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_mojo_public_tools_bindings_mojom.gni @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/mojo/public/tools/bindings/mojom.gni.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/mojo/public/tools/bindings/mojom.gni.orig 2024-09-30 07:45:04 UTC +++ src/3rdparty/chromium/mojo/public/tools/bindings/mojom.gni -@@ -748,6 +748,16 @@ template("mojom") { +@@ -776,6 +776,16 @@ template("mojom") { enabled_features += [ "is_apple" ] } @@ -16,4 +16,4 @@ + action(parser_target_name) { allow_remote = true - custom_processor = "mojom_parser" + diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_BUILD.gn index db42c6487a4c..9f7a79728378 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_BUILD.gn @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/net/BUILD.gn.orig 2024-07-03 01:14:49 UTC +--- src/3rdparty/chromium/net/BUILD.gn.orig 2025-02-21 12:29:33 UTC +++ src/3rdparty/chromium/net/BUILD.gn -@@ -126,7 +126,7 @@ net_configs = [ +@@ -130,7 +130,7 @@ net_configs = [ "//build/config/compiler:wexit_time_destructors", ] @@ -9,7 +9,18 @@ net_configs += [ "//build/config/linux:libresolv" ] } -@@ -1183,6 +1183,19 @@ component("net") { +@@ -1281,10 +1281,6 @@ jumbo_component("net") { + "base/network_interfaces_linux.h", + "base/platform_mime_util_linux.cc", + ] +- jumbo_excluded_sources += [ +- "base/address_tracker_linux.cc", +- "base/network_interfaces_linux.cc", +- ] + } + + if (is_linux) { +@@ -1294,6 +1290,19 @@ jumbo_component("net") { ] } @@ -29,7 +40,7 @@ if (is_mac) { sources += [ "base/network_notification_thread_mac.cc", -@@ -1340,7 +1353,7 @@ component("net") { +@@ -1458,7 +1467,7 @@ jumbo_component("net") { } # Use getifaddrs() on POSIX platforms, except Linux. @@ -38,7 +49,7 @@ sources += [ "base/network_interfaces_getifaddrs.cc", "base/network_interfaces_getifaddrs.h", -@@ -2810,7 +2823,7 @@ test("net_unittests") { +@@ -2941,7 +2950,7 @@ target(_test_target_type, "net_unittests") { ] } @@ -47,7 +58,7 @@ sources += [ "base/address_tracker_linux_unittest.cc", "base/network_interfaces_linux_unittest.cc", -@@ -2898,6 +2911,10 @@ test("net_unittests") { +@@ -3034,6 +3043,10 @@ target(_test_target_type, "net_unittests") { ] } @@ -56,9 +67,9 @@ + } + if (enable_websockets) { - deps += [ "//net/server:tests" ] - } -@@ -2968,7 +2985,7 @@ test("net_unittests") { + sources += [ + "server/http_connection_unittest.cc", +@@ -3100,7 +3113,7 @@ target(_test_target_type, "net_unittests") { ] } @@ -67,7 +78,7 @@ sources += [ "tools/quic/quic_simple_server_test.cc" ] } -@@ -3103,7 +3120,7 @@ test("net_unittests") { +@@ -3239,7 +3252,7 @@ target(_test_target_type, "net_unittests") { } # Use getifaddrs() on POSIX platforms, except Linux. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_base_features.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_base_features.cc index 401d54661280..71ee6ae4e421 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_base_features.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_base_features.cc @@ -1,15 +1,24 @@ ---- src/3rdparty/chromium/net/base/features.cc.orig 2024-07-03 01:14:49 UTC +--- src/3rdparty/chromium/net/base/features.cc.orig 2025-02-21 12:29:33 UTC +++ src/3rdparty/chromium/net/base/features.cc -@@ -508,7 +508,12 @@ BASE_FEATURE(kSpdyHeadersToHttpResponseUseBuilder, +@@ -28,7 +28,7 @@ BASE_FEATURE(kChromeStaticPinning, + base::FEATURE_ENABLED_BY_DEFAULT); + + #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(kAsyncDns, + "AsyncDns", + base::FEATURE_ENABLED_BY_DEFAULT +@@ -535,7 +535,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); + BASE_FEATURE(kReportEcn, "ReportEcn", base::FEATURE_DISABLED_BY_DEFAULT); +#else -+BASE_FEATURE(kReceiveEcn, "ReceiveEcn", base::FEATURE_DISABLED_BY_DEFAULT); ++BASE_FEATURE(kReportEcn, "ReportEcn", base::FEATURE_DISABLED_BY_DEFAULT); +#endif - // TODO(crbug.com/634470): Remove this feature flag in January 2024 if the new - // limit sticks. + BASE_FEATURE(kUseNewAlpsCodepointHttp2, + "UseNewAlpsCodepointHttp2", diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_base_network__change__notifier.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_base_network__change__notifier.cc index 78e17cdc4f1b..9977eda543f6 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_base_network__change__notifier.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_base_network__change__notifier.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/net/base/network_change_notifier.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/net/base/network_change_notifier.cc.orig 2024-09-30 07:45:04 UTC +++ src/3rdparty/chromium/net/base/network_change_notifier.cc @@ -37,7 +37,7 @@ #include "net/base/network_change_notifier_linux.h" @@ -9,7 +9,7 @@ #include "net/base/network_change_notifier_passive.h" #elif BUILDFLAG(IS_FUCHSIA) #include "net/base/network_change_notifier_fuchsia.h" -@@ -329,6 +329,9 @@ std::unique_ptr NetworkChangeNo +@@ -324,6 +324,9 @@ std::unique_ptr NetworkChangeNo #elif BUILDFLAG(IS_FUCHSIA) return std::make_unique( /*require_wlan=*/false); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_base_sockaddr__util__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_base_sockaddr__util__posix.cc index f0995c98ef14..b22bec2d34b1 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_base_sockaddr__util__posix.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_base_sockaddr__util__posix.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/net/base/sockaddr_util_posix.cc.orig 2022-07-22 17:30:31 UTC +--- src/3rdparty/chromium/net/base/sockaddr_util_posix.cc.orig 2024-07-30 11:12:21 UTC +++ src/3rdparty/chromium/net/base/sockaddr_util_posix.cc -@@ -41,7 +41,8 @@ bool FillUnixAddress(const std::string& socket_path, +@@ -46,7 +46,8 @@ bool FillUnixAddress(const std::string& socket_path, return true; } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_cert_cert__verify__proc.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_cert_cert__verify__proc.h index 44428363d94a..a16adebf725c 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_cert_cert__verify__proc.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_cert_cert__verify__proc.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/net/cert/cert_verify_proc.h.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/net/cert/cert_verify_proc.h.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/net/cert/cert_verify_proc.h -@@ -145,7 +145,7 @@ class NET_EXPORT CertVerifyProc +@@ -178,7 +178,7 @@ class NET_EXPORT CertVerifyProc kMaxValue = kChainLengthOne }; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_disk__cache_simple_simple__file__tracker.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_disk__cache_simple_simple__file__tracker.cc index d187aa443a46..b96c3368f007 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_disk__cache_simple_simple__file__tracker.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_disk__cache_simple_simple__file__tracker.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/net/disk_cache/simple/simple_file_tracker.cc.orig 2022-06-17 14:20:10 UTC +--- src/3rdparty/chromium/net/disk_cache/simple/simple_file_tracker.cc.orig 2024-08-26 12:06:38 UTC +++ src/3rdparty/chromium/net/disk_cache/simple/simple_file_tracker.cc -@@ -29,7 +29,17 @@ void RecordFileDescripterLimiterOp(FileDescriptorLimit +@@ -35,7 +35,17 @@ void RecordFileDescripterLimiterOp(FileDescriptorLimit } // namespace SimpleFileTracker::SimpleFileTracker(int file_limit) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_BUILD.gn index af924c6e4513..d8b0e52e66bb 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_BUILD.gn @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/net/dns/BUILD.gn.orig 2025-01-24 10:49:20 UTC +--- src/3rdparty/chromium/net/dns/BUILD.gn.orig 2025-03-29 00:50:57 UTC +++ src/3rdparty/chromium/net/dns/BUILD.gn -@@ -134,7 +134,7 @@ source_set("dns") { +@@ -138,7 +138,7 @@ source_set("dns") { "dns_config_service_android.cc", "dns_config_service_android.h", ] @@ -9,17 +9,17 @@ sources += [ "dns_config_service_linux.cc", "dns_config_service_linux.h", -@@ -168,6 +168,9 @@ source_set("dns") { +@@ -172,6 +172,9 @@ source_set("dns") { } deps = [ "//net:net_deps" ] + if (is_bsd) { -+ deps += [ "//components/services/screen_ai/buildflags" ] ++ deps += [ "//services/screen_ai/buildflags" ] + } public_deps = [ ":dns_client", -@@ -175,6 +178,7 @@ source_set("dns") { +@@ -179,6 +182,7 @@ source_set("dns") { ":host_resolver_manager", ":mdns_client", "//net:net_public_deps", @@ -27,7 +27,7 @@ ] allow_circular_includes_from = [ -@@ -440,9 +444,9 @@ source_set("tests") { +@@ -447,9 +451,9 @@ source_set("tests") { if (is_android) { sources += [ "dns_config_service_android_unittest.cc" ] diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_address__info.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_address__info.cc index 5d147be62e98..be1963acf7b6 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_address__info.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_address__info.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/net/dns/address_info.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/net/dns/address_info.cc.orig 2024-07-30 11:12:21 UTC +++ src/3rdparty/chromium/net/dns/address_info.cc -@@ -78,8 +78,12 @@ AddressInfo::AddressInfoAndResult AddressInfo::Get( +@@ -83,8 +83,12 @@ AddressInfo::AddressInfoAndResult AddressInfo::Get( // error. // http://crbug.com/134142 err = ERR_NAME_NOT_RESOLVED; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_address__sorter__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_address__sorter__posix.cc index 56f6e5420624..06bd88941fc4 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_address__sorter__posix.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_address__sorter__posix.cc @@ -1,10 +1,10 @@ ---- src/3rdparty/chromium/net/dns/address_sorter_posix.cc.orig 2023-04-28 17:01:32 UTC +--- src/3rdparty/chromium/net/dns/address_sorter_posix.cc.orig 2024-07-30 11:12:21 UTC +++ src/3rdparty/chromium/net/dns/address_sorter_posix.cc -@@ -27,6 +27,7 @@ +@@ -32,6 +32,7 @@ #include "net/dns/netinet_in_var_ios.h" #else #include +#include #endif // BUILDFLAG(IS_IOS) #endif - + #include diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_dns__config__service__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_dns__config__service__posix.cc index 2832b990039f..1d3fc9a57e93 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_dns__config__service__posix.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_dns__config__service__posix.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/net/dns/dns_config_service_posix.cc.orig 2022-08-31 12:19:35 UTC +--- src/3rdparty/chromium/net/dns/dns_config_service_posix.cc.orig 2024-07-30 11:12:21 UTC +++ src/3rdparty/chromium/net/dns/dns_config_service_posix.cc -@@ -34,6 +34,11 @@ +@@ -39,6 +39,11 @@ #include "net/dns/dns_config_watcher_mac.h" #endif @@ -12,7 +12,7 @@ namespace net { namespace internal { -@@ -130,6 +135,11 @@ class DnsConfigServicePosix::Watcher : public DnsConfi +@@ -135,6 +140,11 @@ class DnsConfigServicePosix::Watcher : public DnsConfi bool Watch() override { CheckOnCorrectSequence(); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_public_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_public_BUILD.gn index c397076cb596..078eca3ccfa1 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_public_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_public_BUILD.gn @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/net/dns/public/BUILD.gn.orig 2023-11-03 10:09:45 UTC +--- src/3rdparty/chromium/net/dns/public/BUILD.gn.orig 2024-05-21 18:07:39 UTC +++ src/3rdparty/chromium/net/dns/public/BUILD.gn -@@ -77,7 +77,7 @@ source_set("tests") { +@@ -78,7 +78,7 @@ source_set("tests") { "doh_provider_entry_unittest.cc", ] diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_http_http__auth__gssapi__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_http_http__auth__gssapi__posix.cc index 56580ae1ca4e..132dbd282215 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_http_http__auth__gssapi__posix.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_http_http__auth__gssapi__posix.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/net/http/http_auth_gssapi_posix.cc.orig 2023-04-28 17:01:32 UTC +--- src/3rdparty/chromium/net/http/http_auth_gssapi_posix.cc.orig 2024-07-30 11:12:21 UTC +++ src/3rdparty/chromium/net/http/http_auth_gssapi_posix.cc -@@ -370,8 +370,9 @@ base::NativeLibrary GSSAPISharedLibrary::LoadSharedLib +@@ -375,8 +375,9 @@ base::NativeLibrary GSSAPISharedLibrary::LoadSharedLib static const char* const kDefaultLibraryNames[] = { #if BUILDFLAG(IS_APPLE) "/System/Library/Frameworks/GSS.framework/GSS" diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_http_http__auth__handler__negotiate.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_http_http__auth__handler__negotiate.cc index 8433aae87595..cb34577ccbc0 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_http_http__auth__handler__negotiate.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_http_http__auth__handler__negotiate.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/net/http/http_auth_handler_negotiate.cc.orig 2023-10-11 18:22:24 UTC +--- src/3rdparty/chromium/net/http/http_auth_handler_negotiate.cc.orig 2024-03-22 08:19:40 UTC +++ src/3rdparty/chromium/net/http/http_auth_handler_negotiate.cc -@@ -121,7 +121,7 @@ int HttpAuthHandlerNegotiate::Factory::CreateAuthHandl +@@ -120,7 +120,7 @@ int HttpAuthHandlerNegotiate::Factory::CreateAuthHandl #elif BUILDFLAG(IS_POSIX) if (is_unsupported_) return ERR_UNSUPPORTED_AUTH_SCHEME; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_http_http__network__session.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_http_http__network__session.cc index dbfcd54c2350..23edb1d926fc 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_http_http__network__session.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_http_http__network__session.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/net/http/http_network_session.cc.orig 2023-01-11 09:17:16 UTC +--- src/3rdparty/chromium/net/http/http_network_session.cc.orig 2024-09-30 07:45:04 UTC +++ src/3rdparty/chromium/net/http/http_network_session.cc -@@ -19,7 +19,9 @@ +@@ -20,7 +20,9 @@ #include "build/build_config.h" #include "net/base/features.h" #include "net/dns/host_resolver.h" @@ -9,4 +9,4 @@ +#endif #include "net/http/http_response_body_drainer.h" #include "net/http/http_stream_factory.h" - #include "net/http/url_security_manager.h" + #include "net/http/http_stream_pool.h" diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_proxy__resolution_proxy__config__service__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_proxy__resolution_proxy__config__service__linux.cc index b842ea9b7696..1f61bc922d8e 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_proxy__resolution_proxy__config__service__linux.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_proxy__resolution_proxy__config__service__linux.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/net/proxy_resolution/proxy_config_service_linux.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/net/proxy_resolution/proxy_config_service_linux.cc.orig 2024-07-30 11:12:21 UTC +++ src/3rdparty/chromium/net/proxy_resolution/proxy_config_service_linux.cc -@@ -6,7 +6,9 @@ +@@ -11,7 +11,9 @@ #include #include @@ -10,15 +10,15 @@ #include #include -@@ -505,6 +507,7 @@ bool SettingGetterImplGSettings::CheckVersion( +@@ -510,6 +512,7 @@ bool SettingGetterImplGSettings::CheckVersion( } #endif // defined(USE_GIO) +#if !BUILDFLAG(IS_BSD) // 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) { -@@ -1033,6 +1036,7 @@ class SettingGetterImplKDE : public ProxyConfigService + int StringToIntOrDefault(std::string_view value, int default_value) { +@@ -1038,6 +1041,7 @@ class SettingGetterImplKDE : public ProxyConfigService // events on. scoped_refptr file_task_runner_; }; @@ -26,7 +26,7 @@ } // namespace -@@ -1251,9 +1255,11 @@ ProxyConfigServiceLinux::Delegate::Delegate( +@@ -1256,9 +1260,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/qt6-webengine/files/patch-src_3rdparty_chromium_net_socket_socks5__client__socket.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_socket_socks5__client__socket.cc index 38040ec27a24..4305703bea29 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_socket_socks5__client__socket.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_socket_socks5__client__socket.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/net/socket/socks5_client_socket.cc.orig 2022-04-21 18:48:31 UTC +--- src/3rdparty/chromium/net/socket/socks5_client_socket.cc.orig 2024-07-30 11:12:21 UTC +++ src/3rdparty/chromium/net/socket/socks5_client_socket.cc -@@ -19,6 +19,9 @@ +@@ -24,6 +24,9 @@ #include "net/log/net_log_event_type.h" #include "net/traffic_annotation/network_traffic_annotation.h" diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_socket_tcp__socket__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_socket_tcp__socket__posix.cc index 1e27146b95fe..4b2d83849b27 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_socket_tcp__socket__posix.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_socket_tcp__socket__posix.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/net/socket/tcp_socket_posix.cc.orig 2023-05-31 08:12:17 UTC +--- src/3rdparty/chromium/net/socket/tcp_socket_posix.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/net/socket/tcp_socket_posix.cc @@ -98,6 +98,17 @@ bool SetTCPKeepAlive(int fd, bool enable, int delay) { PLOG(ERROR) << "Failed to set TCP_KEEPALIVE on fd: " << fd; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_socket_udp__socket__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_socket_udp__socket__posix.cc index a7a8da6eb5f2..b1ac5453e6d0 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_socket_udp__socket__posix.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_socket_udp__socket__posix.cc @@ -1,7 +1,7 @@ ---- src/3rdparty/chromium/net/socket/udp_socket_posix.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/net/socket/udp_socket_posix.cc.orig 2024-09-30 07:45:04 UTC +++ src/3rdparty/chromium/net/socket/udp_socket_posix.cc -@@ -592,12 +592,17 @@ int UDPSocketPosix::SetRecvEcn() { - } +@@ -522,12 +522,17 @@ int UDPSocketPosix::SetRecvTos() { + #endif // BUILDFLAG(IS_APPLE) } +#ifdef IP_RECVTOS @@ -19,7 +19,7 @@ if (confirm) { sendto_flags_ |= MSG_CONFIRM; } else { -@@ -618,7 +623,7 @@ int UDPSocketPosix::SetBroadcast(bool broadcast) { +@@ -548,7 +553,7 @@ int UDPSocketPosix::SetBroadcast(bool broadcast) { DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); int value = broadcast ? 1 : 0; int rv; @@ -28,7 +28,7 @@ // SO_REUSEPORT on OSX permits multiple processes to each receive // UDP multicast or broadcast datagrams destined for the bound // port. -@@ -931,7 +936,7 @@ int UDPSocketPosix::DoBind(const IPEndPoint& address) +@@ -886,7 +891,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/qt6-webengine/files/patch-src_3rdparty_chromium_net_tools_cert__verify__tool_cert__verify__comparision__tool.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_tools_cert__verify__tool_cert__verify__comparision__tool.cc deleted file mode 100644 index fd13d1a1de1f..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_tools_cert__verify__tool_cert__verify__comparision__tool.cc +++ /dev/null @@ -1,29 +0,0 @@ ---- src/3rdparty/chromium/net/tools/cert_verify_tool/cert_verify_comparision_tool.cc.orig 2024-02-23 21:04:38 UTC -+++ src/3rdparty/chromium/net/tools/cert_verify_tool/cert_verify_comparision_tool.cc -@@ -35,7 +35,7 @@ - #include "net/url_request/url_request_context_builder.h" - #include "net/url_request/url_request_context_getter.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 -@@ -55,7 +55,7 @@ void SetUpOnNetworkThread( - base::WaitableEvent* initialization_complete_event) { - net::URLRequestContextBuilder url_request_context_builder; - url_request_context_builder.set_user_agent(GetUserAgent()); --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - // On Linux, use a fixed ProxyConfigService, since the default one - // depends on glib. - // -@@ -123,7 +123,7 @@ class CertVerifyImpl { - std::unique_ptr CreateCertVerifyImplFromName( - base::StringPiece impl_name, - scoped_refptr cert_net_fetcher) { --#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") { - return std::make_unique( diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_tools_cert__verify__tool_cert__verify__tool.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_tools_cert__verify__tool_cert__verify__tool.cc index 7f55892e0c28..0c51a3c029c5 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_tools_cert__verify__tool_cert__verify__tool.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_tools_cert__verify__tool_cert__verify__tool.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/net/tools/cert_verify_tool/cert_verify_tool.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/net/tools/cert_verify_tool/cert_verify_tool.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/net/tools/cert_verify_tool/cert_verify_tool.cc -@@ -33,7 +33,7 @@ +@@ -35,7 +35,7 @@ #include "third_party/boringssl/src/pki/trust_store.h" #include "third_party/boringssl/src/pki/trust_store_collection.h" @@ -9,7 +9,7 @@ #include "net/proxy_resolution/proxy_config.h" #include "net/proxy_resolution/proxy_config_service_fixed.h" #endif -@@ -65,7 +65,7 @@ void SetUpOnNetworkThread( +@@ -67,7 +67,7 @@ void SetUpOnNetworkThread( base::WaitableEvent* initialization_complete_event) { net::URLRequestContextBuilder url_request_context_builder; url_request_context_builder.set_user_agent(GetUserAgent()); @@ -18,7 +18,7 @@ // On Linux, use a fixed ProxyConfigService, since the default one // depends on glib. // -@@ -566,7 +566,7 @@ int main(int argc, char** argv) { +@@ -580,7 +580,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/qt6-webengine/files/patch-src_3rdparty_chromium_net_tools_net__watcher_net__watcher.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_tools_net__watcher_net__watcher.cc index 6da6297b8a26..39b71048a272 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_tools_net__watcher_net__watcher.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_tools_net__watcher_net__watcher.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/net/tools/net_watcher/net_watcher.cc.orig 2023-02-08 09:03:45 UTC +--- src/3rdparty/chromium/net/tools/net_watcher/net_watcher.cc.orig 2024-06-17 12:56:06 UTC +++ src/3rdparty/chromium/net/tools/net_watcher/net_watcher.cc @@ -32,7 +32,7 @@ #include "net/proxy_resolution/proxy_config_service.h" @@ -11,7 +11,7 @@ @@ -44,7 +44,7 @@ namespace { - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_traffic__annotation_network__traffic__annotation.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_traffic__annotation_network__traffic__annotation.h index 6137b2d6afab..fc6ca465eac6 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_traffic__annotation_network__traffic__annotation.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_traffic__annotation_network__traffic__annotation.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/net/traffic_annotation/network_traffic_annotation.h.orig 2022-09-24 10:57:32 UTC +--- src/3rdparty/chromium/net/traffic_annotation/network_traffic_annotation.h.orig 2024-07-30 11:12:21 UTC +++ src/3rdparty/chromium/net/traffic_annotation/network_traffic_annotation.h -@@ -373,7 +373,7 @@ struct MutablePartialNetworkTrafficAnnotationTag { +@@ -378,7 +378,7 @@ struct MutablePartialNetworkTrafficAnnotationTag { } // namespace net // Placeholder for unannotated usages. @@ -9,8 +9,8 @@ #define TRAFFIC_ANNOTATION_WITHOUT_PROTO(ANNOTATION_ID) \ net::DefineNetworkTrafficAnnotation(ANNOTATION_ID, "No proto yet.") #endif -@@ -387,7 +387,7 @@ struct MutablePartialNetworkTrafficAnnotationTag { - // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is +@@ -392,7 +392,7 @@ struct MutablePartialNetworkTrafficAnnotationTag { + // TODO(crbug.com/40118868): Revisit once build flag switch of lacros-chrome is // complete. #if !BUILDFLAG(IS_WIN) && \ - !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_url__request_url__request__context.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_url__request_url__request__context.cc index fb2066f66c81..5a6b8543f38e 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_url__request_url__request__context.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_url__request_url__request__context.cc @@ -1,7 +1,7 @@ ---- src/3rdparty/chromium/net/url_request/url_request_context.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/net/url_request/url_request_context.cc.orig 2024-06-17 12:56:06 UTC +++ src/3rdparty/chromium/net/url_request/url_request_context.cc -@@ -117,7 +117,7 @@ const HttpNetworkSessionContext* URLRequestContext::Ge - // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is +@@ -121,7 +121,7 @@ const HttpNetworkSessionContext* URLRequestContext::Ge + // TODO(crbug.com/40118868): Revisit once build flag switch of lacros-chrome is // complete. #if !BUILDFLAG(IS_WIN) && \ - !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_url__request_url__request__context.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_url__request_url__request__context.h index 2480018fda35..a78fc8c28b3e 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_url__request_url__request__context.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_url__request_url__request__context.h @@ -1,7 +1,7 @@ ---- src/3rdparty/chromium/net/url_request/url_request_context.h.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/net/url_request/url_request_context.h.orig 2024-08-26 12:06:38 UTC +++ src/3rdparty/chromium/net/url_request/url_request_context.h -@@ -85,7 +85,7 @@ class NET_EXPORT URLRequestContext final { - // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is +@@ -91,7 +91,7 @@ class NET_EXPORT URLRequestContext final { + // TODO(crbug.com/40118868): Revisit once build flag switch of lacros-chrome is // complete. #if !BUILDFLAG(IS_WIN) && \ - !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_url__request_url__request__context__builder.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_url__request_url__request__context__builder.cc index 60599c4dd5fc..9371e40202de 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_url__request_url__request__context__builder.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_url__request_url__request__context__builder.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/net/url_request/url_request_context_builder.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/net/url_request/url_request_context_builder.cc.orig 2024-09-30 07:45:04 UTC +++ src/3rdparty/chromium/net/url_request/url_request_context_builder.cc -@@ -434,7 +434,7 @@ std::unique_ptr URLRequestContextBu +@@ -446,7 +446,7 @@ std::unique_ptr URLRequestContextBu } if (!proxy_resolution_service_) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_pdf_pdfium_pdfium__engine.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_pdf_pdfium_pdfium__engine.cc index 09d25d29fb11..3674ddee982c 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_pdf_pdfium_pdfium__engine.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_pdf_pdfium_pdfium__engine.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/pdf/pdfium/pdfium_engine.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/pdf/pdfium/pdfium_engine.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/pdf/pdfium/pdfium_engine.cc -@@ -85,7 +85,7 @@ +@@ -94,7 +94,7 @@ #include "gin/public/cppgc.h" #endif @@ -9,7 +9,7 @@ #include "pdf/pdfium/pdfium_font_linux.h" #endif -@@ -525,7 +525,7 @@ void InitializeSDK(bool enable_v8, +@@ -523,7 +523,7 @@ void InitializeSDK(bool enable_v8, FPDF_InitLibraryWithConfig(&config); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_backend_cups__ipp__helper.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_backend_cups__ipp__helper.cc index e3b7090806f5..177acc3aefa7 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_backend_cups__ipp__helper.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_backend_cups__ipp__helper.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/printing/backend/cups_ipp_helper.cc.orig 2023-09-13 12:11:42 UTC +--- src/3rdparty/chromium/printing/backend/cups_ipp_helper.cc.orig 2024-06-17 12:56:06 UTC +++ src/3rdparty/chromium/printing/backend/cups_ipp_helper.cc -@@ -215,7 +215,7 @@ void ExtractResolutions(const CupsOptionProvider& prin +@@ -202,7 +202,7 @@ void ExtractResolutions(const CupsOptionProvider& prin // Provide a default DPI if no valid DPI is found. #if BUILDFLAG(IS_MAC) constexpr gfx::Size kDefaultMissingDpi(kDefaultMacDpi, kDefaultMacDpi); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_backend_print__backend__cups.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_backend_print__backend__cups.cc new file mode 100644 index 000000000000..01b606373430 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_backend_print__backend__cups.cc @@ -0,0 +1,29 @@ +--- src/3rdparty/chromium/printing/backend/print_backend_cups.cc.orig 2024-10-22 08:31:56 UTC ++++ src/3rdparty/chromium/printing/backend/print_backend_cups.cc +@@ -33,7 +33,7 @@ + #include "printing/mojom/print.mojom.h" + #include "url/gurl.h" + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + #include "base/feature_list.h" + #include "printing/backend/cups_connection.h" + #include "printing/backend/print_backend_cups_ipp.h" +@@ -63,7 +63,7 @@ int CaptureCupsDestCallback(void* data, unsigned flags + return 1; // Keep going. + } + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + // This may be removed when Amazon Linux 2 reaches EOL (30 Jun 2025). + bool AreNewerCupsFunctionsAvailable() { + return cupsFindDestDefault && cupsFindDestSupported && ippValidateAttributes; +@@ -291,7 +291,7 @@ bool PrintBackendCUPS::IsValidPrinter(const std::strin + #if !BUILDFLAG(IS_CHROMEOS) + scoped_refptr PrintBackend::CreateInstanceImpl( + const std::string& locale) { +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + if (AreNewerCupsFunctionsAvailable() && + base::FeatureList::IsEnabled(features::kCupsIppPrintingBackend)) { + return base::MakeRefCounted(CupsConnection::Create()); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_print__settings.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_print__settings.h index 3d7d309de02d..6b60b85de563 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_print__settings.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_print__settings.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/printing/print_settings.h.orig 2023-10-11 18:22:24 UTC +--- src/3rdparty/chromium/printing/print_settings.h.orig 2024-09-30 07:45:04 UTC +++ src/3rdparty/chromium/printing/print_settings.h @@ -25,7 +25,7 @@ #include "base/values.h" @@ -18,7 +18,7 @@ inline constexpr char kLinuxSystemPrintDialogDataPrinter[] = "printer_name"; inline constexpr char kLinuxSystemPrintDialogDataPrintSettings[] = "print_settings"; -@@ -101,7 +101,7 @@ class COMPONENT_EXPORT(PRINTING) PrintSettings { +@@ -101,7 +101,7 @@ class COMPONENT_EXPORT(PRINTING_SETTINGS) PrintSetting std::string vendor_id; }; @@ -27,7 +27,7 @@ using AdvancedSettings = std::map; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -276,7 +276,7 @@ class COMPONENT_EXPORT(PRINTING) PrintSettings { +@@ -276,7 +276,7 @@ class COMPONENT_EXPORT(PRINTING_SETTINGS) PrintSetting pages_per_sheet_ = pages_per_sheet; } @@ -36,7 +36,7 @@ AdvancedSettings& advanced_settings() { return advanced_settings_; } const AdvancedSettings& advanced_settings() const { return advanced_settings_; -@@ -429,7 +429,7 @@ class COMPONENT_EXPORT(PRINTING) PrintSettings { +@@ -429,7 +429,7 @@ class COMPONENT_EXPORT(PRINTING_SETTINGS) PrintSetting // Number of pages per sheet. int pages_per_sheet_; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_print__settings__conversion.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_print__settings__conversion.cc index 5da292797b4a..d53265f3b1c8 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_print__settings__conversion.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_print__settings__conversion.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/printing/print_settings_conversion.cc.orig 2023-10-11 18:22:24 UTC +--- src/3rdparty/chromium/printing/print_settings_conversion.cc.orig 2024-04-19 13:02:56 UTC +++ src/3rdparty/chromium/printing/print_settings_conversion.cc -@@ -287,7 +287,7 @@ std::unique_ptr PrintSettingsFromJobSet +@@ -285,7 +285,7 @@ std::unique_ptr PrintSettingsFromJobSet settings->set_is_modifiable(is_modifiable.value()); } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_printing__features.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_printing__features.cc new file mode 100644 index 000000000000..31448a5e8af9 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_printing__features.cc @@ -0,0 +1,17 @@ +--- src/3rdparty/chromium/printing/printing_features.cc.orig 2024-07-30 11:12:21 UTC ++++ src/3rdparty/chromium/printing/printing_features.cc +@@ -21,12 +21,12 @@ BASE_FEATURE(kAddPrinterViaPrintscanmgr, + base::FEATURE_DISABLED_BY_DEFAULT); + #endif // BUILDFLAG(IS_CHROMEOS) + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + // Use the CUPS IPP printing backend instead of the original CUPS backend that + // calls the deprecated PPD API. + BASE_FEATURE(kCupsIppPrintingBackend, + "CupsIppPrintingBackend", +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + base::FEATURE_DISABLED_BY_DEFAULT + #else + base::FEATURE_ENABLED_BY_DEFAULT diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_printing__features.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_printing__features.h new file mode 100644 index 000000000000..a6ce6e32a4db --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_printing__features.h @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/printing/printing_features.h.orig 2024-07-30 11:12:21 UTC ++++ src/3rdparty/chromium/printing/printing_features.h +@@ -22,7 +22,7 @@ COMPONENT_EXPORT(PRINTING_BASE) + BASE_DECLARE_FEATURE(kAddPrinterViaPrintscanmgr); + #endif // BUILDFLAG(IS_CHROMEOS) + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + COMPONENT_EXPORT(PRINTING_BASE) BASE_DECLARE_FEATURE(kCupsIppPrintingBackend); + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) + diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_sandbox_print__backend__sandbox__hook__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_sandbox_print__backend__sandbox__hook__linux.cc index 8f2aa000c2c1..e213b02f0259 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_sandbox_print__backend__sandbox__hook__linux.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_sandbox_print__backend__sandbox__hook__linux.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/printing/sandbox/print_backend_sandbox_hook_linux.cc.orig 2023-04-28 17:01:32 UTC +--- src/3rdparty/chromium/printing/sandbox/print_backend_sandbox_hook_linux.cc.orig 2024-04-19 13:02:56 UTC +++ src/3rdparty/chromium/printing/sandbox/print_backend_sandbox_hook_linux.cc @@ -10,20 +10,27 @@ #include "base/path_service.h" @@ -40,8 +40,8 @@ #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/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_linux_services_libc__interceptor.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_linux_services_libc__interceptor.cc index 7593efce8eed..5c91d4e896ed 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_linux_services_libc__interceptor.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_linux_services_libc__interceptor.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/sandbox/linux/services/libc_interceptor.cc.orig 2023-09-13 12:11:42 UTC +--- src/3rdparty/chromium/sandbox/linux/services/libc_interceptor.cc.orig 2024-08-26 12:06:38 UTC +++ src/3rdparty/chromium/sandbox/linux/services/libc_interceptor.cc -@@ -12,7 +12,9 @@ +@@ -17,7 +17,9 @@ #include #include #include @@ -10,7 +10,7 @@ #include #include #include -@@ -167,7 +169,7 @@ bool ReadTimeStruct(base::PickleIterator* iter, +@@ -173,7 +175,7 @@ bool ReadTimeStruct(base::PickleIterator* iter, } else { base::AutoLock lock(g_timezones_lock.Get()); auto ret_pair = g_timezones.Get().insert(timezone); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_BUILD.gn index 6a194dad400e..6c7f3d1b7b3e 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_BUILD.gn @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/sandbox/policy/BUILD.gn.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/sandbox/policy/BUILD.gn.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/sandbox/policy/BUILD.gn -@@ -49,7 +49,7 @@ component("policy") { +@@ -50,7 +50,7 @@ component("policy") { "//third_party/jni_zero", ] } @@ -9,7 +9,7 @@ sources += [ "linux/bpf_audio_policy_linux.cc", "linux/bpf_audio_policy_linux.h", -@@ -120,6 +120,27 @@ component("policy") { +@@ -125,6 +125,27 @@ component("policy") { "//sandbox/linux:sandbox_services", "//sandbox/linux:seccomp_bpf", "//sandbox/linux:suid_sandbox_client", diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_features.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_features.cc index 7a1563355551..3f73d86940a2 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_features.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_features.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/sandbox/policy/features.cc.orig 2024-01-30 07:53:34 UTC +--- src/3rdparty/chromium/sandbox/policy/features.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/sandbox/policy/features.cc @@ -20,7 +20,11 @@ namespace sandbox::policy::features { // (Only causes an effect when feature kNetworkServiceInProcess is disabled.) @@ -12,8 +12,8 @@ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) // Enables a fine-grained seccomp-BPF syscall filter for the network service. -@@ -128,7 +132,7 @@ BASE_FEATURE(kForceSpectreVariant2Mitigation, - base::FEATURE_DISABLED_BY_DEFAULT); +@@ -134,7 +138,7 @@ BASE_FEATURE(kSpectreVariant2Mitigation, + base::FEATURE_ENABLED_BY_DEFAULT); #endif // BUILDFLAG(IS_CHROMEOS_ASH) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_features.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_features.h index 0e361f7a5beb..c523f6e18ef0 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_features.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_features.h @@ -1,7 +1,7 @@ ---- src/3rdparty/chromium/sandbox/policy/features.h.orig 2024-01-30 07:53:34 UTC +--- src/3rdparty/chromium/sandbox/policy/features.h.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/sandbox/policy/features.h -@@ -44,7 +44,7 @@ SANDBOX_POLICY_EXPORT BASE_DECLARE_FEATURE(kSpectreVar - SANDBOX_POLICY_EXPORT BASE_DECLARE_FEATURE(kForceSpectreVariant2Mitigation); +@@ -45,7 +45,7 @@ SANDBOX_POLICY_EXPORT BASE_DECLARE_FEATURE( + SANDBOX_POLICY_EXPORT BASE_DECLARE_FEATURE(kSpectreVariant2Mitigation); #endif // BUILDFLAG(IS_CHROMEOS_ASH) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_mojom_sandbox.mojom b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_mojom_sandbox.mojom index 921f2fea6386..1d1c7c43d5a3 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_mojom_sandbox.mojom +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_mojom_sandbox.mojom @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/sandbox/policy/mojom/sandbox.mojom.orig 2023-12-10 06:10:27 UTC +--- src/3rdparty/chromium/sandbox/policy/mojom/sandbox.mojom.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/sandbox/policy/mojom/sandbox.mojom -@@ -77,6 +77,12 @@ enum Sandbox { +@@ -80,6 +80,12 @@ enum Sandbox { [EnableIf=is_fuchsia] kVideoCapture, diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_openbsd_sandbox__openbsd.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_openbsd_sandbox__openbsd.cc index dbc297b8a2ab..3a93e1e4dfe3 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_openbsd_sandbox__openbsd.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_openbsd_sandbox__openbsd.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/sandbox/policy/openbsd/sandbox_openbsd.cc.orig 2023-04-28 17:01:32 UTC +--- src/3rdparty/chromium/sandbox/policy/openbsd/sandbox_openbsd.cc.orig 2024-03-22 08:19:40 UTC +++ src/3rdparty/chromium/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. @@ -63,7 +63,8 @@ + +#include "third_party/boringssl/src/include/openssl/crypto.h" + -+#include "ui/gfx/font_util.h" ++#include ++#include "ui/gfx/linux/fontconfig_util.h" + +#define MAXTOKENS 3 + @@ -146,8 +147,11 @@ + break; + } + case sandbox::mojom::Sandbox::kRenderer: -+ gfx::InitializeFonts(); ++ { ++ FcConfig* config = gfx::GetGlobalFontConfig(); ++ DCHECK(config); + break; ++ } + default: + break; + } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_sandbox.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_sandbox.cc index ae57f59a4132..7d2b91d6704f 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_sandbox.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_sandbox.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/sandbox/policy/sandbox.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/sandbox/policy/sandbox.cc.orig 2024-04-19 13:02:56 UTC +++ src/3rdparty/chromium/sandbox/policy/sandbox.cc @@ -18,6 +18,10 @@ #include "sandbox/policy/linux/sandbox_linux.h" @@ -11,7 +11,7 @@ #if BUILDFLAG(IS_MAC) #include "sandbox/mac/seatbelt.h" #endif // BUILDFLAG(IS_MAC) -@@ -33,7 +37,7 @@ +@@ -32,7 +36,7 @@ namespace sandbox { namespace policy { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_sandbox__type.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_sandbox__type.cc index 551032ad6c21..4a8f5b63b8fb 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_sandbox__type.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_sandbox__type.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/sandbox/policy/sandbox_type.cc.orig 2023-12-10 06:10:27 UTC +--- src/3rdparty/chromium/sandbox/policy/sandbox_type.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/sandbox/policy/sandbox_type.cc @@ -38,7 +38,7 @@ bool IsUnsandboxedSandboxType(Sandbox sandbox_type) { #endif @@ -9,9 +9,9 @@ case Sandbox::kVideoCapture: return false; #endif -@@ -63,7 +63,7 @@ bool IsUnsandboxedSandboxType(Sandbox sandbox_type) { +@@ -62,7 +62,7 @@ bool IsUnsandboxedSandboxType(Sandbox sandbox_type) { + #if BUILDFLAG(IS_MAC) case Sandbox::kMirroring: - case Sandbox::kNaClLoader: #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) @@ -27,7 +27,7 @@ case Sandbox::kZygoteIntermediateSandbox: case Sandbox::kHardwareVideoEncoding: #endif -@@ -130,7 +130,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi +@@ -131,7 +131,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi #endif case Sandbox::kPrintCompositor: case Sandbox::kAudio: @@ -36,7 +36,7 @@ case Sandbox::kVideoCapture: #endif #if BUILDFLAG(IS_WIN) -@@ -141,10 +141,10 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi +@@ -142,10 +142,10 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi case Sandbox::kMediaFoundationCdm: case Sandbox::kWindowsSystemProxyResolver: #endif // BUILDFLAG(IS_WIN) @@ -49,17 +49,17 @@ case Sandbox::kHardwareVideoEncoding: #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -172,7 +172,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi - case Sandbox::kNaClLoader: +@@ -171,7 +171,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi + switches::kServiceSandboxType, + StringFromUtilitySandboxType(sandbox_type)); break; - #endif // BUILDFLAG(IS_MAC) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) case Sandbox::kZygoteIntermediateSandbox: break; #endif -@@ -216,7 +216,7 @@ sandbox::mojom::Sandbox SandboxTypeFromCommandLine( - #endif +@@ -211,7 +211,7 @@ sandbox::mojom::Sandbox SandboxTypeFromCommandLine( + return Sandbox::kUtility; } -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -67,7 +67,7 @@ // Intermediate process gains a sandbox later. if (process_type == switches::kZygoteProcessType) return Sandbox::kZygoteIntermediateSandbox; -@@ -262,7 +262,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb +@@ -259,7 +259,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb return switches::kUtilitySandbox; case Sandbox::kAudio: return switches::kAudioSandbox; @@ -76,7 +76,7 @@ case Sandbox::kVideoCapture: return switches::kVideoCaptureSandbox; #endif -@@ -292,11 +292,11 @@ std::string StringFromUtilitySandboxType(Sandbox sandb +@@ -291,11 +291,11 @@ std::string StringFromUtilitySandboxType(Sandbox sandb case Sandbox::kMirroring: return switches::kMirroringSandbox; #endif @@ -90,19 +90,19 @@ case Sandbox::kHardwareVideoEncoding: return switches::kHardwareVideoEncodingSandbox; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -316,7 +316,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb - #if BUILDFLAG(IS_MAC) - case Sandbox::kNaClLoader: - #endif // BUILDFLAG(IS_MAC) +@@ -314,7 +314,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb + // The following are not utility processes so should not occur. + case Sandbox::kRenderer: + case Sandbox::kGpu: -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) case Sandbox::kZygoteIntermediateSandbox: #endif - NOTREACHED(); -@@ -388,11 +388,11 @@ sandbox::mojom::Sandbox UtilitySandboxTypeFromString( - if (sandbox_string == switches::kScreenAISandbox) - return Sandbox::kScreenAI; - #endif + NOTREACHED_IN_MIGRATION(); +@@ -389,15 +389,15 @@ sandbox::mojom::Sandbox UtilitySandboxTypeFromString( + if (sandbox_string == switches::kVideoEffectsSandbox) { + return Sandbox::kVideoEffects; + } -#if BUILDFLAG(IS_FUCHSIA) +#if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) if (sandbox_string == switches::kVideoCaptureSandbox) @@ -113,3 +113,8 @@ if (sandbox_string == switches::kHardwareVideoDecodingSandbox) return Sandbox::kHardwareVideoDecoding; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + if (sandbox_string == switches::kHardwareVideoEncodingSandbox) + return Sandbox::kHardwareVideoEncoding; + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_switches.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_switches.cc index 97e156d3e29c..d3b968924eb3 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_switches.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_switches.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/sandbox/policy/switches.cc.orig 2023-12-10 06:10:27 UTC +--- src/3rdparty/chromium/sandbox/policy/switches.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/sandbox/policy/switches.cc -@@ -54,10 +54,10 @@ const char kWindowsSystemProxyResolverSandbox[] = "pro +@@ -55,10 +55,10 @@ const char kWindowsSystemProxyResolverSandbox[] = "pro const char kMirroringSandbox[] = "mirroring"; #endif // BUILDFLAG(IS_MAC) @@ -13,7 +13,7 @@ const char kHardwareVideoEncodingSandbox[] = "hardware_video_encoding"; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -96,7 +96,9 @@ const char kGpuSandboxFailuresFatal[] = "gpu-sandbox-f +@@ -98,7 +98,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/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_switches.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_switches.h index 95c85fb8df49..51545368930f 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_switches.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_switches.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/sandbox/policy/switches.h.orig 2023-12-10 06:10:27 UTC +--- src/3rdparty/chromium/sandbox/policy/switches.h.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/sandbox/policy/switches.h -@@ -57,10 +57,10 @@ SANDBOX_POLICY_EXPORT extern const char kWindowsSystem +@@ -58,10 +58,10 @@ SANDBOX_POLICY_EXPORT extern const char kWindowsSystem SANDBOX_POLICY_EXPORT extern const char kMirroringSandbox[]; #endif // BUILDFLAG(IS_MAC) @@ -13,7 +13,7 @@ SANDBOX_POLICY_EXPORT extern const char kHardwareVideoEncodingSandbox[]; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -81,7 +81,8 @@ SANDBOX_POLICY_EXPORT extern const char kDisableSetuid +@@ -83,7 +83,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/qt6-webengine/files/patch-src_3rdparty_chromium_services_audio_audio__sandbox__hook__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_audio_audio__sandbox__hook__linux.cc index c134661979ae..c732be8091ea 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_audio_audio__sandbox__hook__linux.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_audio_audio__sandbox__hook__linux.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/services/audio/audio_sandbox_hook_linux.cc.orig 2024-01-30 07:53:34 UTC +--- src/3rdparty/chromium/services/audio/audio_sandbox_hook_linux.cc.orig 2024-06-17 12:56:06 UTC +++ src/3rdparty/chromium/services/audio/audio_sandbox_hook_linux.cc -@@ -144,6 +144,7 @@ void AddPulseAudioFilePermissions( +@@ -143,6 +143,7 @@ void AddPulseAudioFilePermissions( } #endif @@ -8,7 +8,7 @@ std::vector GetAudioFilePermissions() { std::vector permissions{ BrokerFilePermission::ReadOnly("/dev/urandom"), -@@ -172,10 +173,12 @@ void LoadAudioLibraries() { +@@ -171,10 +172,12 @@ void LoadAudioLibraries() { } } } @@ -21,8 +21,8 @@ LoadAudioLibraries(); auto* instance = sandbox::policy::SandboxLinux::GetInstance(); instance->StartBrokerProcess(MakeBrokerCommandSet({ -@@ -195,6 +198,7 @@ bool AudioPreSandboxHook(sandbox::policy::SandboxLinux - // TODO(https://crbug.com/850878) enable namespace sandbox. Currently, if +@@ -192,6 +195,7 @@ bool AudioPreSandboxHook(sandbox::policy::SandboxLinux + // TODO(crbug.com/40579955) enable namespace sandbox. Currently, if // enabled, connect() on pulse native socket fails with ENOENT (called from // pa_context_connect). +#endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_BUILD.gn index 6fdeb69f0c6f..32ce10fde4b2 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_BUILD.gn @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/services/device/BUILD.gn.orig 2023-11-03 10:09:45 UTC +--- src/3rdparty/chromium/services/device/BUILD.gn.orig 2024-09-30 07:45:04 UTC +++ src/3rdparty/chromium/services/device/BUILD.gn -@@ -13,7 +13,7 @@ if (is_android) { +@@ -15,7 +15,7 @@ if (is_android) { } is_serial_enabled_platform = diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_compute__pressure_cpu__probe.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_compute__pressure_cpu__probe.cc deleted file mode 100644 index 6c073df0dc08..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_compute__pressure_cpu__probe.cc +++ /dev/null @@ -1,10 +0,0 @@ ---- src/3rdparty/chromium/services/device/compute_pressure/cpu_probe.cc.orig 2024-01-30 07:53:34 UTC -+++ src/3rdparty/chromium/services/device/compute_pressure/cpu_probe.cc -@@ -60,6 +60,7 @@ std::unique_ptr 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/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_geolocation_location__arbitrator.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_geolocation_location__arbitrator.cc deleted file mode 100644 index c39999c59ef6..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_geolocation_location__arbitrator.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/services/device/geolocation/location_arbitrator.cc.orig 2024-07-03 01:14:49 UTC -+++ src/3rdparty/chromium/services/device/geolocation/location_arbitrator.cc -@@ -196,7 +196,7 @@ LocationArbitrator::NewSystemLocationProvider() { - - std::unique_ptr - LocationArbitrator::NewSystemLocationProvider() { --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - return nullptr; - #else - return device::NewSystemLocationProvider(main_task_runner_, diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_geolocation_location__provider__manager.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_geolocation_location__provider__manager.cc new file mode 100644 index 000000000000..3fe319a7f706 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_geolocation_location__provider__manager.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/services/device/geolocation/location_provider_manager.cc.orig 2025-02-21 12:29:33 UTC ++++ src/3rdparty/chromium/services/device/geolocation/location_provider_manager.cc +@@ -47,7 +47,7 @@ LocationProviderManager::LocationProviderManager( + #if BUILDFLAG(IS_ANDROID) + // On Android, default to using the platform location provider. + provider_manager_mode_ = LPMM::kPlatformOnly; +-#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // On Ash / Lacros / Linux, default to using the network location provider. + provider_manager_mode_ = LPMM::kNetworkOnly; + #else diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_hid_hid__connection__fido.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_hid_hid__connection__fido.cc index 3fc5d8364bc9..4a94ac3596a9 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_hid_hid__connection__fido.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_hid_hid__connection__fido.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/services/device/hid/hid_connection_fido.cc.orig 2023-03-09 06:31:50 UTC +--- src/3rdparty/chromium/services/device/hid/hid_connection_fido.cc.orig 2024-06-17 12:56:06 UTC +++ src/3rdparty/chromium/services/device/hid/hid_connection_fido.cc @@ -0,0 +1,216 @@ +// Copyright 2014 The Chromium Authors @@ -61,7 +61,7 @@ + base::ScopedBlockingCall scoped_blocking_call( + FROM_HERE, base::BlockingType::MAY_BLOCK); + -+ auto data = buffer->front(); ++ auto data = buffer->data(); + size_t size = buffer->size(); + // if report id is 0, it shouldn't be included + if (data[0] == 0) { @@ -112,7 +112,7 @@ + + auto buffer = + base::MakeRefCounted(report_buffer_size_); -+ uint8_t* data = buffer->front(); ++ uint8_t* data = buffer->as_vector().data(); + size_t length = report_buffer_size_; + if (!has_report_id_) { + // Fido will not prefix the buffer with a report ID if report IDs are not @@ -197,7 +197,7 @@ + DCHECK_GT(device_info()->max_feature_report_size(), 0u); + auto buffer = base::MakeRefCounted( + device_info()->max_feature_report_size() + 1); -+ buffer->data()[0] = report_id; ++ buffer->as_vector().data()[0] = report_id; + + blocking_task_runner_->PostTask( + FROM_HERE, base::BindOnce(&BlockingTaskRunnerHelper::GetFeatureReport, diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_hid_hid__connection__freebsd.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_hid_hid__connection__freebsd.cc index 70bbc4592b92..9f9be9b8cdf6 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_hid_hid__connection__freebsd.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_hid_hid__connection__freebsd.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/services/device/hid/hid_connection_freebsd.cc.orig 2023-04-05 11:05:06 UTC +--- src/3rdparty/chromium/services/device/hid/hid_connection_freebsd.cc.orig 2024-07-30 19:22:51 UTC +++ src/3rdparty/chromium/services/device/hid/hid_connection_freebsd.cc @@ -0,0 +1,240 @@ +// Copyright (c) 2014 The Chromium Authors. All rights reserved. @@ -59,7 +59,7 @@ + base::ScopedBlockingCall scoped_blocking_call( + FROM_HERE, base::BlockingType::MAY_BLOCK); + -+ auto data = buffer->front(); ++ auto data = buffer->as_vector().data(); + size_t size = buffer->size(); + // if report id is 0, it shouldn't be included + if (data[0] == 0) { @@ -86,7 +86,7 @@ + FROM_HERE, base::BlockingType::MAY_BLOCK); + struct usb_gen_descriptor ugd; + ugd.ugd_report_type = UHID_FEATURE_REPORT; -+ ugd.ugd_data = buffer->front(); ++ ugd.ugd_data = buffer->as_vector().data(); + ugd.ugd_maxlen = buffer->size(); + int result = HANDLE_EINTR( + ioctl(fd_.get(), USB_GET_REPORT, &ugd)); @@ -109,14 +109,14 @@ + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); + struct usb_gen_descriptor ugd; + ugd.ugd_report_type = UHID_FEATURE_REPORT; -+ ugd.ugd_data = buffer->front(); ++ ugd.ugd_data = buffer->as_vector().data(); + ugd.ugd_maxlen = buffer->size(); + // FreeBSD does not require report id if it's not used -+ if (buffer->front()[0] == 0) { -+ ugd.ugd_data = buffer->front() + 1; ++ if (buffer->data()[0] == 0) { ++ ugd.ugd_data = buffer->as_vector().data() + 1; + ugd.ugd_maxlen = buffer->size() - 1; + } else { -+ ugd.ugd_data = buffer->front(); ++ ugd.ugd_data = buffer->as_vector().data(); + ugd.ugd_maxlen = buffer->size(); + } + int result = HANDLE_EINTR( @@ -136,7 +136,7 @@ + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); + + scoped_refptr buffer(new base::RefCountedBytes(report_buffer_size_)); -+ unsigned char* data = buffer->front(); ++ unsigned char* data = buffer->as_vector().data(); + size_t length = report_buffer_size_; + if (!has_report_id_) { + // FreeBSD will not prefix the buffer with a report ID if report IDs are not @@ -220,7 +220,7 @@ + scoped_refptr buffer( + new base::RefCountedBytes(device_info()->max_feature_report_size() + 1)); + if (report_id != 0) -+ buffer->data()[0] = report_id; ++ buffer->as_vector().data()[0] = report_id; + + blocking_task_runner_->PostTask( + FROM_HERE, diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_public_mojom_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_public_mojom_BUILD.gn index 88ef09f6821b..63053ad19b9c 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_public_mojom_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_public_mojom_BUILD.gn @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/services/device/public/mojom/BUILD.gn.orig 2023-10-11 18:22:24 UTC +--- src/3rdparty/chromium/services/device/public/mojom/BUILD.gn.orig 2024-09-30 07:45:04 UTC +++ src/3rdparty/chromium/services/device/public/mojom/BUILD.gn -@@ -97,7 +97,7 @@ mojom("device_service") { +@@ -98,7 +98,7 @@ mojom("device_service") { enable_js_fuzzing = false enabled_features = [] diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_serial_serial__device__enumerator.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_serial_serial__device__enumerator.cc index 4551edb6aefa..c09acd084053 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_serial_serial__device__enumerator.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_serial_serial__device__enumerator.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/services/device/serial/serial_device_enumerator.cc.orig 2023-03-09 06:31:50 UTC +--- src/3rdparty/chromium/services/device/serial/serial_device_enumerator.cc.orig 2024-08-26 12:06:38 UTC +++ src/3rdparty/chromium/services/device/serial/serial_device_enumerator.cc -@@ -12,7 +12,7 @@ +@@ -13,7 +13,7 @@ #include "build/build_config.h" #include "components/device_event_log/device_event_log.h" @@ -9,7 +9,7 @@ #include "services/device/serial/serial_device_enumerator_linux.h" #elif BUILDFLAG(IS_MAC) #include "services/device/serial/serial_device_enumerator_mac.h" -@@ -25,7 +25,7 @@ namespace device { +@@ -26,7 +26,7 @@ namespace device { // static std::unique_ptr SerialDeviceEnumerator::Create( scoped_refptr ui_task_runner) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_serial_serial__io__handler__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_serial_serial__io__handler__posix.cc index b3316232bea7..793359fa7134 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_serial_serial__io__handler__posix.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_serial_serial__io__handler__posix.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/services/device/serial/serial_io_handler_posix.cc.orig 2023-03-09 06:31:50 UTC +--- src/3rdparty/chromium/services/device/serial/serial_io_handler_posix.cc.orig 2024-08-26 12:06:38 UTC +++ src/3rdparty/chromium/services/device/serial/serial_io_handler_posix.cc -@@ -68,7 +68,7 @@ bool BitrateToSpeedConstant(int bitrate, speed_t* spee +@@ -73,7 +73,7 @@ bool BitrateToSpeedConstant(int bitrate, speed_t* spee BITRATE_TO_SPEED_CASE(9600) BITRATE_TO_SPEED_CASE(19200) BITRATE_TO_SPEED_CASE(38400) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_time__zone__monitor_time__zone__monitor__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_time__zone__monitor_time__zone__monitor__linux.cc index fce74f22c9bb..58b9299f403d 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_time__zone__monitor_time__zone__monitor__linux.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_time__zone__monitor_time__zone__monitor__linux.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/services/device/time_zone_monitor/time_zone_monitor_linux.cc.orig 2023-09-13 12:11:42 UTC +--- src/3rdparty/chromium/services/device/time_zone_monitor/time_zone_monitor_linux.cc.orig 2024-08-26 12:06:38 UTC +++ src/3rdparty/chromium/services/device/time_zone_monitor/time_zone_monitor_linux.cc -@@ -131,7 +131,11 @@ class TimeZoneMonitorLinuxImpl +@@ -136,7 +136,11 @@ class TimeZoneMonitorLinuxImpl // false positives are harmless, assuming the false positive rate is // reasonable. const char* const kFilesToWatch[] = { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_usb_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_usb_BUILD.gn index 1e2a4eaf1112..636a271e9dfc 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_usb_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_usb_BUILD.gn @@ -1,33 +1,15 @@ ---- src/3rdparty/chromium/services/device/usb/BUILD.gn.orig 2024-01-30 07:53:34 UTC +--- src/3rdparty/chromium/services/device/usb/BUILD.gn.orig 2024-08-26 12:06:38 UTC +++ src/3rdparty/chromium/services/device/usb/BUILD.gn -@@ -92,15 +92,17 @@ static_library("usb") { +@@ -91,7 +91,7 @@ static_library("usb") { deps += [ "//third_party/re2" ] } - if (is_mac) { -- sources += [ -- "usb_device_handle_mac.cc", -- "usb_device_handle_mac.h", -- "usb_device_mac.cc", -- "usb_device_mac.h", -- "usb_service_mac.cc", -- "usb_service_mac.h", -- ] + if (is_mac || is_openbsd) { -+ if (is_mac) { -+ sources += [ -+ "usb_device_handle_mac.cc", -+ "usb_device_handle_mac.h", -+ "usb_device_mac.cc", -+ "usb_device_mac.h", -+ "usb_service_mac.cc", -+ "usb_service_mac.h", -+ ] -+ } - # These sources and deps are required for libusb. - # TODO(https://crbug.com/1096743) Remove these sources. -@@ -124,6 +126,13 @@ static_library("usb") { + # TODO(crbug.com/40136337) Remove these sources. + sources += [ +@@ -114,6 +114,13 @@ static_library("usb") { deps += [ "//third_party/libusb" ] } @@ -41,7 +23,7 @@ if (is_linux || is_chromeos) { sources += [ "usb_device_linux.cc", -@@ -141,7 +150,7 @@ static_library("usb") { +@@ -135,7 +142,7 @@ static_library("usb") { deps += [ "//device/udev_linux" ] } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_usb_usb__service.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_usb_usb__service.cc index 9906616b750b..807d8298aad6 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_usb_usb__service.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_usb_usb__service.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/services/device/usb/usb_service.cc.orig 2022-11-30 08:12:58 UTC +--- src/3rdparty/chromium/services/device/usb/usb_service.cc.orig 2024-08-26 12:06:38 UTC +++ src/3rdparty/chromium/services/device/usb/usb_service.cc -@@ -22,13 +22,17 @@ +@@ -21,12 +21,16 @@ #if BUILDFLAG(IS_ANDROID) #include "services/device/usb/usb_service_android.h" @@ -9,7 +9,6 @@ #include "services/device/usb/usb_service_linux.h" #elif BUILDFLAG(IS_MAC) #include "services/device/usb/usb_service_impl.h" - #include "services/device/usb/usb_service_mac.h" #elif BUILDFLAG(IS_WIN) #include "services/device/usb/usb_service_win.h" +#elif BUILDFLAG(IS_OPENBSD) @@ -19,7 +18,7 @@ #endif namespace device { -@@ -51,7 +55,7 @@ constexpr base::TaskTraits UsbService::kBlockingTaskTr +@@ -49,11 +53,13 @@ constexpr base::TaskTraits UsbService::kBlockingTaskTr std::unique_ptr UsbService::Create() { #if BUILDFLAG(IS_ANDROID) return base::WrapUnique(new UsbServiceAndroid()); @@ -28,12 +27,9 @@ return base::WrapUnique(new UsbServiceLinux()); #elif BUILDFLAG(IS_WIN) return base::WrapUnique(new UsbServiceWin()); -@@ -60,6 +64,8 @@ std::unique_ptr UsbService::Create() { - return base::WrapUnique(new UsbServiceMac()); - else - return base::WrapUnique(new UsbServiceImpl()); -+#elif BUILDFLAG(IS_BSD) + #elif BUILDFLAG(IS_MAC) + return base::WrapUnique(new UsbServiceImpl()); ++#elif BUILDFLAG(IS_BSD) + return base::WrapUnique(new UsbServiceImpl()); #else return nullptr; - #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_network_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_network_BUILD.gn index 36f3c3da4ac1..d45741c257ae 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_network_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_network_BUILD.gn @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/services/network/BUILD.gn.orig 2024-07-03 01:14:49 UTC +--- src/3rdparty/chromium/services/network/BUILD.gn.orig 2025-02-21 12:29:33 UTC +++ src/3rdparty/chromium/services/network/BUILD.gn -@@ -398,7 +398,6 @@ if (is_linux || is_chromeos) { +@@ -396,7 +396,6 @@ if (is_linux || is_chromeos) { ] deps = [ "//base:base", diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_network_network__context.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_network_network__context.cc index a7d29d2a73a1..2fbc5eaf8e1e 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_network_network__context.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_network_network__context.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/services/network/network_context.cc.orig 2024-07-03 01:14:49 UTC +--- src/3rdparty/chromium/services/network/network_context.cc.orig 2025-02-21 12:29:33 UTC +++ src/3rdparty/chromium/services/network/network_context.cc -@@ -522,7 +522,7 @@ NetworkContext::NetworkContextHttpAuthPreferences:: +@@ -588,7 +588,7 @@ NetworkContext::NetworkContextHttpAuthPreferences:: NetworkContext::NetworkContextHttpAuthPreferences:: ~NetworkContextHttpAuthPreferences() = default; @@ -9,7 +9,7 @@ bool NetworkContext::NetworkContextHttpAuthPreferences::AllowGssapiLibraryLoad() const { if (network_service_) { -@@ -2281,7 +2281,7 @@ void NetworkContext::OnHttpAuthDynamicParamsChanged( +@@ -2449,7 +2449,7 @@ void NetworkContext::OnHttpAuthDynamicParamsChanged( http_auth_dynamic_network_service_params->android_negotiate_account_type); #endif // BUILDFLAG(IS_ANDROID) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_network_network__context.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_network_network__context.h index 666e6f4dbdd1..45dbfa6bf2ea 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_network_network__context.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_network_network__context.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/services/network/network_context.h.orig 2024-07-03 01:14:49 UTC +--- src/3rdparty/chromium/services/network/network_context.h.orig 2025-02-21 12:29:33 UTC +++ src/3rdparty/chromium/services/network/network_context.h -@@ -664,7 +664,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext +@@ -698,7 +698,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext public: explicit NetworkContextHttpAuthPreferences(NetworkService* network_service); ~NetworkContextHttpAuthPreferences() override; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_network_network__sandbox__hook__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_network_network__sandbox__hook__linux.cc index a7e1ceef53df..95be23ab04f5 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_network_network__sandbox__hook__linux.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_network_network__sandbox__hook__linux.cc @@ -1,8 +1,8 @@ ---- src/3rdparty/chromium/services/network/network_sandbox_hook_linux.cc.orig 2023-05-31 08:12:17 UTC +--- src/3rdparty/chromium/services/network/network_sandbox_hook_linux.cc.orig 2024-04-19 13:02:56 UTC +++ src/3rdparty/chromium/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; @@ -15,7 +15,7 @@ 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) @@ -27,10 +27,10 @@ #if BUILDFLAG(IS_CHROMEOS) LoadNetworkLibraries(); #endif -@@ -117,6 +122,7 @@ bool NetworkPreSandboxHook(std::vector ne +@@ -118,6 +123,7 @@ bool NetworkPreSandboxHook(std::vector ne GetNetworkBrokerCommandSet(), GetNetworkFilePermissions(std::move(network_context_parent_dirs)), - sandbox::policy::SandboxLinux::PreSandboxHook(), options); + options); +#endif return true; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_network_network__service.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_network_network__service.cc index 5b0945b293e5..44337a2e14df 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_network_network__service.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_network_network__service.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/services/network/network_service.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/services/network/network_service.cc.orig 2024-09-30 07:45:04 UTC +++ src/3rdparty/chromium/services/network/network_service.cc -@@ -96,7 +96,7 @@ +@@ -99,7 +99,7 @@ #include "third_party/boringssl/src/include/openssl/cpu.h" #endif @@ -9,7 +9,7 @@ BUILDFLAG(IS_CHROMEOS_LACROS) #include "components/os_crypt/sync/key_storage_config_linux.h" -@@ -963,7 +963,7 @@ void NetworkService::SetExplicitlyAllowedPorts( +@@ -977,7 +977,7 @@ void NetworkService::SetExplicitlyAllowedPorts( net::SetExplicitlyAllowedPorts(ports); } @@ -18,7 +18,7 @@ void NetworkService::SetGssapiLibraryLoadObserver( mojo::PendingRemote gssapi_library_load_observer) { -@@ -1045,7 +1045,7 @@ NetworkService::CreateHttpAuthHandlerFactory(NetworkCo +@@ -1059,7 +1059,7 @@ NetworkService::CreateHttpAuthHandlerFactory(NetworkCo ); } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_network_network__service.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_network_network__service.h index 74d5f0f72166..5de70e9a3f5d 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_network_network__service.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_network_network__service.h @@ -1,15 +1,15 @@ ---- src/3rdparty/chromium/services/network/network_service.h.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/services/network/network_service.h.orig 2024-09-30 07:45:04 UTC +++ src/3rdparty/chromium/services/network/network_service.h -@@ -221,7 +221,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService - mojo::PendingReceiver receiver) override; - void SetFirstPartySets(net::GlobalFirstPartySets sets) override; +@@ -238,7 +238,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService + const std::vector& settings) override; + void SetExplicitlyAllowedPorts(const std::vector& ports) override; -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) void SetGssapiLibraryLoadObserver( mojo::PendingRemote gssapi_library_load_observer) override; -@@ -247,7 +247,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService +@@ -264,7 +264,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService std::unique_ptr CreateHttpAuthHandlerFactory( NetworkContext* network_context); @@ -18,7 +18,7 @@ // This is called just before a GSSAPI library may be loaded. void OnBeforeGssapiLibraryLoad(); #endif // BUILDFLAG(IS_LINUX) -@@ -477,7 +477,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService +@@ -498,7 +498,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService // leaking stale listeners between tests. std::unique_ptr mock_network_change_notifier_; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_network_public_cpp_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_network_public_cpp_BUILD.gn index 131360c68cf3..826912e27504 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_network_public_cpp_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_network_public_cpp_BUILD.gn @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/services/network/public/cpp/BUILD.gn.orig 2024-07-03 01:14:49 UTC +--- src/3rdparty/chromium/services/network/public/cpp/BUILD.gn.orig 2025-02-21 12:29:33 UTC +++ src/3rdparty/chromium/services/network/public/cpp/BUILD.gn -@@ -494,7 +494,7 @@ jumbo_component("cpp_base") { +@@ -487,7 +487,7 @@ jumbo_component("cpp_base") { sources += [ "transferable_directory_fuchsia.cc" ] } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_network_public_cpp_features.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_network_public_cpp_features.cc index 196948275380..160182fc07fb 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_network_public_cpp_features.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_network_public_cpp_features.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/services/network/public/cpp/features.cc.orig 2024-07-03 01:14:49 UTC +--- src/3rdparty/chromium/services/network/public/cpp/features.cc.orig 2025-02-21 12:29:33 UTC +++ src/3rdparty/chromium/services/network/public/cpp/features.cc -@@ -96,7 +96,7 @@ BASE_FEATURE(kSplitAuthCacheByNetworkIsolationKey, +@@ -125,7 +125,7 @@ BASE_FEATURE(kSplitAuthCacheByNetworkIsolationKey, // Enable usage of hardcoded DoH upgrade mapping for use in automatic mode. #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_network_public_mojom_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_network_public_mojom_BUILD.gn index a511e1437713..fea257947fb2 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_network_public_mojom_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_network_public_mojom_BUILD.gn @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/services/network/public/mojom/BUILD.gn.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/services/network/public/mojom/BUILD.gn.orig 2024-08-26 12:06:38 UTC +++ src/3rdparty/chromium/services/network/public/mojom/BUILD.gn -@@ -522,11 +522,11 @@ mojom("url_loader_base") { +@@ -493,11 +493,11 @@ mojom("url_loader_base") { } enabled_features = [] @@ -11,15 +11,15 @@ - if (is_linux) { + if (is_linux && !is_bsd) { - # TODO(crbug.com/1431866): Remove this once is_linux in the mojom IDL does + # TODO(crbug.com/40263697): Remove this once is_linux in the mojom IDL does # not include lacros. enabled_features += [ "use_network_interface_change_listener" ] -@@ -1443,7 +1443,7 @@ mojom("mojom") { +@@ -1490,7 +1490,7 @@ mojom("mojom") { } } - if (is_linux) { + if (is_linux && !is_bsd) { - # TODO(crbug.com/1431866): Remove this once is_linux in the mojom IDL does + # TODO(crbug.com/40263697): Remove this once is_linux in the mojom IDL does # not include lacros. enabled_features += [ "use_network_interface_change_listener" ] diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_on__device__model_on__device__model__service.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_on__device__model_on__device__model__service.h new file mode 100644 index 000000000000..a428345de78a --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_on__device__model_on__device__model__service.h @@ -0,0 +1,22 @@ +--- src/3rdparty/chromium/services/on_device_model/on_device_model_service.h.orig 2024-10-22 08:31:56 UTC ++++ src/3rdparty/chromium/services/on_device_model/on_device_model_service.h +@@ -27,6 +27,10 @@ namespace ml { + class OnDeviceModelInternalImpl; + } + ++#if BUILDFLAG(IS_BSD) ++#include "sandbox/policy/sandbox.h" ++#endif ++ + namespace on_device_model { + + class COMPONENT_EXPORT(ON_DEVICE_MODEL) OnDeviceModelService +@@ -40,7 +44,7 @@ class COMPONENT_EXPORT(ON_DEVICE_MODEL) OnDeviceModelS + // Must be called in the service's process after the run loop finished. + [[nodiscard]] static bool Shutdown(); + +-#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/qt6-webengine/files/patch-src_3rdparty_chromium_services_on__device__model_pre__sandbox__init.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_on__device__model_pre__sandbox__init.cc new file mode 100644 index 000000000000..0b54ae82bdc7 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_on__device__model_pre__sandbox__init.cc @@ -0,0 +1,38 @@ +--- src/3rdparty/chromium/services/on_device_model/pre_sandbox_init.cc.orig 2024-08-26 12:06:38 UTC ++++ src/3rdparty/chromium/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. +@@ -101,7 +101,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/qt6-webengine/files/patch-src_3rdparty_chromium_services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics.h index 999dacdfcd3d..3ea8ab7c24ed 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h.orig 2022-02-28 16:54:41 UTC +--- src/3rdparty/chromium/services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h.orig 2024-08-26 12:06:38 UTC +++ src/3rdparty/chromium/services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h -@@ -45,7 +45,7 @@ class COMPONENT_EXPORT( +@@ -53,7 +53,7 @@ class COMPONENT_EXPORT( mojom::RawOSMemDump*); static std::vector GetProcessMemoryMaps(base::ProcessId); @@ -9,7 +9,7 @@ static void SetProcSmapsForTesting(FILE*); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || // BUILDFLAG(IS_ANDROID) -@@ -62,7 +62,7 @@ class COMPONENT_EXPORT( +@@ -70,7 +70,7 @@ class COMPONENT_EXPORT( static std::vector GetProcessModules(base::ProcessId); #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_screen__ai_public_cpp_utilities.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_screen__ai_public_cpp_utilities.cc new file mode 100644 index 000000000000..b66eb358c5ba --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_screen__ai_public_cpp_utilities.cc @@ -0,0 +1,29 @@ +--- src/3rdparty/chromium/services/screen_ai/public/cpp/utilities.cc.orig 2024-08-26 12:06:38 UTC ++++ src/3rdparty/chromium/services/screen_ai/public/cpp/utilities.cc +@@ -18,7 +18,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 + +@@ -39,7 +39,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) +@@ -128,7 +128,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/qt6-webengine/files/patch-src_3rdparty_chromium_services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.cc new file mode 100644 index 000000000000..126f71bfe8e7 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.cc @@ -0,0 +1,18 @@ +--- src/3rdparty/chromium/services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.cc.orig 2024-04-19 13:02:56 UTC ++++ src/3rdparty/chromium/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 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/qt6-webengine/files/patch-src_3rdparty_chromium_services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.h new file mode 100644 index 000000000000..985a342673c6 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.h @@ -0,0 +1,16 @@ +--- src/3rdparty/chromium/services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.h.orig 2024-04-19 13:02:56 UTC ++++ src/3rdparty/chromium/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/qt6-webengine/files/patch-src_3rdparty_chromium_services_service__manager_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_service__manager_BUILD.gn index 0b9fccf625a5..32b4fda43d97 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_service__manager_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_service__manager_BUILD.gn @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/services/service_manager/BUILD.gn.orig 2021-12-31 00:57:38 UTC +--- src/3rdparty/chromium/services/service_manager/BUILD.gn.orig 2024-05-21 18:07:39 UTC +++ src/3rdparty/chromium/services/service_manager/BUILD.gn -@@ -67,7 +67,7 @@ source_set("service_manager") { +@@ -66,7 +66,7 @@ source_set("service_manager") { ] } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_tracing_public_cpp_stack__sampling_tracing__sampler__profiler.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_tracing_public_cpp_stack__sampling_tracing__sampler__profiler.cc index 271741477e28..85aa5ae439e0 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_tracing_public_cpp_stack__sampling_tracing__sampler__profiler.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_tracing_public_cpp_stack__sampling_tracing__sampler__profiler.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/services/tracing/public/cpp/stack_sampling/tracing_sampler_profiler.cc.orig 2024-07-03 01:14:49 UTC +--- src/3rdparty/chromium/services/tracing/public/cpp/stack_sampling/tracing_sampler_profiler.cc.orig 2025-02-21 12:29:33 UTC +++ src/3rdparty/chromium/services/tracing/public/cpp/stack_sampling/tracing_sampler_profiler.cc @@ -40,7 +40,7 @@ #include "third_party/perfetto/protos/perfetto/trace/track_event/process_descriptor.pbzero.h" diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_video__capture_video__capture__service__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_video__capture_video__capture__service__impl.cc index 2e039f39354c..ed4420119eca 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_video__capture_video__capture__service__impl.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_video__capture_video__capture__service__impl.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/services/video_capture/video_capture_service_impl.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/services/video_capture/video_capture_service_impl.cc.orig 2024-09-30 07:45:04 UTC +++ src/3rdparty/chromium/services/video_capture/video_capture_service_impl.cc -@@ -41,7 +41,7 @@ +@@ -42,7 +42,7 @@ #include "services/video_capture/lacros/device_factory_adapter_lacros.h" #endif // BUILDFLAG(IS_CHROMEOS_LACROS) @@ -9,7 +9,7 @@ #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" -@@ -109,7 +109,7 @@ class VideoCaptureServiceImpl::GpuDependenciesContext +@@ -110,7 +110,7 @@ class VideoCaptureServiceImpl::GpuDependenciesContext this}; }; @@ -18,7 +18,7 @@ // 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 -@@ -307,7 +307,7 @@ void VideoCaptureServiceImpl::LazyInitializeGpuDepende +@@ -337,7 +337,7 @@ void VideoCaptureServiceImpl::LazyInitializeGpuDepende gpu_dependencies_context_ = std::make_unique(); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) @@ -27,7 +27,7 @@ { #else if (switches::IsVideoCaptureUseGpuMemoryBufferEnabled()) { -@@ -421,7 +421,7 @@ void VideoCaptureServiceImpl::OnGpuInfoUpdate(const CH +@@ -469,7 +469,7 @@ void VideoCaptureServiceImpl::OnGpuInfoUpdate(const CH } #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_video__capture_video__capture__service__impl.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_video__capture_video__capture__service__impl.h index d3abfdc0f686..2bc8b36132ab 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_video__capture_video__capture__service__impl.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_video__capture_video__capture__service__impl.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/services/video_capture/video_capture_service_impl.h.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/services/video_capture/video_capture_service_impl.h.orig 2024-08-26 12:06:38 UTC +++ src/3rdparty/chromium/services/video_capture/video_capture_service_impl.h -@@ -26,7 +26,7 @@ +@@ -27,7 +27,7 @@ #include "services/video_capture/ash/video_capture_device_factory_ash.h" #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -9,7 +9,7 @@ #include "services/viz/public/cpp/gpu/gpu.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || // BUILDFLAG(IS_CHROMEOS_ASH) -@@ -70,7 +70,7 @@ class VideoCaptureServiceImpl : public mojom::VideoCap +@@ -75,7 +75,7 @@ class VideoCaptureServiceImpl : public mojom::VideoCap #if BUILDFLAG(IS_WIN) void OnGpuInfoUpdate(const CHROME_LUID& luid) override; #endif @@ -18,7 +18,7 @@ void SetVizGpu(std::unique_ptr viz_gpu); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || // BUILDFLAG(IS_CHROMEOS_ASH) -@@ -107,7 +107,7 @@ class VideoCaptureServiceImpl : public mojom::VideoCap +@@ -120,7 +120,7 @@ class VideoCaptureServiceImpl : public mojom::VideoCap factory_receivers_ash_; #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_skia_ext_SkMemory__new__handler.cpp b/www/qt6-webengine/files/patch-src_3rdparty_chromium_skia_ext_SkMemory__new__handler.cpp index 151e9652875e..d9c9d98ae567 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_skia_ext_SkMemory__new__handler.cpp +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_skia_ext_SkMemory__new__handler.cpp @@ -1,6 +1,15 @@ ---- src/3rdparty/chromium/skia/ext/SkMemory_new_handler.cpp.orig 2023-04-28 17:01:32 UTC +--- src/3rdparty/chromium/skia/ext/SkMemory_new_handler.cpp.orig 2024-06-17 12:56:06 UTC +++ src/3rdparty/chromium/skia/ext/SkMemory_new_handler.cpp -@@ -86,7 +86,7 @@ static void* malloc_nothrow(size_t size) { +@@ -19,7 +19,7 @@ + #include + #elif BUILDFLAG(IS_APPLE) + #include +-#else ++#elif !BUILDFLAG(IS_BSD) + #include + #endif + +@@ -105,7 +105,7 @@ static void* malloc_nothrow(size_t size, int debug_sen // TODO(b.kelemen): we should always use UncheckedMalloc but currently it // doesn't work as intended everywhere. void* result; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_skia_ext_skcolorspace__trfn.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_skia_ext_skcolorspace__trfn.cc index cb22466885c4..45fa8f9b2a66 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_skia_ext_skcolorspace__trfn.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_skia_ext_skcolorspace__trfn.cc @@ -1,8 +1,8 @@ ---- src/3rdparty/chromium/skia/ext/skcolorspace_trfn.cc.orig 2023-08-17 07:33:31 UTC +--- src/3rdparty/chromium/skia/ext/skcolorspace_trfn.cc.orig 2024-08-26 12:06:38 UTC +++ src/3rdparty/chromium/skia/ext/skcolorspace_trfn.cc -@@ -2,6 +2,8 @@ - // Use of this source code is governed by a BSD-style license that can be - // found in the LICENSE file. +@@ -7,6 +7,8 @@ + #pragma allow_unsafe_buffers + #endif +#include + diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_abseil-cpp_absl_base_config.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_abseil-cpp_absl_base_config.h index f34a7506e942..745476e8c487 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_abseil-cpp_absl_base_config.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_abseil-cpp_absl_base_config.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/abseil-cpp/absl/base/config.h.orig 2023-10-11 18:22:24 UTC +--- src/3rdparty/chromium/third_party/abseil-cpp/absl/base/config.h.orig 2024-07-30 11:12:21 UTC +++ src/3rdparty/chromium/third_party/abseil-cpp/absl/base/config.h -@@ -450,7 +450,7 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != +@@ -412,7 +412,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__) || \ @@ -9,7 +9,7 @@ #define ABSL_HAVE_SCHED_YIELD 1 #endif -@@ -465,7 +465,8 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != +@@ -427,7 +427,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/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_abseil-cpp_absl_base_internal_sysinfo.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_abseil-cpp_absl_base_internal_sysinfo.cc index fae0adce0e08..a2dfb2712dcb 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_abseil-cpp_absl_base_internal_sysinfo.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_abseil-cpp_absl_base_internal_sysinfo.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/abseil-cpp/absl/base/internal/sysinfo.cc.orig 2023-11-03 10:09:45 UTC +--- src/3rdparty/chromium/third_party/abseil-cpp/absl/base/internal/sysinfo.cc.orig 2024-09-30 07:45:04 UTC +++ src/3rdparty/chromium/third_party/abseil-cpp/absl/base/internal/sysinfo.cc @@ -30,7 +30,7 @@ #include @@ -9,7 +9,7 @@ #include #endif -@@ -194,6 +194,7 @@ static double GetNominalCPUFrequency() { +@@ -198,6 +198,7 @@ static double GetNominalCPUFrequency() { #else @@ -17,7 +17,7 @@ // 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) { -@@ -226,6 +227,7 @@ static bool ReadLongFromFile(const char *file, long *v +@@ -230,6 +231,7 @@ static bool ReadLongFromFile(const char *file, long *v } return ret; } @@ -25,7 +25,7 @@ #if defined(ABSL_INTERNAL_UNSCALED_CYCLECLOCK_FREQUENCY_IS_CPU_FREQUENCY) -@@ -325,9 +327,11 @@ static double GetNominalCPUFrequency() { +@@ -329,9 +331,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. @@ -37,7 +37,7 @@ #if defined(ABSL_INTERNAL_UNSCALED_CYCLECLOCK_FREQUENCY_IS_CPU_FREQUENCY) // On these platforms, the TSC frequency is the nominal CPU -@@ -346,10 +350,12 @@ static double GetNominalCPUFrequency() { +@@ -350,10 +354,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. @@ -50,7 +50,7 @@ return 1.0; #endif // !ABSL_INTERNAL_UNSCALED_CYCLECLOCK_FREQUENCY_IS_CPU_FREQUENCY -@@ -459,6 +465,12 @@ pid_t GetTID() { +@@ -463,6 +469,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(thread); @@ -62,4 +62,4 @@ + return getthrid(); } - #else + #elif defined(__Fuchsia__) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.h index d375d14c6dbe..969ad360846d 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.h.orig 2023-09-13 12:11:42 UTC +--- src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.h.orig 2024-08-26 12:06:38 UTC +++ src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.h -@@ -34,7 +34,7 @@ +@@ -35,7 +35,7 @@ #if defined(__ELF__) && !defined(__OpenBSD__) && !defined(__QNX__) && \ !defined(__native_client__) && !defined(__asmjs__) && \ !defined(__wasm__) && !defined(__HAIKU__) && !defined(__sun) && \ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_BUILD.gn index 55ae4d32736f..ecd4d8a98907 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_BUILD.gn @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/angle/BUILD.gn.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/third_party/angle/BUILD.gn.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/third_party/angle/BUILD.gn -@@ -316,7 +316,6 @@ config("extra_warnings") { +@@ -354,7 +354,6 @@ config("extra_warnings") { "-Wtautological-type-limit-compare", "-Wundefined-reinterpret-cast", "-Wunneeded-internal-declaration", @@ -8,7 +8,7 @@ "-Wsuggest-destructor-override", "-Wsuggest-override", -@@ -487,7 +486,7 @@ template("angle_common_lib") { +@@ -531,7 +530,7 @@ template("angle_common_lib") { all_dependent_configs = [ ":angle_disable_pool_alloc" ] } @@ -17,7 +17,7 @@ libs = [ "dl" ] } -@@ -642,6 +641,9 @@ angle_static_library("angle_gpu_info_util") { +@@ -686,6 +685,9 @@ angle_static_library("angle_gpu_info_util") { "Xi", "Xext", ] diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_libANGLE_Display.cpp b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_libANGLE_Display.cpp index 602c9cf64f18..ecb06b04e34e 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_libANGLE_Display.cpp +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_libANGLE_Display.cpp @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/angle/src/libANGLE/Display.cpp.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/third_party/angle/src/libANGLE/Display.cpp.orig 2024-08-26 12:06:38 UTC +++ src/3rdparty/chromium/third_party/angle/src/libANGLE/Display.cpp @@ -60,7 +60,7 @@ # include "libANGLE/renderer/gl/cgl/DisplayCGL.h" @@ -8,8 +8,8 @@ +# 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" -@@ -408,7 +408,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di + # include "libANGLE/renderer/gl/glx/DisplayGLX_api.h" +@@ -416,7 +416,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di impl = new rx::DisplayEAGL(state); break; @@ -18,7 +18,7 @@ # if defined(ANGLE_USE_GBM) if (platformType == 0) { -@@ -454,7 +454,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di +@@ -462,7 +462,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di #if defined(ANGLE_ENABLE_OPENGL) # if defined(ANGLE_PLATFORM_WINDOWS) impl = new rx::DisplayWGL(state); @@ -27,7 +27,7 @@ # if defined(ANGLE_USE_GBM) if (platformType == 0) { -@@ -505,7 +505,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di +@@ -513,7 +513,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di impl = rx::CreateVulkanWin32Display(state); } break; @@ -36,7 +36,7 @@ # if defined(ANGLE_USE_GBM) if (platformType == EGL_PLATFORM_GBM_KHR && rx::IsVulkanGbmDisplayAvailable()) { -@@ -2130,7 +2130,7 @@ static ClientExtensions GenerateClientExtensions() +@@ -2158,7 +2158,7 @@ static ClientExtensions GenerateClientExtensions() extensions.x11Visual = true; #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_common_renderer__preferences_renderer__preferences__mojom__traits.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_common_renderer__preferences_renderer__preferences__mojom__traits.cc index a2b5ecdf3ba6..49f53952a6be 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_common_renderer__preferences_renderer__preferences__mojom__traits.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_common_renderer__preferences_renderer__preferences__mojom__traits.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/blink/common/renderer_preferences/renderer_preferences_mojom_traits.cc.orig 2024-01-30 07:53:34 UTC +--- src/3rdparty/chromium/third_party/blink/common/renderer_preferences/renderer_preferences_mojom_traits.cc.orig 2024-04-19 13:02:56 UTC +++ src/3rdparty/chromium/third_party/blink/common/renderer_preferences/renderer_preferences_mojom_traits.cc -@@ -63,7 +63,7 @@ bool StructTraitssend_subresource_notification = data.send_subresource_notification(); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_public_common_renderer__preferences_renderer__preferences.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_public_common_renderer__preferences_renderer__preferences.h index c39c8a0ee8c8..3f6ec828bb87 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_public_common_renderer__preferences_renderer__preferences.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_public_common_renderer__preferences_renderer__preferences.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/blink/public/common/renderer_preferences/renderer_preferences.h.orig 2024-01-30 07:53:34 UTC +--- src/3rdparty/chromium/third_party/blink/public/common/renderer_preferences/renderer_preferences.h.orig 2024-03-22 08:19:40 UTC +++ src/3rdparty/chromium/third_party/blink/public/common/renderer_preferences/renderer_preferences.h -@@ -63,7 +63,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/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_public_common_renderer__preferences_renderer__preferences__mojom__traits.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_public_common_renderer__preferences_renderer__preferences__mojom__traits.h index 2c5c0c7f20d3..e9a5dd8c61a1 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_public_common_renderer__preferences_renderer__preferences__mojom__traits.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_public_common_renderer__preferences_renderer__preferences__mojom__traits.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/blink/public/common/renderer_preferences/renderer_preferences_mojom_traits.h.orig 2024-01-30 07:53:34 UTC +--- src/3rdparty/chromium/third_party/blink/public/common/renderer_preferences/renderer_preferences_mojom_traits.h.orig 2024-04-19 13:02:56 UTC +++ src/3rdparty/chromium/third_party/blink/public/common/renderer_preferences/renderer_preferences_mojom_traits.h -@@ -157,7 +157,7 @@ struct BLINK_COMMON_EXPORT +@@ -166,7 +166,7 @@ struct BLINK_COMMON_EXPORT return data.send_subresource_notification; } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_public_platform_platform.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_public_platform_platform.h index b48b0cfcd87f..2e0641b0c551 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_public_platform_platform.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_public_platform_platform.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/blink/public/platform/platform.h.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/third_party/blink/public/platform/platform.h.orig 2025-02-21 12:29:33 UTC +++ src/3rdparty/chromium/third_party/blink/public/platform/platform.h -@@ -348,7 +348,7 @@ class BLINK_PLATFORM_EXPORT Platform { +@@ -370,7 +370,7 @@ class BLINK_PLATFORM_EXPORT Platform { return nullptr; } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_public_platform_web__vector.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_public_platform_web__vector.h index b2ec059fddaf..bc01db713d78 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_public_platform_web__vector.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_public_platform_web__vector.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/blink/public/platform/web_vector.h.orig 2024-01-30 07:53:34 UTC +--- src/3rdparty/chromium/third_party/blink/public/platform/web_vector.h.orig 2024-08-26 12:06:38 UTC +++ src/3rdparty/chromium/third_party/blink/public/platform/web_vector.h -@@ -86,7 +86,7 @@ class WebVector { +@@ -91,7 +91,7 @@ class WebVector { // The vector can be populated using reserve() and emplace_back(). WebVector() = default; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_bind__gen_style__format.py b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_bind__gen_style__format.py index dabfca29a684..a548ea147052 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_bind__gen_style__format.py +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_bind__gen_style__format.py @@ -1,9 +1,9 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/style_format.py.orig 2022-02-07 13:39:41 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/style_format.py.orig 2024-06-17 12:56:06 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/style_format.py -@@ -28,7 +28,7 @@ def init(root_src_dir, enable_style_format=True): - root_src_dir = os.path.abspath(root_src_dir) +@@ -30,7 +30,7 @@ def init(root_src_dir, enable_style_format=True): # Determine //buildtools// directory + new_path_platform_suffix = "" - if sys.platform.startswith("linux"): + if sys.platform.startswith(("linux","openbsd","freebsd")): platform = "linux64" diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_controller_blink__initializer.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_controller_blink__initializer.cc index 6d33af403262..dba203017d9f 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_controller_blink__initializer.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_controller_blink__initializer.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/controller/blink_initializer.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/controller/blink_initializer.cc.orig 2024-06-17 12:56:06 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/controller/blink_initializer.cc -@@ -75,12 +75,12 @@ +@@ -81,12 +81,12 @@ #include "third_party/blink/renderer/controller/private_memory_footprint_provider.h" #endif @@ -15,7 +15,7 @@ #include "third_party/blink/renderer/controller/highest_pmf_reporter.h" #include "third_party/blink/renderer/controller/user_level_memory_pressure_signal_generator.h" #endif -@@ -247,7 +247,7 @@ void BlinkInitializer::RegisterInterfaces(mojo::Binder +@@ -256,7 +256,7 @@ void BlinkInitializer::RegisterInterfaces(mojo::Binder main_thread_task_runner); #endif @@ -24,7 +24,7 @@ binders.Add( ConvertToBaseRepeatingCallback( CrossThreadBindRepeating(&MemoryUsageMonitorPosix::Bind)), -@@ -286,7 +286,7 @@ void BlinkInitializer::RegisterMemoryWatchers(Platform +@@ -303,7 +303,7 @@ void BlinkInitializer::RegisterMemoryWatchers(Platform #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_controller_memory__usage__monitor__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_controller_memory__usage__monitor__posix.cc index 4fcc364618f1..b24d6a9bda56 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_controller_memory__usage__monitor__posix.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_controller_memory__usage__monitor__posix.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/controller/memory_usage_monitor_posix.cc.orig 2023-09-13 12:11:42 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/controller/memory_usage_monitor_posix.cc.orig 2024-08-26 12:06:38 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/controller/memory_usage_monitor_posix.cc -@@ -128,15 +128,17 @@ void MemoryUsageMonitorPosix::ResetFileDescriptors() { +@@ -133,15 +133,17 @@ void MemoryUsageMonitorPosix::ResetFileDescriptors() { void MemoryUsageMonitorPosix::SetProcFiles(base::File statm_file, base::File status_file) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_editing_editing__behavior.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_editing_editing__behavior.cc index 587e00a13f61..4906368f37f7 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_editing_editing__behavior.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_editing_editing__behavior.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/core/editing/editing_behavior.cc.orig 2023-12-10 06:10:27 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/core/editing/editing_behavior.cc.orig 2024-08-26 12:06:38 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/core/editing/editing_behavior.cc -@@ -324,7 +324,7 @@ bool EditingBehavior::ShouldInsertCharacter(const Keyb +@@ -304,7 +304,7 @@ bool EditingBehavior::ShouldInsertCharacter(const Keyb // unexpected behaviour if (ch < ' ') return false; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_exported_web__view__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_exported_web__view__impl.cc index 4028efcb2c17..4fd783141565 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_exported_web__view__impl.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_exported_web__view__impl.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/core/exported/web_view_impl.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/core/exported/web_view_impl.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/core/exported/web_view_impl.cc -@@ -425,7 +425,7 @@ SkFontHinting RendererPreferencesToSkiaHinting( +@@ -428,7 +428,7 @@ SkFontHinting RendererPreferencesToSkiaHinting( const blink::RendererPreferences& prefs) { // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. @@ -9,7 +9,7 @@ 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' -@@ -3368,7 +3368,7 @@ void WebViewImpl::UpdateFontRenderingFromRendererPrefs +@@ -3413,7 +3413,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/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_frame_web__frame__test.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_frame_web__frame__test.cc index ea1ace0a7a61..b84b2245213d 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_frame_web__frame__test.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_frame_web__frame__test.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/core/frame/web_frame_test.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/core/frame/web_frame_test.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/core/frame/web_frame_test.cc -@@ -6468,7 +6468,7 @@ TEST_F(WebFrameTest, DISABLED_PositionForPointTest) { +@@ -6478,7 +6478,7 @@ TEST_F(WebFrameTest, DISABLED_PositionForPointTest) { } #if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ // 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 \ -@@ -6877,7 +6877,7 @@ TEST_F(CompositedSelectionBoundsTest, LargeSelectionSc +@@ -6887,7 +6887,7 @@ TEST_F(CompositedSelectionBoundsTest, LargeSelectionSc TEST_F(CompositedSelectionBoundsTest, LargeSelectionNoScroll) { RunTest("composited_selection_bounds_large_selection_noscroll.html"); } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc index 2a4596a43aaf..55d498b0aab7 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc.orig 2024-01-30 07:53:34 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc.orig 2024-08-26 12:06:38 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc -@@ -50,7 +50,7 @@ constexpr base::TimeDelta kEncodeRowSlackBeforeDeadlin +@@ -55,7 +55,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/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_layout_layout__view.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_layout_layout__view.cc index a97aab33c2e7..6a9b53131365 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_layout_layout__view.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_layout_layout__view.cc @@ -1,15 +1,15 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/core/layout/layout_view.cc.orig 2024-01-30 07:53:34 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/core/layout/layout_view.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/core/layout/layout_view.cc -@@ -72,7 +72,7 @@ +@@ -73,7 +73,7 @@ + #include "ui/display/screen_info.h" #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 -@@ -813,7 +813,7 @@ void LayoutView::UpdateLayout() { +@@ -776,7 +776,7 @@ void LayoutView::LayoutRoot() { intrinsic_logical_widths_ = LogicalWidth(); } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_paint_paint__layer.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_paint_paint__layer.cc index 34f6be1b4543..32bd76858040 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_paint_paint__layer.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_paint_paint__layer.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/core/paint/paint_layer.cc.orig 2023-11-03 10:09:45 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/core/paint/paint_layer.cc.orig 2024-08-26 12:06:38 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/core/paint/paint_layer.cc @@ -120,7 +120,7 @@ namespace blink { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc index 7460bb6ef92d..954c9e28712c 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc.orig 2024-09-30 07:45:04 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc -@@ -150,7 +150,7 @@ bool ScrollbarThemeAura::SupportsDragSnapBack() const +@@ -148,7 +148,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. @@ -9,8 +9,8 @@ return false; #else return true; -@@ -363,7 +363,7 @@ bool ScrollbarThemeAura::ShouldCenterOnThumb(const Scr - const WebMouseEvent& event) { +@@ -418,7 +418,7 @@ bool ScrollbarThemeAura::ShouldCenterOnThumb(const Scr + const WebMouseEvent& event) const { // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_media_audio_audio__renderer__mixer__manager__test.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_media_audio_audio__renderer__mixer__manager__test.cc index feb498e57155..b91f933a5ae4 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_media_audio_audio__renderer__mixer__manager__test.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_media_audio_audio__renderer__mixer__manager__test.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/modules/media/audio/audio_renderer_mixer_manager_test.cc.orig 2024-07-03 01:14:49 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/modules/media/audio/audio_renderer_mixer_manager_test.cc.orig 2024-04-19 13:02:56 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/modules/media/audio/audio_renderer_mixer_manager_test.cc -@@ -726,7 +726,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/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_ml_webnn_features.gni b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_ml_webnn_features.gni deleted file mode 100644 index 9ed3a736b3cb..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_ml_webnn_features.gni +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/modules/ml/webnn/features.gni.orig 2024-01-30 07:53:34 UTC -+++ src/3rdparty/chromium/third_party/blink/renderer/modules/ml/webnn/features.gni -@@ -6,7 +6,7 @@ import("//build/config/chrome_build.gni") - declare_args() { - # This enables building WebNN with XNNPACK. Currently only available for - # 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/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_ml_webnn_ml__graph__xnnpack.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_ml_webnn_ml__graph__xnnpack.cc deleted file mode 100644 index c426bb3c776c..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_ml_webnn_ml__graph__xnnpack.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/modules/ml/webnn/ml_graph_xnnpack.cc.orig 2024-02-23 21:04:38 UTC -+++ src/3rdparty/chromium/third_party/blink/renderer/modules/ml/webnn/ml_graph_xnnpack.cc -@@ -202,7 +202,7 @@ class SharedXnnpackContext : public ThreadSafeRefCount - - ~SharedXnnpackContext() { - base::AutoLock auto_lock(SharedXnnpackContextLock()); --#if !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) -+#if !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) - // For Linux and ChromeOS, cpuinfo needs to parse /proc/cpuinfo to - // initialize in pre sandbox stage. Calling xnn_deinitialize() here will - // deinitialize cpuinfo within sandbox and cannot access /proc/cpuinfo diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_peerconnection_rtc__data__channel.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_peerconnection_rtc__data__channel.cc new file mode 100644 index 000000000000..3e4c0751247f --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_peerconnection_rtc__data__channel.cc @@ -0,0 +1,10 @@ +--- src/3rdparty/chromium/third_party/blink/renderer/modules/peerconnection/rtc_data_channel.cc.orig 2024-10-22 08:31:56 UTC ++++ src/3rdparty/chromium/third_party/blink/renderer/modules/peerconnection/rtc_data_channel.cc +@@ -557,6 +557,7 @@ void RTCDataChannel::send(Blob* data, ExceptionState& + pending_messages_.push_back(message); + } + ++#undef close + void RTCDataChannel::close() { + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); + if (state_ == webrtc::DataChannelInterface::kClosing || diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc index 2929e4a0b7c8..fe3ae4730393 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc -@@ -300,7 +300,7 @@ TEST_F(WebRtcAudioRendererTest, DISABLED_VerifySinkPar +@@ -304,7 +304,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/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_webaudio_audio__worklet__thread__test.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_webaudio_audio__worklet__thread__test.cc index b0176d7066ae..de8e2b465d4f 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_webaudio_audio__worklet__thread__test.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_webaudio_audio__worklet__thread__test.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/modules/webaudio/audio_worklet_thread_test.cc.orig 2023-01-11 09:17:16 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/modules/webaudio/audio_worklet_thread_test.cc.orig 2024-09-30 07:45:04 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/modules/webaudio/audio_worklet_thread_test.cc -@@ -380,7 +380,7 @@ class AudioWorkletThreadPriorityTest +@@ -469,7 +469,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/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc index 162b0fcfdfdd..268dabfff069 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc.orig 2025-03-29 00:50:57 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc -@@ -6364,7 +6364,7 @@ void WebGLRenderingContextBase::TexImageHelperMediaVid +@@ -6298,7 +6298,7 @@ void WebGLRenderingContextBase::TexImageHelperMediaVid constexpr bool kAllowZeroCopyImages = true; #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_webgpu_gpu__queue.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_webgpu_gpu__queue.cc index ab853bca0a55..cac26aa529db 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_webgpu_gpu__queue.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_webgpu_gpu__queue.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/modules/webgpu/gpu_queue.cc.orig 2024-01-30 07:53:34 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/modules/webgpu/gpu_queue.cc.orig 2024-08-26 12:06:38 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/modules/webgpu/gpu_queue.cc -@@ -755,7 +755,7 @@ bool GPUQueue::CopyFromCanvasSourceImage( +@@ -788,7 +788,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. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_BUILD.gn index c90168dbbf31..3a2b65610b70 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_BUILD.gn @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/platform/BUILD.gn.orig 2024-07-03 01:14:49 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/platform/BUILD.gn.orig 2025-02-21 12:29:33 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/platform/BUILD.gn -@@ -1979,7 +1979,7 @@ jumbo_static_library("test_support") { +@@ -2059,7 +2059,7 @@ jumbo_static_library("test_support") { ] # fuzzed_data_provider may not work with a custom toolchain. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__cache.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__cache.cc index 19badfebb2a9..2ea6f77533e6 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__cache.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__cache.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/font_cache.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/font_cache.cc.orig 2024-09-30 07:45:04 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/font_cache.cc -@@ -73,7 +73,7 @@ extern const char kNotoColorEmojiCompat[] = "Noto Colo +@@ -81,7 +81,7 @@ extern const char kNotoColorEmojiCompat[] = "Noto Colo SkFontMgr* FontCache::static_font_manager_ = nullptr; @@ -9,7 +9,7 @@ float FontCache::device_scale_factor_ = 1.0; #endif -@@ -124,7 +124,7 @@ FontPlatformData* FontCache::SystemFontPlatformData( +@@ -132,7 +132,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/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__cache.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__cache.h index 00033931953f..9e4b94c08812 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__cache.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__cache.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/font_cache.h.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/font_cache.h.orig 2024-09-30 07:45:04 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/font_cache.h @@ -55,7 +55,7 @@ #include "third_party/skia/include/core/SkFontMgr.h" @@ -9,16 +9,16 @@ #include "ui/gfx/font_fallback_linux.h" #endif -@@ -174,7 +174,7 @@ class PLATFORM_EXPORT FontCache final { - static void PrewarmFamily(const AtomicString& family_name) {} - #endif +@@ -167,7 +167,7 @@ class PLATFORM_EXPORT FontCache final { + + static void MaybePreloadSystemFonts(); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // 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 { +@@ -243,7 +243,7 @@ class PLATFORM_EXPORT FontCache final { const char* locale_family_name); #endif // BUILDFLAG(IS_ANDROID) @@ -27,7 +27,7 @@ static bool GetFontForCharacter(UChar32, const char* preferred_locale, gfx::FallbackFontData*); -@@ -330,7 +330,7 @@ class PLATFORM_EXPORT FontCache final { +@@ -316,7 +316,7 @@ class PLATFORM_EXPORT FontCache final { const FontFaceCreationParams&, std::string& name); @@ -36,7 +36,7 @@ static AtomicString GetFamilyNameForCharacter(SkFontMgr*, UChar32, const FontDescription&, -@@ -368,7 +368,7 @@ class PLATFORM_EXPORT FontCache final { +@@ -353,7 +353,7 @@ class PLATFORM_EXPORT FontCache final { bool is_test_font_mgr_ = false; #endif // BUILDFLAG(IS_WIN) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__description.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__description.cc index 21f8e0da5a6b..a9e689812214 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__description.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__description.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/font_description.cc.orig 2023-12-10 06:10:27 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/font_description.cc.orig 2024-08-26 12:06:38 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/font_description.cc -@@ -39,7 +39,7 @@ +@@ -44,7 +44,7 @@ #include "third_party/blink/renderer/platform/wtf/text/string_hash.h" #include "third_party/blink/renderer/platform/wtf/text/string_hasher.h" @@ -9,7 +9,7 @@ #include "third_party/blink/renderer/platform/fonts/font_cache.h" #endif -@@ -277,7 +277,7 @@ FontCacheKey FontDescription::CacheKey( +@@ -282,7 +282,7 @@ FontCacheKey FontDescription::CacheKey( static_cast(fields_.orientation_) << 1 | // bit 2-3 static_cast(fields_.subpixel_text_position_); // bit 1 diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__platform__data.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__platform__data.cc index ae7e6e01ad34..263bf89e1e66 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__platform__data.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__platform__data.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/font_platform_data.cc.orig 2024-07-03 01:14:49 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/font_platform_data.cc.orig 2025-02-21 12:29:33 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/font_platform_data.cc -@@ -51,7 +51,7 @@ namespace { +@@ -57,7 +57,7 @@ namespace { namespace blink { namespace { @@ -9,7 +9,7 @@ // Getting the system font render style takes a significant amount of time on // Linux because looking up fonts using fontconfig can be very slow. We fetch // the render style for each font family and text size, while it's very -@@ -164,7 +164,7 @@ FontPlatformData::FontPlatformData(sk_sp t +@@ -170,7 +170,7 @@ FontPlatformData::FontPlatformData(sk_sp t style_ = WebFontRenderStyle::GetDefault(); #if !BUILDFLAG(IS_WIN) WebFontRenderStyle system_style; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc index d8364a87248d..e6e52c7c2c67 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc.orig 2024-01-30 07:53:34 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc.orig 2024-03-22 08:19:40 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc @@ -65,7 +65,7 @@ AtomicString ToAtomicString(const SkString& str) { return AtomicString::FromUTF8(str.c_str(), str.size()); @@ -9,7 +9,7 @@ // 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. -@@ -247,7 +247,7 @@ std::unique_ptr FontCache::CreateFon +@@ -246,7 +246,7 @@ const FontPlatformData* FontCache::CreateFontPlatformD std::string name; sk_sp typeface; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_graphics_gpu_image__layer__bridge.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_graphics_gpu_image__layer__bridge.cc new file mode 100644 index 000000000000..c319eea4d7e2 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_graphics_gpu_image__layer__bridge.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/gpu/image_layer_bridge.cc.orig 2024-10-22 08:31:56 UTC ++++ src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/gpu/image_layer_bridge.cc +@@ -49,7 +49,7 @@ scoped_refptr MakeAccelerated( + const auto paint_image = source->PaintImageForCurrentFrame(); + const auto image_info = paint_image.GetSkImageInfo().makeWH( + source->Size().width(), source->Size().height()); +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // TODO(b/330865436): On Linux, CanvasResourceProvider doesn't always check + // for SCANOUT support correctly on X11 and it's never supported in + // practice. Therefore, don't include it until this flow is reworked. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_graphics_video__frame__submitter.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_graphics_video__frame__submitter.cc index 82ab220ece5f..0dad33ef0603 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_graphics_video__frame__submitter.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_graphics_video__frame__submitter.cc @@ -1,9 +1,9 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/video_frame_submitter.cc.orig 2024-01-30 07:53:34 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/video_frame_submitter.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/video_frame_submitter.cc -@@ -365,7 +365,7 @@ void VideoFrameSubmitter::OnBeginFrame( - continue; - auto& feedback = - timing_details.find(frame_token)->value.presentation_feedback; +@@ -438,7 +438,7 @@ void VideoFrameSubmitter::OnBeginFrame( + auto& details = timing_details.find(frame_token)->value; + auto& feedback = details.presentation_feedback; + -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // TODO: On Linux failure flag is unreliable, and perfectly rendered frames diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_instrumentation_partition__alloc__memory__dump__provider.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_instrumentation_partition__alloc__memory__dump__provider.cc index 20af11b5c67f..230fa8d5bc2f 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_instrumentation_partition__alloc__memory__dump__provider.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_instrumentation_partition__alloc__memory__dump__provider.cc @@ -1,6 +1,16 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/platform/instrumentation/partition_alloc_memory_dump_provider.cc.orig 2023-01-11 09:17:16 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/platform/instrumentation/partition_alloc_memory_dump_provider.cc.orig 2024-04-19 13:02:56 UTC +++ src/3rdparty/chromium/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) { @@ -8,7 +18,7 @@ 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/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_peerconnection_rtc__video__encoder__factory.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_peerconnection_rtc__video__encoder__factory.cc index 320ec404d2aa..1e42ae6bf33b 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_peerconnection_rtc__video__encoder__factory.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_peerconnection_rtc__video__encoder__factory.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/platform/peerconnection/rtc_video_encoder_factory.cc.orig 2024-01-30 07:53:34 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/platform/peerconnection/rtc_video_encoder_factory.cc.orig 2024-09-30 07:45:04 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/platform/peerconnection/rtc_video_encoder_factory.cc -@@ -202,12 +202,12 @@ SupportedFormats GetSupportedFormatsInternal( +@@ -260,12 +260,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/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_runtime__enabled__features.json5 b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_runtime__enabled__features.json5 index 8bdefd8bfec9..04a903bd35f2 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_runtime__enabled__features.json5 +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_runtime__enabled__features.json5 @@ -1,24 +1,42 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/platform/runtime_enabled_features.json5.orig 2024-07-03 01:14:49 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/platform/runtime_enabled_features.json5.orig 2025-02-21 12:29:33 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -1944,7 +1944,7 @@ - base_feature_status: "enabled", - copied_from_base_feature_if: "overridden", - origin_trial_feature_name: "FullscreenPopupWindows", +@@ -384,7 +384,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", }, { - name: "GamepadButtonAxisEvents", -@@ -2862,7 +2862,7 @@ - name: "PaymentHandlerMinimalHeaderUX", - origin_trial_feature_name: "PaymentHandlerMinimalHeaderUX", +@@ -1805,7 +1805,7 @@ + base_feature: "none", + public: true, + origin_trial_feature_name: "FedCmMultipleIdentityProviders", +- origin_trial_os: ["win", "mac", "linux", "chromeos"], ++ origin_trial_os: ["win", "mac", "linux", "chromeos", "openbsd", "freebsd"], origin_trial_allows_third_party: true, + }, + { +@@ -3156,7 +3156,7 @@ + // Tracking bug for the implementation: https://crbug.com/1462930 + name: "PermissionElement", + origin_trial_feature_name: "PermissionElement", - origin_trial_os: ["win", "mac", "linux", "fuchsia", "chromeos"], + origin_trial_os: ["win", "mac", "linux", "fuchsia", "chromeos", "openbsd", "freebsd"], - status: "stable", - }, + status: "experimental", + public: true, + base_feature_status: "enabled", +@@ -3302,7 +3302,7 @@ { -@@ -3875,7 +3875,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", +@@ -4313,7 +4313,7 @@ name: "UnrestrictedSharedArrayBuffer", base_feature: "none", origin_trial_feature_name: "UnrestrictedSharedArrayBuffer", @@ -27,7 +45,16 @@ }, // Enables using policy-controlled feature "usb-unrestricted" to allow // isolated context to access protected USB interface classes and to -@@ -4083,12 +4083,12 @@ +@@ -4460,7 +4460,7 @@ + { + name: "WebAppScopeExtensions", + origin_trial_feature_name: "WebAppScopeExtensions", +- origin_trial_os: ["win", "mac", "linux", "chromeos"], ++ origin_trial_os: ["win", "mac", "linux", "chromeos", "openbsd", "freebsd"], + status: "experimental", + base_feature: "none", + }, +@@ -4503,7 +4503,7 @@ status: "experimental", base_feature: "none", origin_trial_feature_name: "WebAppUrlHandling", @@ -35,10 +62,4 @@ + origin_trial_os: ["win", "mac", "linux", "openbsd", "freebsd"], }, { - name: "WebAppWindowControlsOverlay", - origin_trial_feature_name: "WebAppWindowControlsOverlay", -- origin_trial_os: ["win", "mac", "linux", "chromeos"], -+ origin_trial_os: ["win", "mac", "linux", "chromeos", "openbsd", "freebsd"], - status: "stable", - base_feature: "none", - }, + // WebAssembly JS Promise Integration, diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_scheduler_common_thread.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_scheduler_common_thread.cc index d8fc91ddadb8..0b18e5180bef 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_scheduler_common_thread.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_scheduler_common_thread.cc @@ -1,8 +1,8 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/platform/scheduler/common/thread.cc.orig 2023-04-28 17:01:32 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/platform/scheduler/common/thread.cc.orig 2024-09-30 07:45:04 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/platform/scheduler/common/thread.cc -@@ -82,7 +82,7 @@ void Thread::CreateAndSetCompositorThread() { - std::make_unique(params); - compositor_thread->Init(); +@@ -88,7 +88,7 @@ void Thread::CreateAndSetCompositorThread() { + "Compositor"); + })); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && !BUILDFLAG(IS_OPENBSD) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_video__capture_video__capture__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_video__capture_video__capture__impl.cc deleted file mode 100644 index a62ae6547718..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_video__capture_video__capture__impl.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/platform/video_capture/video_capture_impl.cc.orig 2024-02-23 21:04:38 UTC -+++ src/3rdparty/chromium/third_party/blink/renderer/platform/video_capture/video_capture_impl.cc -@@ -679,7 +679,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 - // `media::VideoFrame::RequiresExternalSampler()` requires it for NV12 - // format, while the `ImageTextureTarget()` will return GL_TEXTURE_2D. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_wtf_stack__util.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_wtf_stack__util.cc index c1d05653e567..00565c8d5139 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_wtf_stack__util.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_wtf_stack__util.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc.orig 2023-03-09 06:31:50 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc.orig 2024-08-26 12:06:38 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc -@@ -18,6 +18,11 @@ +@@ -23,6 +23,11 @@ extern "C" void* __libc_stack_end; // NOLINT #endif @@ -12,7 +12,7 @@ namespace WTF { size_t GetUnderestimatedStackSize() { -@@ -62,6 +67,8 @@ size_t GetUnderestimatedStackSize() { +@@ -67,6 +72,8 @@ size_t GetUnderestimatedStackSize() { // low as 512k. // return 512 * 1024; @@ -21,7 +21,7 @@ #elif BUILDFLAG(IS_APPLE) // pthread_get_stacksize_np() returns too low a value for the main thread on // OSX 10.9, -@@ -148,6 +155,13 @@ void* GetStackStart() { +@@ -154,6 +161,13 @@ void* GetStackStart() { ::GetCurrentThreadStackLimits(&lowLimit, &highLimit); return reinterpret_cast(highLimit); #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_wtf_text_text__codec__icu.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_wtf_text_text__codec__icu.cc new file mode 100644 index 000000000000..320932d839f5 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_wtf_text_text__codec__icu.cc @@ -0,0 +1,18 @@ +--- src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc.orig 2024-08-26 12:06:38 UTC ++++ src/3rdparty/chromium/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/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_util_generate__build__files.py b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_util_generate__build__files.py deleted file mode 100644 index b8b4146a607a..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_util_generate__build__files.py +++ /dev/null @@ -1,34 +0,0 @@ ---- src/3rdparty/chromium/third_party/boringssl/src/util/generate_build_files.py.orig 2024-02-23 21:04:38 UTC -+++ src/3rdparty/chromium/third_party/boringssl/src/util/generate_build_files.py -@@ -794,10 +794,10 @@ def main(platforms): - ] - - # Generate err_data.c -- with open('err_data.c', 'w+') as err_data: -- subprocess.check_call(['go', 'run', 'err_data_generate.go'], -- cwd=os.path.join('src', 'crypto', 'err'), -- stdout=err_data) -+# with open('err_data.c', 'w+') as err_data: -+# subprocess.check_call(['go', 'run', 'err_data_generate.go'], -+# cwd=os.path.join('src', 'crypto', 'err'), -+# stdout=err_data) - crypto_c_files.append('err_data.c') - crypto_c_files.sort() - -@@ -808,11 +808,11 @@ def main(platforms): - crypto_test_files = [] - if EMBED_TEST_DATA: - # Generate crypto_test_data.cc -- with open('crypto_test_data.cc', 'w+') as out: -- subprocess.check_call( -- ['go', 'run', 'util/embed_test_data.go'] + cmake['CRYPTO_TEST_DATA'], -- cwd='src', -- stdout=out) -+# with open('crypto_test_data.cc', 'w+') as out: -+# subprocess.check_call( -+# ['go', 'run', 'util/embed_test_data.go'] + cmake['CRYPTO_TEST_DATA'], -+# cwd='src', -+# stdout=out) - crypto_test_files.append('crypto_test_data.cc') - - crypto_test_files += PrefixWithSrc(cmake['CRYPTO_TEST_SOURCES']) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_cpuinfo_cpuinfo.gni b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_cpuinfo_cpuinfo.gni index fb61d3ecf290..fdbb3de57a11 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_cpuinfo_cpuinfo.gni +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_cpuinfo_cpuinfo.gni @@ -1,8 +1,8 @@ ---- src/3rdparty/chromium/third_party/cpuinfo/cpuinfo.gni.orig 2023-10-11 18:22:24 UTC +--- src/3rdparty/chromium/third_party/cpuinfo/cpuinfo.gni.orig 2024-03-22 08:19:40 UTC +++ src/3rdparty/chromium/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 && diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_util_misc_uuid.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_util_misc_uuid.cc index f6fbd225c921..ce6b4d18a671 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_util_misc_uuid.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_util_misc_uuid.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/uuid.cc.orig 2024-01-30 07:53:34 UTC +--- src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/uuid.cc.orig 2024-06-17 12:56:06 UTC +++ src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/uuid.cc -@@ -102,7 +102,7 @@ bool UUID::InitializeWithNew() { +@@ -110,7 +110,7 @@ bool UUID::InitializeWithNew() { InitializeFromBytes(uuid); return true; #elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_util_posix_symbolic__constants__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_util_posix_symbolic__constants__posix.cc index 4de23be51e5a..d05000bbb5b8 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_util_posix_symbolic__constants__posix.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_util_posix_symbolic__constants__posix.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/crashpad/crashpad/util/posix/symbolic_constants_posix.cc.orig 2022-04-21 18:48:31 UTC +--- src/3rdparty/chromium/third_party/crashpad/crashpad/util/posix/symbolic_constants_posix.cc.orig 2024-08-26 12:06:38 UTC +++ src/3rdparty/chromium/third_party/crashpad/crashpad/util/posix/symbolic_constants_posix.cc -@@ -67,7 +67,7 @@ constexpr const char* kSignalNames[] = { +@@ -68,7 +68,7 @@ constexpr const char* kSignalNames[] = { "INFO", "USR1", "USR2", @@ -9,7 +9,7 @@ #if defined(ARCH_CPU_MIPS_FAMILY) "HUP", "INT", -@@ -138,7 +138,7 @@ constexpr const char* kSignalNames[] = { +@@ -139,7 +139,7 @@ constexpr const char* kSignalNames[] = { #endif // defined(ARCH_CPU_MIPS_FAMILY) #endif }; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_dawn_include_dawn_native_VulkanBackend.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_dawn_include_dawn_native_VulkanBackend.h index 57a1ad80655b..7a725030803a 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_dawn_include_dawn_native_VulkanBackend.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_dawn_include_dawn_native_VulkanBackend.h @@ -1,11 +1,11 @@ ---- src/3rdparty/chromium/third_party/dawn/include/dawn/native/VulkanBackend.h.orig 2023-12-10 06:10:27 UTC +--- src/3rdparty/chromium/third_party/dawn/include/dawn/native/VulkanBackend.h.orig 2024-06-17 12:56:06 UTC +++ src/3rdparty/chromium/third_party/dawn/include/dawn/native/VulkanBackend.h @@ -83,7 +83,7 @@ struct ExternalImageExportInfoVk : ExternalImageExport }; // Can't use DAWN_PLATFORM_IS(LINUX) since header included in both Dawn and Chrome --#ifdef __linux__ -+#if defined(__linux__) || defined(__OpenBSD__) || defined(__FreeBSD__) +-#if defined(__linux__) || defined(__Fuchsia__) ++#if defined(__linux__) || defined(__Fuchsia__) || defined(__OpenBSD__) || defined(__FreeBSD__) // Common properties of external images represented by FDs. On successful import the file // descriptor's ownership is transferred to the Dawn implementation and they shouldn't be diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_devtools-frontend_src_scripts_build_compress__files.js b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_devtools-frontend_src_scripts_build_compress__files.js new file mode 100644 index 000000000000..4e8cd8e40633 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_devtools-frontend_src_scripts_build_compress__files.js @@ -0,0 +1,33 @@ +Reduce Brotli compression on i386 to have more memory available. Otherwise, +node.js stops with either SIGSEGV or SIGABRT after ~530 processed files. + +--- src/3rdparty/chromium/third_party/devtools-frontend/src/scripts/build/compress_files.js.orig 2025-03-29 00:50:57 UTC ++++ src/3rdparty/chromium/third_party/devtools-frontend/src/scripts/build/compress_files.js +@@ -2,6 +2,7 @@ + // Use of this source code is governed by a BSD-style license that can be + // found in the LICENSE file. + ++const os = require('os'); + const fs = require('fs'); + const crypto = require('crypto'); + const zlib = require('zlib'); +@@ -52,9 +53,16 @@ async function brotli(sourceData, compressedFilename) + output.write(Buffer.from(brotliConst)); + output.write(Buffer.from(sizeHeader)); + return new Promise((resolve, reject) => { +- pipeline(Readable.from(sourceData), zlib.createBrotliCompress(), output, err => { +- return err ? reject(err) : resolve(); +- }); ++ if (os.arch() === 'arm' || os.arch() === 'ia32') { ++ pipeline(Readable.from(sourceData), zlib.createBrotliCompress({ params: { [zlib.constants.BROTLI_PARAM_QUALITY]: 4 } }), output, err => { ++ return err ? reject(err) : resolve(); ++ }); ++ } ++ else { ++ pipeline(Readable.from(sourceData), zlib.createBrotliCompress(), output, err => { ++ return err ? reject(err) : resolve(); ++ }); ++ } + }); + } + diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_ffmpeg_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_ffmpeg_BUILD.gn index 43030400be1b..5bf2f236e1ea 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_ffmpeg_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_ffmpeg_BUILD.gn @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/ffmpeg/BUILD.gn.orig 2024-07-03 01:14:49 UTC +--- src/3rdparty/chromium/third_party/ffmpeg/BUILD.gn.orig 2025-02-21 12:29:33 UTC +++ src/3rdparty/chromium/third_party/ffmpeg/BUILD.gn -@@ -357,7 +357,6 @@ target(link_target_type, "ffmpeg_internal") { +@@ -358,7 +358,6 @@ target(link_target_type, "ffmpeg_internal") { libs += [ "m", "z", diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_ffmpeg_chromium_scripts_build__ffmpeg.py b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_ffmpeg_chromium_scripts_build__ffmpeg.py deleted file mode 100644 index db7b34d682a1..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_ffmpeg_chromium_scripts_build__ffmpeg.py +++ /dev/null @@ -1,121 +0,0 @@ ---- src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/build_ffmpeg.py.orig 2023-12-10 06:10:27 UTC -+++ src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/build_ffmpeg.py -@@ -32,7 +32,7 @@ NDK_ROOT_DIR = os.path.abspath( - SUCCESS_TOKEN = 'THIS_BUILD_WORKED' - - sys.path.append(os.path.join(CHROMIUM_ROOT_DIR, 'build')) --import gn_helpers -+#import gn_helpers - - BRANDINGS = [ - 'Chrome', -@@ -45,6 +45,8 @@ ARCH_MAP = { - '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(): - - - 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 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 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 - -@@ -742,7 +750,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([ -@@ -752,7 +760,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, - ]) - - if host_arch != 'x64': -@@ -843,7 +851,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', -@@ -908,7 +916,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', -@@ -1059,7 +1067,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/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_ffmpeg_chromium_scripts_robo__lib_config.py b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_ffmpeg_chromium_scripts_robo__lib_config.py deleted file mode 100644 index c75d668bf1be..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_ffmpeg_chromium_scripts_robo__lib_config.py +++ /dev/null @@ -1,53 +0,0 @@ ---- src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/robo_lib/config.py.orig 2023-09-13 12:11:42 UTC -+++ src/3rdparty/chromium/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() - -@@ -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.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 -@@ -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" - -@@ -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") diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_ffmpeg_configure b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_ffmpeg_configure index d512f4d4ad58..e8211725936a 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_ffmpeg_configure +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_ffmpeg_configure @@ -1,10 +1,13 @@ ---- src/3rdparty/chromium/third_party/ffmpeg/configure.orig 2024-01-30 07:53:34 UTC +--- src/3rdparty/chromium/third_party/ffmpeg/configure.orig 2024-07-30 11:12:21 UTC +++ src/3rdparty/chromium/third_party/ffmpeg/configure -@@ -5615,6 +5615,7 @@ case $target_os in - disable symver - ;; - freebsd) -+ enable section_data_rel_ro - ;; - bsd/os) - add_extralibs -lpoll -lgnugetopt +@@ -6818,8 +6818,8 @@ if ! disabled pthreads && ! enabled w32threads && ! en + if enabled pthread_np_h; then + hdrs="$hdrs pthread_np.h" + fi +- check_lib pthread_set_name_np "$hdrs" pthread_set_name_np -lpthread +- check_lib pthread_setname_np "$hdrs" pthread_setname_np -lpthread ++ check_lib pthread_set_name_np pthread_np.h pthread_set_name_np -lpthread ++ check_lib pthread_setname_np pthread_np.h pthread_setname_np -lpthread + fi + fi + diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_ffmpeg_libavutil_x86_x86inc.asm b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_ffmpeg_libavutil_x86_x86inc.asm index d15cf6434e81..237ae59b1e77 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_ffmpeg_libavutil_x86_x86inc.asm +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_ffmpeg_libavutil_x86_x86inc.asm @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/ffmpeg/libavutil/x86/x86inc.asm.orig 2024-01-30 07:53:34 UTC +--- src/3rdparty/chromium/third_party/ffmpeg/libavutil/x86/x86inc.asm.orig 2024-06-17 12:56:06 UTC +++ src/3rdparty/chromium/third_party/ffmpeg/libavutil/x86/x86inc.asm -@@ -53,6 +53,12 @@ +@@ -46,6 +46,12 @@ %endif %endif @@ -13,7 +13,7 @@ %define WIN64 0 %define UNIX64 0 %if ARCH_X86_64 -@@ -778,6 +784,7 @@ BRANCH_INSTR jz, je, jnz, jne, jl, jle, jnl, jnle, jg, +@@ -861,6 +867,7 @@ BRANCH_INSTR jz, je, jnz, jne, jl, jle, jnl, jnle, jg, %endif align function_align %2: diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_fontconfig_include_config.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_fontconfig_include_config.h index 5e821ba16c3d..dd390fddb589 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_fontconfig_include_config.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_fontconfig_include_config.h @@ -1,89 +1,49 @@ ---- src/3rdparty/chromium/third_party/fontconfig/include/config.h.orig 2023-04-05 11:05:06 UTC +--- src/3rdparty/chromium/third_party/fontconfig/include/config.h.orig 2024-03-22 08:19:40 UTC +++ src/3rdparty/chromium/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/usr/share/fonts\n\t/usr/local/share/fonts\n" ++#define FC_DEFAULT_FONTS "\t/usr/X11R6/lib/X11/fonts" - /* System font directory */ --#define FC_DEFAULT_FONTS "/usr/share/fonts" -+#define FC_DEFAULT_FONTS "/usr/X11R6/lib/X11/fonts" + #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 header file. */ -#define HAVE_SYS_STATFS_H 1 +/* #undef HAVE_SYS_STATFS_H */ - /* Define to 1 if you have the 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 header file. */ -#define HAVE_SYS_VFS_H 1 +/* #undef HAVE_SYS_VFS_H */ - /* Define to 1 if you have the 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/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_leveldatabase_env__chromium.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_leveldatabase_env__chromium.cc index 7352e9bf3c12..145d26bfeab7 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_leveldatabase_env__chromium.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_leveldatabase_env__chromium.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/leveldatabase/env_chromium.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/third_party/leveldatabase/env_chromium.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/third_party/leveldatabase/env_chromium.cc -@@ -326,7 +326,8 @@ ChromiumWritableFile::ChromiumWritableFile(const std:: +@@ -329,7 +329,8 @@ ChromiumWritableFile::ChromiumWritableFile(const std:: Status ChromiumWritableFile::SyncParent() { TRACE_EVENT0("leveldb", "SyncParent"); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_libaom_source_libaom_aom__ports_aarch64__cpudetect.c b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_libaom_source_libaom_aom__ports_aarch64__cpudetect.c index e9a5a5d7dccb..72f6c7ebf94a 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_libaom_source_libaom_aom__ports_aarch64__cpudetect.c +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_libaom_source_libaom_aom__ports_aarch64__cpudetect.c @@ -1,25 +1,15 @@ ---- src/3rdparty/chromium/third_party/libaom/source/libaom/aom_ports/aarch64_cpudetect.c.orig 2023-09-17 18:22:45 UTC +--- src/3rdparty/chromium/third_party/libaom/source/libaom/aom_ports/aarch64_cpudetect.c.orig 2024-06-03 12:51:57 UTC +++ src/3rdparty/chromium/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 +#include +#include -+ + +static int arm_get_cpu_caps(void) { + int flags = 0; + int isar0_mib[] = { CTL_MACHDEP, CPU_ID_AA64ISAR0 }; @@ -31,9 +21,29 @@ + if (sysctl(isar0_mib, 2, &cpu_id, &len, NULL, 0) < 0) + return flags; + -+ if (ID_AA64ISAR0_AES(cpu_id) >= ID_AA64ISAR0_CRC32_BASE) ++ if (ID_AA64ISAR0_CRC32(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 ++ ++#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/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_libvpx_source_libvpx_vpx__ports_aarch64__cpudetect.c b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_libvpx_source_libvpx_vpx__ports_aarch64__cpudetect.c index c6211e39fbdd..a16c77545f24 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_libvpx_source_libvpx_vpx__ports_aarch64__cpudetect.c +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_libvpx_source_libvpx_vpx__ports_aarch64__cpudetect.c @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/libvpx/source/libvpx/vpx_ports/aarch64_cpudetect.c.orig 2024-01-30 07:53:34 UTC +--- src/3rdparty/chromium/third_party/libvpx/source/libvpx/vpx_ports/aarch64_cpudetect.c.orig 2024-05-21 18:07:39 UTC +++ src/3rdparty/chromium/third_party/libvpx/source/libvpx/vpx_ports/aarch64_cpudetect.c -@@ -91,9 +91,23 @@ static int arm_get_cpu_caps(void) { +@@ -92,9 +92,23 @@ static int arm_get_cpu_caps(void) { return flags; } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_maldoca_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_maldoca_BUILD.gn deleted file mode 100644 index 22f2c7c85230..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_maldoca_BUILD.gn +++ /dev/null @@ -1,13 +0,0 @@ ---- src/3rdparty/chromium/third_party/maldoca/BUILD.gn.orig 2023-04-05 11:05:06 UTC -+++ src/3rdparty/chromium/third_party/maldoca/BUILD.gn -@@ -264,6 +264,10 @@ source_set("maldoca-public-headers") { - ":maldoca_chromium_config", - ":maldoca_flags", - ] -+ -+ if (is_bsd) { -+ libs = [ "iconv" ] -+ } - } - - static_library("maldoca") { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_maldoca_src_maldoca_base_get__runfiles__dir.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_maldoca_src_maldoca_base_get__runfiles__dir.cc deleted file mode 100644 index cf51fcf251b3..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_maldoca_src_maldoca_base_get__runfiles__dir.cc +++ /dev/null @@ -1,32 +0,0 @@ ---- src/3rdparty/chromium/third_party/maldoca/src/maldoca/base/get_runfiles_dir.cc.orig 2023-11-03 10:09:45 UTC -+++ src/3rdparty/chromium/third_party/maldoca/src/maldoca/base/get_runfiles_dir.cc -@@ -25,11 +25,6 @@ - #error "__APPLE__ not supported." - #endif - --#if defined(__FreeBSD__) --// TODO(#110) FreeBSD-specific headers. --#error "__FreeBSD__ not supported." --#endif -- - #if defined(_WIN32) - #include - #define PATH_MAX MAX_PATH -@@ -51,8 +46,6 @@ std::string GetExecutablePath() { - char exe_path[PATH_MAX] = {0}; - #ifdef __APPLE__ - #error "__APPLE__ not supported."; --#elif defined(__FreeBSD__) --#error "__FreeBSD__ not supported."; - #elif defined(_WIN32) - HMODULE hModule = GetModuleHandleW(NULL); - WCHAR wc_file_path[MAX_PATH] = {0}; -@@ -98,8 +91,6 @@ std::string GetExecutablePath() { - absl::Status IsDirectory(const std::string& name) { - #ifdef __APPLE__ - #error "__APPLE__ not supported."; --#elif defined(__FreeBSD__) --#error "__FreeBSD__ not supported."; - #else - struct stat sbuf; - if (stat(name.c_str(), &sbuf) != 0) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_maldoca_src_maldoca_service_common_process__doc__wrapper.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_maldoca_src_maldoca_service_common_process__doc__wrapper.cc deleted file mode 100644 index 1124a33989b5..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_maldoca_src_maldoca_service_common_process__doc__wrapper.cc +++ /dev/null @@ -1,29 +0,0 @@ ---- src/3rdparty/chromium/third_party/maldoca/src/maldoca/service/common/process_doc_wrapper.cc.orig 2023-09-13 12:11:42 UTC -+++ src/3rdparty/chromium/third_party/maldoca/src/maldoca/service/common/process_doc_wrapper.cc -@@ -7,7 +7,7 @@ - #include "build/build_config.h" - - #include "base/files/file_util.h" --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || BUILDFLAG(IS_BSD) - #include "base/strings/string_util.h" - #else - #include "base/strings/string_util_win.h" -@@ -21,7 +21,7 @@ namespace third_party_maldoca { - - - bool ExtensionEqualInCaseSensitive(base::FilePath file_path, std::string extension){ -- #if defined(OS_LINUX) -+ #if defined(OS_LINUX) || BUILDFLAG(IS_BSD) - std::string file_extension = file_path.FinalExtension(); - return base::CompareCaseInsensitiveASCII(file_extension, extension) == 0; - #else -@@ -74,7 +74,7 @@ void AnalyzeOfficeDocument(base::File office_file, - maldoca::DocProcessor doc_processor(processor_config); - - maldoca::ProcessDocumentRequest process_doc_request; -- #if defined(OS_LINUX) -+ #if defined(OS_LINUX) || BUILDFLAG(IS_BSD) - const std::string file_name = file_path.BaseName().value().c_str(); - process_doc_request.set_file_name(file_name); - #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_material__color__utilities_src_cpp_palettes_tones.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_material__color__utilities_src_cpp_palettes_tones.cc index ff116724d0f5..2fac7ff978da 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_material__color__utilities_src_cpp_palettes_tones.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_material__color__utilities_src_cpp_palettes_tones.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/material_color_utilities/src/cpp/palettes/tones.cc.orig 2024-07-03 01:14:49 UTC +--- src/3rdparty/chromium/third_party/material_color_utilities/src/cpp/palettes/tones.cc.orig 2024-03-22 08:19:40 UTC +++ src/3rdparty/chromium/third_party/material_color_utilities/src/cpp/palettes/tones.cc @@ -14,6 +14,8 @@ * limitations under the License. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_nasm_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_nasm_BUILD.gn new file mode 100644 index 000000000000..110690bd900f --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_nasm_BUILD.gn @@ -0,0 +1,16 @@ +--- src/3rdparty/chromium/third_party/nasm/BUILD.gn.orig 2024-07-30 19:22:51 UTC ++++ src/3rdparty/chromium/third_party/nasm/BUILD.gn +@@ -63,6 +63,13 @@ config("nasm_config") { + + defines = [ "HAVE_CONFIG_H" ] + ++ _string_h_lines = ++ read_file("/usr/include/string.h", "list lines") ++ _mempcpy = filter_include(_string_h_lines, [ "*mempcpy*" ]) ++ if (_mempcpy != []) { ++ defines += [ "HAVE_MEMPCPY=1" ] ++ } ++ + if (is_clang) { + cflags = [ + # The inline functions in NASM's headers flag this. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_nasm_config_config-linux.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_nasm_config_config-linux.h index caa281ce0277..51ee60839711 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_nasm_config_config-linux.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_nasm_config_config-linux.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/nasm/config/config-linux.h.orig 2024-06-10 11:34:19 UTC +--- src/3rdparty/chromium/third_party/nasm/config/config-linux.h.orig 2023-01-11 09:17:16 UTC +++ src/3rdparty/chromium/third_party/nasm/config/config-linux.h @@ -160,7 +160,7 @@ @@ -18,7 +18,7 @@ /* Define to 1 if you have the `faccessat' function. */ #define HAVE_FACCESSAT 1 -@@ -327,10 +327,10 @@ +@@ -327,16 +327,16 @@ #define HAVE_ISASCII 1 /* Define to 1 if you have the `iscntrl' function. */ @@ -31,6 +31,13 @@ /* Define to 1 if you have the header file. */ #define HAVE_MEMORY_H 1 + + /* Define to 1 if you have the `mempcpy' function. */ +-#define HAVE_MEMPCPY 1 ++/* #undef HAVE_MEMPCPY */ + + /* Define to 1 if you have a working `mmap' system call. */ + #define HAVE_MMAP 1 @@ -357,7 +357,7 @@ #define HAVE_STDARG_H 1 diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_node_node.py b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_node_node.py index f02e5a76cbc0..759ce8c8b5b5 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_node_node.py +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_node_node.py @@ -1,8 +1,8 @@ ---- src/3rdparty/chromium/third_party/node/node.py.orig 2024-07-03 01:14:49 UTC +--- src/3rdparty/chromium/third_party/node/node.py.orig 2025-02-21 12:29:33 UTC +++ src/3rdparty/chromium/third_party/node/node.py -@@ -35,6 +35,8 @@ def GetBinaryPath(): +@@ -39,6 +39,8 @@ def GetBinaryPath(): return os_path.join(os_path.dirname(__file__), *{ - 'Darwin': ('mac', darwin_name, 'bin', 'node'), + 'Darwin': (darwin_path, darwin_name, 'bin', 'node'), 'Linux': ('linux', 'node-linux-x64', 'bin', 'node'), + 'OpenBSD': ('openbsd', 'node-openbsd', 'bin', 'node'), + 'FreeBSD': ('freebsd', 'node-freebsd', 'bin', 'node'), diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_pdfium_core_fxge_cfx__fontmapper.cpp b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_pdfium_core_fxge_cfx__fontmapper.cpp index cefcd897251a..0496f4205f04 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_pdfium_core_fxge_cfx__fontmapper.cpp +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_pdfium_core_fxge_cfx__fontmapper.cpp @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/pdfium/core/fxge/cfx_fontmapper.cpp.orig 2023-09-13 12:11:42 UTC +--- src/3rdparty/chromium/third_party/pdfium/core/fxge/cfx_fontmapper.cpp.orig 2024-07-30 11:12:21 UTC +++ src/3rdparty/chromium/third_party/pdfium/core/fxge/cfx_fontmapper.cpp @@ -157,7 +157,7 @@ constexpr AltFontFamily kAltFontFamilies[] = { {"ForteMT", "Forte"}, diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_pdfium_core_fxge_linux_fx__linux__impl.cpp b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_pdfium_core_fxge_linux_fx__linux__impl.cpp index 5c6714ebc431..882ed655f782 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_pdfium_core_fxge_linux_fx__linux__impl.cpp +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_pdfium_core_fxge_linux_fx__linux__impl.cpp @@ -1,15 +1,15 @@ ---- src/3rdparty/chromium/third_party/pdfium/core/fxge/linux/fx_linux_impl.cpp.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/third_party/pdfium/core/fxge/linux/fx_linux_impl.cpp.orig 2024-08-26 12:06:38 UTC +++ src/3rdparty/chromium/third_party/pdfium/core/fxge/linux/fx_linux_impl.cpp -@@ -18,7 +18,7 @@ - #include "third_party/base/check.h" +@@ -20,7 +20,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,10 +166,9 @@ class CLinuxPlatform : public CFX_GEModule::PlatformIf +@@ -173,10 +173,9 @@ class CLinuxPlatform : public CFX_GEModule::PlatformIf std::unique_ptr CreateDefaultSystemFontInfo() override { auto pInfo = std::make_unique(); if (!pInfo->ParseFontCfg(CFX_GEModule::Get()->GetUserFontPaths())) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_pdfium_fxjs_fx__date__helpers.cpp b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_pdfium_fxjs_fx__date__helpers.cpp index 8d7454a898c7..c0361fbd6d01 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_pdfium_fxjs_fx__date__helpers.cpp +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_pdfium_fxjs_fx__date__helpers.cpp @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/pdfium/fxjs/fx_date_helpers.cpp.orig 2022-06-17 14:20:10 UTC +--- src/3rdparty/chromium/third_party/pdfium/fxjs/fx_date_helpers.cpp.orig 2024-05-21 18:07:39 UTC +++ src/3rdparty/chromium/third_party/pdfium/fxjs/fx_date_helpers.cpp -@@ -37,6 +37,11 @@ double GetLocalTZA() { +@@ -39,6 +39,11 @@ double GetLocalTZA() { return 0; time_t t = 0; FXSYS_time(&t); @@ -12,7 +12,7 @@ FXSYS_localtime(&t); #if BUILDFLAG(IS_WIN) // In gcc 'timezone' is a global variable declared in time.h. In VC++, that -@@ -45,6 +50,7 @@ double GetLocalTZA() { +@@ -47,6 +52,7 @@ double GetLocalTZA() { _get_timezone(&timezone); #endif return (double)(-(timezone * 1000)); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_include_perfetto_base_time.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_include_perfetto_base_time.h index d6e5ae140f08..6c5d53decb9e 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_include_perfetto_base_time.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_include_perfetto_base_time.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/perfetto/include/perfetto/base/time.h.orig 2024-01-30 07:53:34 UTC +--- src/3rdparty/chromium/third_party/perfetto/include/perfetto/base/time.h.orig 2024-07-30 11:12:21 UTC +++ src/3rdparty/chromium/third_party/perfetto/include/perfetto/base/time.h -@@ -193,6 +193,9 @@ inline TimeNanos GetTimeInternalNs(clockid_t clk_id) { +@@ -199,6 +199,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() { @@ -10,7 +10,7 @@ // Determine if CLOCK_BOOTTIME is available on the first call. static const clockid_t kBootTimeClockSource = [] { struct timespec ts = {}; -@@ -200,6 +203,7 @@ inline TimeNanos GetBootTimeNs() { +@@ -206,6 +209,7 @@ inline TimeNanos GetBootTimeNs() { return res == 0 ? CLOCK_BOOTTIME : kWallTimeClockSource; }(); return GetTimeInternalNs(kBootTimeClockSource); @@ -18,7 +18,7 @@ } inline TimeNanos GetWallTimeNs() { -@@ -207,7 +211,13 @@ inline TimeNanos GetWallTimeNs() { +@@ -213,7 +217,13 @@ inline TimeNanos GetWallTimeNs() { } inline TimeNanos GetWallTimeRawNs() { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_src_base_utils.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_src_base_utils.cc new file mode 100644 index 000000000000..5d783b5046b3 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_src_base_utils.cc @@ -0,0 +1,26 @@ +--- src/3rdparty/chromium/third_party/perfetto/src/base/utils.cc.orig 2024-10-22 08:31:56 UTC ++++ src/3rdparty/chromium/third_party/perfetto/src/base/utils.cc +@@ -38,8 +38,9 @@ + #include + #endif + +-#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \ +- PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) ++#if (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \ ++ PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)) && \ ++ !PERFETTO_BUILDFLAG(PERFETTO_OS_BSD) + #include + + #ifndef PR_GET_TAGGED_ADDR_CTRL +@@ -337,8 +338,9 @@ void AlignedFree(void* ptr) { + } + + bool IsSyncMemoryTaggingEnabled() { +-#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \ +- PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) ++#if (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \ ++ PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)) && \ ++ !PERFETTO_BUILDFLAG(PERFETTO_OS_BSD) + // Compute only once per lifetime of the process. + static bool cached_value = [] { + const int res = prctl(PR_GET_TAGGED_ADDR_CTRL, 0, 0, 0, 0); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_src_trace_processor_db_column_numeric__storage.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_src_trace_processor_db_column_numeric__storage.cc deleted file mode 100644 index e841e979ee7f..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_src_trace_processor_db_column_numeric__storage.cc +++ /dev/null @@ -1,15 +0,0 @@ ---- src/3rdparty/chromium/third_party/perfetto/src/trace_processor/db/column/numeric_storage.cc.orig 2024-02-25 20:08:06 UTC -+++ src/3rdparty/chromium/third_party/perfetto/src/trace_processor/db/column/numeric_storage.cc -@@ -39,7 +39,11 @@ namespace trace_processor { - namespace column { - namespace { - -+#if (defined(__OpenBSD__) || defined(__FreeBSD__)) && defined(__i386__) -+using NumericValue = std::variant; -+#else - using NumericValue = std::variant; -+#endif - - // Using the fact that binary operators in std are operators() of classes, we - // can wrap those classes in variants and use them for std::visit in - diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_src_tracing_core_tracing__service__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_src_tracing_core_clock__snapshots.cc similarity index 63% rename from www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_src_tracing_core_tracing__service__impl.cc rename to www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_src_tracing_core_clock__snapshots.cc index 91855e16868b..4d862df94fee 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_src_tracing_core_tracing__service__impl.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_src_tracing_core_clock__snapshots.cc @@ -1,11 +1,11 @@ ---- src/3rdparty/chromium/third_party/perfetto/src/tracing/core/tracing_service_impl.cc.orig 2024-02-23 21:04:38 UTC -+++ src/3rdparty/chromium/third_party/perfetto/src/tracing/core/tracing_service_impl.cc -@@ -3244,7 +3244,8 @@ bool TracingServiceImpl::SnapshotClocks( - +--- src/3rdparty/chromium/third_party/perfetto/src/tracing/core/clock_snapshots.cc.orig 2024-04-19 13:02:56 UTC ++++ src/3rdparty/chromium/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_NACL) && \ + !PERFETTO_BUILDFLAG(PERFETTO_OS_BSD) struct { clockid_t id; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_src_tracing_track.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_src_tracing_track.cc index fdff02b8b3c7..7c0c95c18d81 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_src_tracing_track.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_src_tracing_track.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/perfetto/src/tracing/track.cc.orig 2023-05-31 08:12:17 UTC +--- src/3rdparty/chromium/third_party/perfetto/src/tracing/track.cc.orig 2024-07-30 11:12:21 UTC +++ src/3rdparty/chromium/third_party/perfetto/src/tracing/track.cc -@@ -143,7 +143,7 @@ namespace internal { +@@ -155,7 +155,7 @@ namespace internal { namespace { uint64_t GetProcessStartTime() { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_protobuf_src_google_protobuf_arenastring.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_protobuf_src_google_protobuf_arenastring.cc deleted file mode 100644 index 8d8a90818732..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_protobuf_src_google_protobuf_arenastring.cc +++ /dev/null @@ -1,12 +0,0 @@ ---- src/3rdparty/chromium/third_party/protobuf/src/google/protobuf/arenastring.cc.orig 2022-09-01 14:18:43 UTC -+++ src/3rdparty/chromium/third_party/protobuf/src/google/protobuf/arenastring.cc -@@ -64,7 +64,9 @@ constexpr size_t kNewAlign = alignof(std::max_align_t) - #endif - constexpr size_t kStringAlign = alignof(std::string); - -+#if !(defined(__FreeBSD__) && defined(__i386__)) - static_assert((kStringAlign > kNewAlign ? kStringAlign : kNewAlign) >= 8, ""); -+#endif - static_assert(alignof(ExplicitlyConstructedArenaString) >= 8, ""); - - } // namespace diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_protobuf_src_google_protobuf_stubs_platform__macros.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_protobuf_src_google_protobuf_stubs_platform__macros.h index fb6a391f18f1..43da0957d5ca 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_protobuf_src_google_protobuf_stubs_platform__macros.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_protobuf_src_google_protobuf_stubs_platform__macros.h @@ -1,11 +1,11 @@ ---- src/3rdparty/chromium/third_party/protobuf/src/google/protobuf/stubs/platform_macros.h.orig 2022-08-31 12:19:35 UTC +--- src/3rdparty/chromium/third_party/protobuf/src/google/protobuf/stubs/platform_macros.h.orig 2024-05-21 18:07:39 UTC +++ src/3rdparty/chromium/third_party/protobuf/src/google/protobuf/stubs/platform_macros.h @@ -122,7 +122,7 @@ GOOGLE_PROTOBUF_PLATFORM_ERROR #undef GOOGLE_PROTOBUF_PLATFORM_ERROR --#if defined(GOOGLE_PROTOBUF_OS_ANDROID) || defined(GOOGLE_PROTOBUF_OS_IPHONE) || defined(__OpenBSD__) -+#if defined(GOOGLE_PROTOBUF_OS_ANDROID) || defined(GOOGLE_PROTOBUF_OS_IPHONE) +-#if defined(GOOGLE_PROTOBUF_OS_ANDROID) || defined(GOOGLE_PROTOBUF_OS_IPHONE) ++#if defined(GOOGLE_PROTOBUF_OS_ANDROID) || defined(GOOGLE_PROTOBUF_OS_IPHONE) || defined(__OpenBSD__) // Android ndk does not support the __thread keyword very well yet. Here // we use pthread_key_create()/pthread_getspecific()/... methods for // TLS support on android. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_skia_src_base_SkContainers.cpp b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_skia_src_ports_SkMemory__malloc.cpp similarity index 62% rename from www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_skia_src_base_SkContainers.cpp rename to www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_skia_src_ports_SkMemory__malloc.cpp index ab6b16f68ba7..09e8778f60fe 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_skia_src_base_SkContainers.cpp +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_skia_src_ports_SkMemory__malloc.cpp @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/skia/src/base/SkContainers.cpp.orig 2023-03-09 06:31:50 UTC -+++ src/3rdparty/chromium/third_party/skia/src/base/SkContainers.cpp -@@ -14,7 +14,7 @@ +--- src/3rdparty/chromium/third_party/skia/src/ports/SkMemory_malloc.cpp.orig 2024-04-19 13:02:56 UTC ++++ src/3rdparty/chromium/third_party/skia/src/ports/SkMemory_malloc.cpp +@@ -15,7 +15,7 @@ #if defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_IOS) #include @@ -9,12 +9,12 @@ #include #elif defined(SK_BUILD_FOR_WIN) #include -@@ -38,7 +38,7 @@ SkSpan 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/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_speech-dispatcher_libspeechd__version.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_speech-dispatcher_libspeechd__version.h index bf60f642c6b5..3515635669e4 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_speech-dispatcher_libspeechd__version.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_speech-dispatcher_libspeechd__version.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/speech-dispatcher/libspeechd_version.h.orig 2023-12-10 06:10:27 UTC +--- src/3rdparty/chromium/third_party/speech-dispatcher/libspeechd_version.h.orig 2024-04-19 13:02:56 UTC +++ src/3rdparty/chromium/third_party/speech-dispatcher/libspeechd_version.h @@ -0,0 +1,29 @@ +/* @@ -19,7 +19,7 @@ + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + * -+ * $Id: libspeechd.h,v 1.29 2008-07-30 09:47:00 hanke Exp $ ++ * $Id: patch-third_party_speech-dispatcher_libspeechd_version_h,v 1.4 2024/03/22 13:10:56 robert Exp $ + */ + +#ifndef _LIBSPEECHD_VERSION_H diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_speech-dispatcher_speechd__types.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_speech-dispatcher_speechd__types.h new file mode 100644 index 000000000000..39e9e04e0fdc --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_speech-dispatcher_speechd__types.h @@ -0,0 +1,142 @@ +--- src/3rdparty/chromium/third_party/speech-dispatcher/speechd_types.h.orig 2023-12-10 06:10:27 UTC ++++ src/3rdparty/chromium/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 . ++ */ ++ ++#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/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_sqlite_src_amalgamation_sqlite3.c b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_sqlite_src_amalgamation_sqlite3.c index 3f16d6e1eb52..c81074d0e206 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_sqlite_src_amalgamation_sqlite3.c +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_sqlite_src_amalgamation_sqlite3.c @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/sqlite/src/amalgamation/sqlite3.c.orig 2024-07-03 01:14:49 UTC +--- src/3rdparty/chromium/third_party/sqlite/src/amalgamation/sqlite3.c.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/third_party/sqlite/src/amalgamation/sqlite3.c -@@ -14049,7 +14049,7 @@ struct fts5_api { +@@ -14187,7 +14187,7 @@ struct fts5_api { ** But _XOPEN_SOURCE define causes problems for Mac OS X, so omit ** it. */ @@ -9,7 +9,7 @@ # define _XOPEN_SOURCE 600 #endif -@@ -44505,7 +44505,12 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB +@@ -45183,7 +45183,12 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB memset(zBuf, 0, nBuf); randomnessPid = osGetpid(0); #if !defined(SQLITE_TEST) && !defined(SQLITE_OMIT_RANDOMNESS) @@ -22,7 +22,7 @@ int fd, got; fd = robust_open("/dev/urandom", O_RDONLY, 0); if( fd<0 ){ -@@ -44520,6 +44525,7 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB +@@ -45198,6 +45203,7 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB robust_close(0, fd, __LINE__); } } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_test__fonts_fontconfig_fontconfig__util__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_test__fonts_fontconfig_fontconfig__util__linux.cc index 2166d1d0e2eb..6bf4c39e4fa7 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_test__fonts_fontconfig_fontconfig__util__linux.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_test__fonts_fontconfig_fontconfig__util__linux.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/test_fonts/fontconfig/fontconfig_util_linux.cc.orig 2022-03-25 21:59:56 UTC +--- src/3rdparty/chromium/third_party/test_fonts/fontconfig/fontconfig_util_linux.cc.orig 2024-03-22 08:19:40 UTC +++ src/3rdparty/chromium/third_party/test_fonts/fontconfig/fontconfig_util_linux.cc @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be @@ -9,7 +9,7 @@ #include "third_party/test_fonts/fontconfig/fontconfig_util_linux.h" #include -@@ -15,11 +17,15 @@ +@@ -16,11 +18,15 @@ namespace test_fonts { std::string GetSysrootDir() { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_tflite_features.gni b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_tflite_features.gni index 01a0aae1f45c..398051689021 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_tflite_features.gni +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_tflite_features.gni @@ -1,14 +1,13 @@ ---- src/3rdparty/chromium/third_party/tflite/features.gni.orig 2023-12-10 06:10:27 UTC +--- src/3rdparty/chromium/third_party/tflite/features.gni.orig 2024-07-30 11:12:21 UTC +++ src/3rdparty/chromium/third_party/tflite/features.gni -@@ -8,9 +8,9 @@ declare_args() { +@@ -9,8 +9,8 @@ declare_args() { # This enables building TFLite with XNNPACK. Currently only available for - # Linux or macOS arm64/x64 and Windows x64 targets. + # Linux, macOS and Windows arm64/x64/x86 targets and ChromeOS non-ARM 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 +- (is_win || is_mac || is_linux || (is_chromeos && overlay_include_cbx)) && +- (current_cpu == "arm64" || current_cpu == "x64" || current_cpu == "x86") ++ ((is_win || is_mac || is_linux || (is_chromeos && overlay_include_cbx)) && ++ (current_cpu == "arm64" || current_cpu == "x64" || current_cpu == "x86")) && !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/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_vulkan-deps_vulkan-loader_src_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_vulkan-loader_src_BUILD.gn similarity index 54% rename from www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_vulkan-deps_vulkan-loader_src_BUILD.gn rename to www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_vulkan-loader_src_BUILD.gn index 46c8cd31b8fc..014f9e62f94c 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_vulkan-deps_vulkan-loader_src_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_vulkan-loader_src_BUILD.gn @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/vulkan-deps/vulkan-loader/src/BUILD.gn.orig 2024-02-23 21:04:38 UTC -+++ src/3rdparty/chromium/third_party/vulkan-deps/vulkan-loader/src/BUILD.gn -@@ -59,7 +59,7 @@ config("vulkan_internal_config") { +--- src/3rdparty/chromium/third_party/vulkan-loader/src/BUILD.gn.orig 2024-09-30 07:45:04 UTC ++++ src/3rdparty/chromium/third_party/vulkan-loader/src/BUILD.gn +@@ -57,7 +57,7 @@ config("vulkan_internal_config") { defines += [ "SYSCONFDIR=\"/etc\"", "FALLBACK_CONFIG_DIRS=\"/etc/xdg\"", diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_vulkan-deps_vulkan-loader_src_loader_vk__loader__platform.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_vulkan-loader_src_loader_vk__loader__platform.h similarity index 72% rename from www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_vulkan-deps_vulkan-loader_src_loader_vk__loader__platform.h rename to www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_vulkan-loader_src_loader_vk__loader__platform.h index 646c371497af..37ae7cd6fe68 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_vulkan-deps_vulkan-loader_src_loader_vk__loader__platform.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_vulkan-loader_src_loader_vk__loader__platform.h @@ -1,5 +1,5 @@ ---- src/3rdparty/chromium/third_party/vulkan-deps/vulkan-loader/src/loader/vk_loader_platform.h.orig 2024-02-23 21:04:38 UTC -+++ src/3rdparty/chromium/third_party/vulkan-deps/vulkan-loader/src/loader/vk_loader_platform.h +--- src/3rdparty/chromium/third_party/vulkan-loader/src/loader/vk_loader_platform.h.orig 2024-07-30 11:12:21 UTC ++++ src/3rdparty/chromium/third_party/vulkan-loader/src/loader/vk_loader_platform.h @@ -327,7 +327,15 @@ static inline char *loader_platform_executable_path(ch return buffer; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_vulkan-deps_vulkan-validation-layers_src_layers_external_vma_vk__mem__alloc.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_vulkan-validation-layers_src_layers_external_vma_vk__mem__alloc.h similarity index 65% rename from www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_vulkan-deps_vulkan-validation-layers_src_layers_external_vma_vk__mem__alloc.h rename to www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_vulkan-validation-layers_src_layers_external_vma_vk__mem__alloc.h index 262b38b443fc..8f3ef04b564d 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_vulkan-deps_vulkan-validation-layers_src_layers_external_vma_vk__mem__alloc.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_vulkan-validation-layers_src_layers_external_vma_vk__mem__alloc.h @@ -1,5 +1,5 @@ ---- src/3rdparty/chromium/third_party/vulkan-deps/vulkan-validation-layers/src/layers/external/vma/vk_mem_alloc.h.orig 2023-05-31 08:12:17 UTC -+++ src/3rdparty/chromium/third_party/vulkan-deps/vulkan-validation-layers/src/layers/external/vma/vk_mem_alloc.h +--- src/3rdparty/chromium/third_party/vulkan-validation-layers/src/layers/external/vma/vk_mem_alloc.h.orig 2024-07-30 11:12:21 UTC ++++ src/3rdparty/chromium/third_party/vulkan-validation-layers/src/layers/external/vma/vk_mem_alloc.h @@ -2740,7 +2740,7 @@ static void* vma_aligned_alloc(size_t alignment, size_ return memalign(alignment, size); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_wayland_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_wayland_BUILD.gn index e7d1cf81aa50..d7cb5a70271a 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_wayland_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_wayland_BUILD.gn @@ -1,14 +1,14 @@ ---- src/3rdparty/chromium/third_party/wayland/BUILD.gn.orig 2023-02-08 15:40:14 UTC +--- src/3rdparty/chromium/third_party/wayland/BUILD.gn.orig 2024-08-26 12:06:38 UTC +++ src/3rdparty/chromium/third_party/wayland/BUILD.gn -@@ -22,6 +22,11 @@ config("wayland_config") { - "src/src", - ] +@@ -24,6 +24,11 @@ if (!use_system_libwayland) { + "src/src", + ] -+ if (is_bsd) { -+ include_dirs += [ "/usr/local/include/libepoll-shim" ] -+ libs = [ "epoll-shim" ] -+ } ++ if (is_bsd) { ++ include_dirs += [ "/usr/local/include/libepoll-shim" ] ++ libs = [ "epoll-shim" ] ++ } + - # Client/Server headers are automatically generated. Though, we still need - # to pass the path where these headers are located. - include_dirs += [ "$root_gen_dir/third_party/wayland/src/protocol" ] + # Client/Server headers are automatically generated. Though, we still need + # to pass the path where these headers are located. + include_dirs += [ "$root_gen_dir/third_party/wayland/src/protocol" ] diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_BUILD.gn index 1648b6afef4a..3f06c1d92a9e 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_BUILD.gn @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/webrtc/BUILD.gn.orig 2023-11-03 10:09:45 UTC +--- src/3rdparty/chromium/third_party/webrtc/BUILD.gn.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/third_party/webrtc/BUILD.gn -@@ -217,6 +217,9 @@ config("common_inherited_config") { +@@ -218,6 +218,9 @@ config("common_inherited_config") { if (is_linux || is_chromeos) { defines += [ "WEBRTC_LINUX" ] } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_modules_audio__device_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_modules_audio__device_BUILD.gn index 45deaee82683..04ae386f8f52 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_modules_audio__device_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_modules_audio__device_BUILD.gn @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/webrtc/modules/audio_device/BUILD.gn.orig 2024-01-30 07:53:34 UTC +--- src/3rdparty/chromium/third_party/webrtc/modules/audio_device/BUILD.gn.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/third_party/webrtc/modules/audio_device/BUILD.gn -@@ -350,7 +350,7 @@ rtc_library("audio_device_impl") { +@@ -330,7 +330,7 @@ rtc_library("audio_device_impl") { if (rtc_use_dummy_audio_file_devices) { defines += [ "WEBRTC_DUMMY_FILE_DEVICES" ] } else { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_modules_desktop__capture_linux_x11_x__server__pixel__buffer.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_modules_desktop__capture_linux_x11_x__server__pixel__buffer.cc index ced8e98eea09..a1a6bb2215db 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_modules_desktop__capture_linux_x11_x__server__pixel__buffer.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_modules_desktop__capture_linux_x11_x__server__pixel__buffer.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/linux/x11/x_server_pixel_buffer.cc.orig 2023-04-28 17:01:32 UTC +--- src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/linux/x11/x_server_pixel_buffer.cc.orig 2024-05-21 18:07:39 UTC +++ src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/linux/x11/x_server_pixel_buffer.cc @@ -203,6 +203,12 @@ bool XServerPixelBuffer::Init(XAtomCache* cache, Windo void XServerPixelBuffer::InitShm(const XWindowAttributes& attributes) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_modules_video__capture_linux_pipewire__session.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_modules_video__capture_linux_pipewire__session.cc new file mode 100644 index 000000000000..68f7bff58eec --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_modules_video__capture_linux_pipewire__session.cc @@ -0,0 +1,20 @@ +--- src/3rdparty/chromium/third_party/webrtc/modules/video_capture/linux/pipewire_session.cc.orig 2025-03-29 00:50:57 UTC ++++ src/3rdparty/chromium/third_party/webrtc/modules/video_capture/linux/pipewire_session.cc +@@ -85,7 +85,7 @@ PipeWireNode::PipeWireNode(PipeWireSession* session, + .param = OnNodeParam, + }; + +- pw_node_add_listener(proxy_, &node_listener_, &node_events, this); ++ pw_node_add_listener(reinterpret_cast(proxy_), &node_listener_, &node_events, this); + } + + // static +@@ -117,7 +117,7 @@ void PipeWireNode::OnNodeInfo(void* data, const pw_nod + uint32_t id = info->params[i].id; + if (id == SPA_PARAM_EnumFormat && + info->params[i].flags & SPA_PARAM_INFO_READ) { +- pw_node_enum_params(that->proxy_, 0, id, 0, UINT32_MAX, nullptr); ++ pw_node_enum_params(reinterpret_cast(that->proxy_), 0, id, 0, UINT32_MAX, nullptr); + break; + } + } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_modules_video__coding_codecs_av1_libaom__av1__encoder.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_modules_video__coding_codecs_av1_libaom__av1__encoder.cc new file mode 100644 index 000000000000..1a078ee9204c --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_modules_video__coding_codecs_av1_libaom__av1__encoder.cc @@ -0,0 +1,23 @@ +--- src/3rdparty/chromium/third_party/webrtc/modules/video_coding/codecs/av1/libaom_av1_encoder.cc.orig 2024-10-22 08:31:56 UTC ++++ src/3rdparty/chromium/third_party/webrtc/modules/video_coding/codecs/av1/libaom_av1_encoder.cc +@@ -299,7 +299,9 @@ int LibaomAv1Encoder::InitEncode(const VideoCodec* cod + SET_ENCODER_PARAM_OR_RETURN_ERROR(AV1E_SET_ENABLE_PALETTE, 0); + } + ++#ifdef notyet + SET_ENCODER_PARAM_OR_RETURN_ERROR(AV1E_SET_AUTO_TILES, 1); ++#endif + SET_ENCODER_PARAM_OR_RETURN_ERROR(AV1E_SET_ROW_MT, 1); + SET_ENCODER_PARAM_OR_RETURN_ERROR(AV1E_SET_ENABLE_OBMC, 0); + SET_ENCODER_PARAM_OR_RETURN_ERROR(AV1E_SET_NOISE_SENSITIVITY, 0); +@@ -332,8 +334,10 @@ int LibaomAv1Encoder::InitEncode(const VideoCodec* cod + SET_ENCODER_PARAM_OR_RETURN_ERROR(AV1E_SET_MAX_REFERENCE_FRAMES, 3); + + if (adaptive_max_consec_drops_) { ++#ifdef notyet + SET_ENCODER_PARAM_OR_RETURN_ERROR(AV1E_SET_MAX_CONSEC_FRAME_DROP_MS_CBR, + 250); ++#endif + } + + return WEBRTC_VIDEO_CODEC_OK; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_ip__address.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_ip__address.cc index 103962e0ee55..5e11cac038dd 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_ip__address.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_ip__address.cc @@ -1,9 +1,9 @@ ---- src/3rdparty/chromium/third_party/webrtc/rtc_base/ip_address.cc.orig 2022-05-19 14:06:27 UTC +--- src/3rdparty/chromium/third_party/webrtc/rtc_base/ip_address.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/third_party/webrtc/rtc_base/ip_address.cc -@@ -13,7 +13,8 @@ - #include - - #include "absl/strings/string_view.h" +@@ -14,7 +14,8 @@ + #include + #include + #if defined(WEBRTC_POSIX) -#ifdef OPENBSD +#if defined(WEBRTC_BSD) +#include diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_network.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_network.cc index 38d531526387..4f86f6a943b0 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_network.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_network.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/webrtc/rtc_base/network.cc.orig 2023-05-31 08:12:17 UTC +--- src/3rdparty/chromium/third_party/webrtc/rtc_base/network.cc.orig 2024-06-17 12:56:06 UTC +++ src/3rdparty/chromium/third_party/webrtc/rtc_base/network.cc -@@ -292,7 +292,12 @@ AdapterType GetAdapterTypeFromName(absl::string_view n +@@ -290,7 +290,12 @@ AdapterType GetAdapterTypeFromName(absl::string_view n } #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_physical__socket__server.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_physical__socket__server.cc index 1700f7c7a37b..81c8c969fb9b 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_physical__socket__server.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_physical__socket__server.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc.orig 2023-12-10 06:10:27 UTC +--- src/3rdparty/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc.orig 2024-06-17 12:56:06 UTC +++ src/3rdparty/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc -@@ -53,7 +53,7 @@ +@@ -54,7 +54,7 @@ #include "rtc_base/time_utils.h" #include "system_wrappers/include/field_trial.h" @@ -9,7 +9,7 @@ #include #endif -@@ -73,7 +73,7 @@ typedef void* SockOptArg; +@@ -74,7 +74,7 @@ typedef void* SockOptArg; #endif // WEBRTC_POSIX @@ -18,7 +18,7 @@ int64_t GetSocketRecvTimestamp(int socket) { struct timeval tv_ioctl; -@@ -307,7 +307,7 @@ int PhysicalSocket::GetOption(Option opt, int* value) +@@ -329,7 +329,7 @@ int PhysicalSocket::GetOption(Option opt, int* value) return -1; } if (opt == OPT_DONTFRAGMENT) { @@ -27,7 +27,7 @@ *value = (*value != IP_PMTUDISC_DONT) ? 1 : 0; #endif } else if (opt == OPT_DSCP) { -@@ -325,7 +325,7 @@ int PhysicalSocket::SetOption(Option opt, int value) { +@@ -358,7 +358,7 @@ int PhysicalSocket::SetOption(Option opt, int value) { if (TranslateOption(opt, &slevel, &sopt) == -1) return -1; if (opt == OPT_DONTFRAGMENT) { @@ -36,7 +36,7 @@ value = (value) ? IP_PMTUDISC_DO : IP_PMTUDISC_DONT; #endif } else if (opt == OPT_DSCP) { -@@ -353,7 +353,7 @@ int PhysicalSocket::SetOption(Option opt, int value) { +@@ -389,7 +389,7 @@ int PhysicalSocket::SetOption(Option opt, int value) { int PhysicalSocket::Send(const void* pv, size_t cb) { int sent = DoSend( s_, reinterpret_cast(pv), static_cast(cb), @@ -45,7 +45,7 @@ // 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 -@@ -382,7 +382,7 @@ int PhysicalSocket::SendTo(const void* buffer, +@@ -418,7 +418,7 @@ int PhysicalSocket::SendTo(const void* buffer, size_t len = addr.ToSockAddrStorage(&saddr); int sent = DoSendTo(s_, static_cast(buffer), static_cast(length), @@ -54,7 +54,7 @@ // Suppress SIGPIPE. See above for explanation. MSG_NOSIGNAL, #else -@@ -641,7 +641,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* s +@@ -697,7 +697,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* s *slevel = IPPROTO_IP; *sopt = IP_DONTFRAGMENT; break; @@ -63,3 +63,52 @@ RTC_LOG(LS_WARNING) << "Socket::OPT_DONTFRAGMENT not supported."; return -1; #elif defined(WEBRTC_POSIX) +@@ -746,7 +746,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; +@@ -766,10 +766,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; +@@ -777,12 +786,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/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_system__wrappers_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_system__wrappers_BUILD.gn index a3da8095119b..caba1a50eb65 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_system__wrappers_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_system__wrappers_BUILD.gn @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/webrtc/system_wrappers/BUILD.gn.orig 2022-05-19 14:06:27 UTC +--- src/3rdparty/chromium/third_party/webrtc/system_wrappers/BUILD.gn.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/third_party/webrtc/system_wrappers/BUILD.gn -@@ -64,8 +64,6 @@ rtc_library("system_wrappers") { +@@ -62,8 +62,6 @@ rtc_library("system_wrappers") { if (!build_with_chromium) { sources += [ "source/cpu_features_linux.cc" ] } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_zlib_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_zlib_BUILD.gn index 41955e083550..ab61976895bd 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_zlib_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_zlib_BUILD.gn @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/zlib/BUILD.gn.orig 2024-07-03 01:14:49 UTC +--- src/3rdparty/chromium/third_party/zlib/BUILD.gn.orig 2025-02-21 12:29:33 UTC +++ src/3rdparty/chromium/third_party/zlib/BUILD.gn @@ -140,7 +140,7 @@ if (use_arm_neon_optimizations) { defines = [ "CRC32_ARMV8_CRC32" ] @@ -20,7 +20,7 @@ } else { assert(false, "Unsupported ARM OS") } -@@ -461,7 +465,7 @@ static_library("bundled_minizip") { +@@ -467,7 +471,7 @@ static_library("bundled_minizip") { ] } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_zlib_cpu__features.c b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_zlib_cpu__features.c index 38c136535f1c..213b2ed0022c 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_zlib_cpu__features.c +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_zlib_cpu__features.c @@ -1,16 +1,16 @@ ---- src/3rdparty/chromium/third_party/zlib/cpu_features.c.orig 2023-12-12 22:08:45 UTC +--- src/3rdparty/chromium/third_party/zlib/cpu_features.c.orig 2025-02-21 12:29:33 UTC +++ src/3rdparty/chromium/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 #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 #elif defined(ARMV8_OS_IOS) #include @@ -21,16 +21,15 @@ #elif !defined(_MSC_VER) #include #else -@@ -62,7 +67,7 @@ static void _cpu_check_features(void); - 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) || defined(__ARM_NEON__) || defined(__ARM_NEON) -+#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(__ARM_NEON__) || defined(__ARM_NEON) || defined(ARMV8_OS_OPENBSD) || defined(ARMV8_OS_FREEBSD) +@@ -80,6 +85,7 @@ void ZLIB_INTERNAL cpu_check_features(void) + } + #elif defined(ARMV8_OS_ANDROID) || defined(ARMV8_OS_LINUX) || \ + defined(ARMV8_OS_MACOS) || defined(ARMV8_OS_FUCHSIA) || \ ++ defined(ARMV8_OS_OPENBSD) || defined(ARMV8_OS_FREEBSD) || \ + defined(X86_NOT_WINDOWS) || defined(ARMV8_OS_IOS) || \ + defined(RISCV_RVV) || defined(__ARM_NEON__) || defined(__ARM_NEON) #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 +120,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); @@ -43,7 +42,7 @@ + if (ID_AA64ISAR0_AES(cpu_id) >= ID_AA64ISAR0_AES_PMULL) + arm_cpu_enable_pmull = 1; + -+ if (ID_AA64ISAR0_AES(cpu_id) >= ID_AA64ISAR0_CRC32_BASE) ++ if (ID_AA64ISAR0_CRC32(cpu_id) >= ID_AA64ISAR0_CRC32_BASE) + arm_cpu_enable_crc32 = 1; #elif defined(ARMV8_OS_FUCHSIA) uint32_t features; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_json__schema__compiler_cpp__bundle__generator.py b/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_json__schema__compiler_cpp__bundle__generator.py index b418fee087af..8c8e3058857a 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_json__schema__compiler_cpp__bundle__generator.py +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_json__schema__compiler_cpp__bundle__generator.py @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/tools/json_schema_compiler/cpp_bundle_generator.py.orig 2023-03-09 06:31:50 UTC +--- src/3rdparty/chromium/tools/json_schema_compiler/cpp_bundle_generator.py.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/tools/json_schema_compiler/cpp_bundle_generator.py -@@ -149,7 +149,7 @@ class CppBundleGenerator(object): +@@ -145,7 +145,7 @@ class CppBundleGenerator(object): # BUILDFLAG(IS_CHROMEOS) && BUILDFLAG(IS_CHROMEOS_LACROS). ifdefs.append('BUILDFLAG(IS_CHROMEOS_LACROS)') elif platform == Platforms.LINUX: diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_json__schema__compiler_feature__compiler.py b/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_json__schema__compiler_feature__compiler.py index be848ce8a25c..d14e0a2140b4 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_json__schema__compiler_feature__compiler.py +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_json__schema__compiler_feature__compiler.py @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/tools/json_schema_compiler/feature_compiler.py.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/tools/json_schema_compiler/feature_compiler.py.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/tools/json_schema_compiler/feature_compiler.py -@@ -276,6 +276,8 @@ FEATURE_GRAMMAR = ({ +@@ -292,6 +292,8 @@ FEATURE_GRAMMAR = ({ 'linux': 'Feature::LINUX_PLATFORM', 'mac': 'Feature::MACOSX_PLATFORM', 'win': 'Feature::WIN_PLATFORM', diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_licenses_licenses.py b/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_licenses_licenses.py index 40c86a180de7..85c41ee32a37 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_licenses_licenses.py +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_licenses_licenses.py @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/tools/licenses/licenses.py.orig 2024-07-03 01:14:49 UTC +--- src/3rdparty/chromium/tools/licenses/licenses.py.orig 2025-02-21 12:29:33 UTC +++ src/3rdparty/chromium/tools/licenses/licenses.py -@@ -816,6 +816,8 @@ def _GnBinary(): +@@ -808,6 +808,8 @@ def _GnBinary(): exe = 'gn' if sys.platform.startswith('linux'): subdir = 'linux64' diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_perf_chrome__telemetry__build_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_perf_chrome__telemetry__build_BUILD.gn index 7c9e33b9cd26..cfc61425b967 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_perf_chrome__telemetry__build_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_perf_chrome__telemetry__build_BUILD.gn @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/tools/perf/chrome_telemetry_build/BUILD.gn.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/tools/perf/chrome_telemetry_build/BUILD.gn.orig 2024-08-26 12:06:38 UTC +++ src/3rdparty/chromium/tools/perf/chrome_telemetry_build/BUILD.gn @@ -47,7 +47,7 @@ group("telemetry_chrome_test") { data_deps += [ "//chrome:reorder_imports" ] @@ -6,7 +6,7 @@ - if (is_linux || is_chromeos) { + if ((is_linux || is_chromeos) && !is_bsd) { - data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] + data_deps += [ "//third_party/breakpad:dump_syms" ] # CrOS currently has issues with the locally compiled version of @@ -178,7 +178,7 @@ group("telemetry_chrome_test_without_chrome") { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_protoc__wrapper_protoc__wrapper.py b/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_protoc__wrapper_protoc__wrapper.py index 30a967525268..b3d720dc241a 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_protoc__wrapper_protoc__wrapper.py +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_protoc__wrapper_protoc__wrapper.py @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/tools/protoc_wrapper/protoc_wrapper.py.orig 2023-10-11 18:22:24 UTC +--- src/3rdparty/chromium/tools/protoc_wrapper/protoc_wrapper.py.orig 2024-05-21 18:07:39 UTC +++ src/3rdparty/chromium/tools/protoc_wrapper/protoc_wrapper.py -@@ -179,15 +179,19 @@ def main(argv): +@@ -183,15 +183,19 @@ def main(argv): if not options.exclude_imports: protoc_cmd += ["--include_imports"] diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_aura_screen__ozone.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_aura_screen__ozone.cc index f66a6917a4aa..136e02bc4205 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_aura_screen__ozone.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_aura_screen__ozone.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/aura/screen_ozone.cc.orig 2023-11-03 10:09:45 UTC +--- src/3rdparty/chromium/ui/aura/screen_ozone.cc.orig 2024-07-30 11:12:21 UTC +++ src/3rdparty/chromium/ui/aura/screen_ozone.cc -@@ -106,7 +106,7 @@ display::Display ScreenOzone::GetPrimaryDisplay() cons +@@ -107,7 +107,7 @@ display::Display ScreenOzone::GetPrimaryDisplay() cons return platform_screen_->GetPrimaryDisplay(); } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_aura_screen__ozone.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_aura_screen__ozone.h index 5e097f1f16ef..01ad82c1b112 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_aura_screen__ozone.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_aura_screen__ozone.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/aura/screen_ozone.h.orig 2023-11-03 10:09:45 UTC +--- src/3rdparty/chromium/ui/aura/screen_ozone.h.orig 2024-07-30 11:12:21 UTC +++ src/3rdparty/chromium/ui/aura/screen_ozone.h -@@ -44,7 +44,7 @@ class AURA_EXPORT ScreenOzone : public display::Screen +@@ -45,7 +45,7 @@ class AURA_EXPORT ScreenOzone : public display::Screen display::Display GetDisplayMatching( const gfx::Rect& match_rect) const override; display::Display GetPrimaryDisplay() const override; @@ -9,7 +9,7 @@ std::unique_ptr SuspendScreenSaver() override; #endif // BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) -@@ -71,7 +71,7 @@ class AURA_EXPORT ScreenOzone : public display::Screen +@@ -74,7 +74,7 @@ class AURA_EXPORT ScreenOzone : public display::Screen ui::PlatformScreen* platform_screen() { return platform_screen_.get(); } private: diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_clipboard_clipboard__non__backed.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_clipboard_clipboard__non__backed.cc index 25287459f212..90b88dfb648b 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_clipboard_clipboard__non__backed.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_clipboard_clipboard__non__backed.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/base/clipboard/clipboard_non_backed.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/ui/base/clipboard/clipboard_non_backed.cc.orig 2024-06-17 12:56:06 UTC +++ src/3rdparty/chromium/ui/base/clipboard/clipboard_non_backed.cc -@@ -460,7 +460,7 @@ ClipboardNonBacked::ClipboardNonBacked() { +@@ -461,7 +461,7 @@ ClipboardNonBacked::ClipboardNonBacked() { // so create internal clipboards for platform supported clipboard buffers. constexpr ClipboardBuffer kClipboardBuffers[] = { ClipboardBuffer::kCopyPaste, diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_cursor_cursor__factory.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_cursor_cursor__factory.cc index 3c8c2dc646ff..32bf4a48c5e7 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_cursor_cursor__factory.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_cursor_cursor__factory.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/base/cursor/cursor_factory.cc.orig 2023-09-13 12:11:42 UTC +--- src/3rdparty/chromium/ui/base/cursor/cursor_factory.cc.orig 2024-03-22 08:19:40 UTC +++ src/3rdparty/chromium/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/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_dragdrop_os__exchange__data__provider__factory.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_dragdrop_os__exchange__data__provider__factory.cc index 76a7c0d40c15..6c1463995d3e 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_dragdrop_os__exchange__data__provider__factory.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_dragdrop_os__exchange__data__provider__factory.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ui/base/dragdrop/os_exchange_data_provider_factory.cc.orig 2024-07-03 01:14:49 UTC +--- src/3rdparty/chromium/ui/base/dragdrop/os_exchange_data_provider_factory.cc.orig 2025-02-21 12:29:33 UTC +++ src/3rdparty/chromium/ui/base/dragdrop/os_exchange_data_provider_factory.cc @@ -7,7 +7,7 @@ #include "base/notreached.h" diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_dragdrop_os__exchange__data__provider__non__backed.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_dragdrop_os__exchange__data__provider__non__backed.cc index f68957e592b9..9008177cfd17 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_dragdrop_os__exchange__data__provider__non__backed.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_dragdrop_os__exchange__data__provider__non__backed.cc @@ -1,9 +1,9 @@ ---- src/3rdparty/chromium/ui/base/dragdrop/os_exchange_data_provider_non_backed.cc.orig 2023-11-03 10:09:45 UTC +--- src/3rdparty/chromium/ui/base/dragdrop/os_exchange_data_provider_non_backed.cc.orig 2024-04-19 13:02:56 UTC +++ src/3rdparty/chromium/ui/base/dragdrop/os_exchange_data_provider_non_backed.cc -@@ -96,7 +96,7 @@ void OSExchangeDataProviderNonBacked::SetPickledData( - } +@@ -99,7 +99,7 @@ void OSExchangeDataProviderNonBacked::SetPickledData( - bool OSExchangeDataProviderNonBacked::GetString(std::u16string* data) const { + std::optional 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/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_dummy__text__input__client.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_dummy__text__input__client.cc index 402bea47cc09..f4abb292551e 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_dummy__text__input__client.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_dummy__text__input__client.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/base/ime/dummy_text_input_client.cc.orig 2022-10-24 13:33:33 UTC +--- src/3rdparty/chromium/ui/base/ime/dummy_text_input_client.cc.orig 2024-09-30 07:45:04 UTC +++ src/3rdparty/chromium/ui/base/ime/dummy_text_input_client.cc -@@ -159,7 +159,7 @@ bool DummyTextInputClient::ShouldDoLearning() { +@@ -163,7 +163,7 @@ bool DummyTextInputClient::ShouldDoLearning() { return false; } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_dummy__text__input__client.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_dummy__text__input__client.h index 44b628327b86..50fbeb3a7ddc 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_dummy__text__input__client.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_dummy__text__input__client.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/base/ime/dummy_text_input_client.h.orig 2022-08-31 12:19:35 UTC +--- src/3rdparty/chromium/ui/base/ime/dummy_text_input_client.h.orig 2024-09-30 07:45:04 UTC +++ src/3rdparty/chromium/ui/base/ime/dummy_text_input_client.h -@@ -65,7 +65,7 @@ class DummyTextInputClient : public TextInputClient { +@@ -67,7 +67,7 @@ class DummyTextInputClient : public TextInputClient { ukm::SourceId GetClientSourceForMetrics() const override; bool ShouldDoLearning() override; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_fake__text__input__client.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_fake__text__input__client.cc index d46504db82ba..81daef4fb7fe 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_fake__text__input__client.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_fake__text__input__client.cc @@ -1,7 +1,7 @@ ---- src/3rdparty/chromium/ui/base/ime/fake_text_input_client.cc.orig 2023-09-13 12:11:42 UTC +--- src/3rdparty/chromium/ui/base/ime/fake_text_input_client.cc.orig 2024-09-30 07:45:04 UTC +++ src/3rdparty/chromium/ui/base/ime/fake_text_input_client.cc -@@ -171,7 +171,7 @@ bool FakeTextInputClient::ShouldDoLearning() { - return false; +@@ -215,7 +215,7 @@ bool FakeTextInputClient::ShouldDoLearning() { + return should_do_learning_; } -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_fake__text__input__client.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_fake__text__input__client.h index 9d7f2c1f6dc4..c7aebb8590ac 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_fake__text__input__client.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_fake__text__input__client.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/base/ime/fake_text_input_client.h.orig 2023-09-13 12:11:42 UTC +--- src/3rdparty/chromium/ui/base/ime/fake_text_input_client.h.orig 2024-09-30 07:45:04 UTC +++ src/3rdparty/chromium/ui/base/ime/fake_text_input_client.h -@@ -74,7 +74,7 @@ class FakeTextInputClient : public TextInputClient { +@@ -101,7 +101,7 @@ class FakeTextInputClient : public TextInputClient { void SetTextEditCommandForNextKeyEvent(TextEditCommand command) override; ukm::SourceId GetClientSourceForMetrics() const override; bool ShouldDoLearning() override; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_init_input__method__initializer.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_init_input__method__initializer.cc index 42824be4b3ae..b8f40ee5711b 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_init_input__method__initializer.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_init_input__method__initializer.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ui/base/ime/init/input_method_initializer.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/ui/base/ime/init/input_method_initializer.cc.orig 2024-05-21 18:07:39 UTC +++ src/3rdparty/chromium/ui/base/ime/init/input_method_initializer.cc @@ -10,7 +10,7 @@ #include "build/chromeos_buildflags.h" diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_text__input__client.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_text__input__client.h index 6c1bcf28e30b..a9cf815f3cd1 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_text__input__client.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_text__input__client.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/base/ime/text_input_client.h.orig 2023-07-16 15:47:57 UTC +--- src/3rdparty/chromium/ui/base/ime/text_input_client.h.orig 2024-09-30 07:45:04 UTC +++ src/3rdparty/chromium/ui/base/ime/text_input_client.h -@@ -265,7 +265,7 @@ class COMPONENT_EXPORT(UI_BASE_IME) TextInputClient +@@ -268,7 +268,7 @@ class COMPONENT_EXPORT(UI_BASE_IME) TextInputClient { // fields that are considered 'private' (e.g. in incognito tabs). virtual bool ShouldDoLearning() = 0; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_resource_resource__bundle.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_resource_resource__bundle.cc index 787c2f3e0406..c230737179fd 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_resource_resource__bundle.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_resource_resource__bundle.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/base/resource/resource_bundle.cc.orig 2024-01-30 07:53:34 UTC +--- src/3rdparty/chromium/ui/base/resource/resource_bundle.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/ui/base/resource/resource_bundle.cc -@@ -926,7 +926,7 @@ void ResourceBundle::ReloadFonts() { +@@ -914,7 +914,7 @@ void ResourceBundle::ReloadFonts() { } ResourceScaleFactor ResourceBundle::GetMaxResourceScaleFactor() const { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ui__base__features.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ui__base__features.cc index 93466cb53673..05f2a3caf372 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ui__base__features.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ui__base__features.cc @@ -1,6 +1,15 @@ ---- src/3rdparty/chromium/ui/base/ui_base_features.cc.orig 2024-07-03 01:14:49 UTC +--- src/3rdparty/chromium/ui/base/ui_base_features.cc.orig 2025-02-21 12:29:33 UTC +++ src/3rdparty/chromium/ui/base/ui_base_features.cc -@@ -217,7 +217,7 @@ BASE_FEATURE(kUiCompositorScrollWithLayers, +@@ -165,7 +165,7 @@ BASE_FEATURE(kWaylandTextInputV3, + base::FEATURE_DISABLED_BY_DEFAULT); + #endif // BUILDFLAG(IS_OZONE) + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // If this feature is enabled, users not specify --ozone-platform-hint switch + // will get --ozone-platform-hint=auto treatment. https://crbug.com/40250220. + COMPONENT_EXPORT(UI_BASE_FEATURES) +@@ -278,7 +278,7 @@ BASE_FEATURE(kUiCompositorScrollWithLayers, // Enables the use of a touch fling curve that is based on the behavior of // native apps on Windows. @@ -9,7 +18,7 @@ (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_ASH) && \ !BUILDFLAG(IS_CHROMEOS_LACROS)) BASE_FEATURE(kExperimentalFlingAnimation, -@@ -321,7 +321,7 @@ bool IsForcedColorsEnabled() { +@@ -385,7 +385,7 @@ bool IsForcedColorsEnabled() { // and Linux. This feature will be released for other platforms in later // milestones. #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ui__base__features.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ui__base__features.h new file mode 100644 index 000000000000..2aca842bce0d --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ui__base__features.h @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/ui/base/ui_base_features.h.orig 2025-02-21 12:29:33 UTC ++++ src/3rdparty/chromium/ui/base/ui_base_features.h +@@ -143,7 +143,7 @@ BASE_DECLARE_FEATURE(kWaylandTextInputV3); + BASE_DECLARE_FEATURE(kWaylandTextInputV3); + #endif // BUILDFLAG(IS_OZONE) + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + COMPONENT_EXPORT(UI_BASE_FEATURES) + BASE_DECLARE_FEATURE(kOverrideDefaultOzonePlatformHintToAuto); + #endif // BUILDFLAG(IS_LINUX) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ui__base__switches.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ui__base__switches.cc index 77cebb838ff9..1b6bc2753dd7 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ui__base__switches.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ui__base__switches.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ui/base/ui_base_switches.cc.orig 2023-10-11 18:22:24 UTC +--- src/3rdparty/chromium/ui/base/ui_base_switches.cc.orig 2024-08-26 12:06:38 UTC +++ src/3rdparty/chromium/ui/base/ui_base_switches.cc @@ -31,13 +31,13 @@ const char kShowMacOverlayBorders[] = "show-mac-overla const char kEnableResourcesFileSharing[] = "enable-resources-file-sharing"; @@ -15,4 +15,4 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Specify the toolkit used to construct the Linux GUI. const char kUiToolkitFlag[] = "ui-toolkit"; - #endif + // Disables GTK IME integration. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ui__base__switches.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ui__base__switches.h index 4c9288b0f702..d56dc938eaeb 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ui__base__switches.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ui__base__switches.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ui/base/ui_base_switches.h.orig 2023-10-11 18:22:24 UTC +--- src/3rdparty/chromium/ui/base/ui_base_switches.h.orig 2024-08-26 12:06:38 UTC +++ src/3rdparty/chromium/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[]; @@ -12,5 +12,5 @@ -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) COMPONENT_EXPORT(UI_BASE) extern const char kUiToolkitFlag[]; + COMPONENT_EXPORT(UI_BASE) extern const char kDisableGtkIme[]; #endif - diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_webui_web__ui__util.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_webui_web__ui__util.cc index f7849af69cf1..f90c9d5e3421 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_webui_web__ui__util.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_webui_web__ui__util.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/base/webui/web_ui_util.cc.orig 2024-07-03 01:14:49 UTC +--- src/3rdparty/chromium/ui/base/webui/web_ui_util.cc.orig 2025-02-21 12:29:33 UTC +++ src/3rdparty/chromium/ui/base/webui/web_ui_util.cc -@@ -41,7 +41,7 @@ std::string GetFontFamilyMd() { +@@ -46,7 +46,7 @@ std::string GetFontFamilyMd() { constexpr float kMaxScaleFactor = 1000.0f; std::string GetFontFamilyMd() { @@ -9,9 +9,9 @@ return "Roboto, " + GetFontFamily(); #else return GetFontFamily(); -@@ -219,7 +219,7 @@ std::string GetFontFamily() { +@@ -223,7 +223,7 @@ std::string GetFontFamily() { - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // TODO(crbug.com/40118868): 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) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_x_x11__cursor__loader.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_x_x11__cursor__loader.cc index 4f1eb7994537..29d078f52f2f 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_x_x11__cursor__loader.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_x_x11__cursor__loader.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/base/x/x11_cursor_loader.cc.orig 2024-01-30 07:53:34 UTC +--- src/3rdparty/chromium/ui/base/x/x11_cursor_loader.cc.orig 2024-08-26 12:06:38 UTC +++ src/3rdparty/chromium/ui/base/x/x11_cursor_loader.cc -@@ -31,7 +31,7 @@ +@@ -34,7 +34,7 @@ #include "ui/gfx/x/connection.h" #include "ui/gfx/x/xproto.h" @@ -9,7 +9,7 @@ #include "ui/linux/linux_ui.h" #endif -@@ -137,7 +137,11 @@ std::string CursorPathFromLibXcursor() { +@@ -59,7 +59,11 @@ std::string CursorPathFromLibXcursor() { void operator()(void* ptr) const { dlclose(ptr); } }; @@ -21,7 +21,7 @@ if (!lib) return ""; -@@ -248,7 +252,7 @@ scoped_refptr ReadCursorFile( +@@ -170,7 +174,7 @@ scoped_refptr ReadCursorFile( const std::string& rm_xcursor_theme) { constexpr const char kDefaultTheme[] = "default"; std::string themes[] = { @@ -30,7 +30,7 @@ // The toolkit theme has the highest priority. LinuxUi::instance() ? LinuxUi::instance()->GetCursorThemeName() : std::string(), -@@ -440,7 +444,7 @@ uint32_t XCursorLoader::GetPreferredCursorSize() const +@@ -359,7 +363,7 @@ uint32_t XCursorLoader::GetPreferredCursorSize() const return size; } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_x_x11__display__manager.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_x_x11__display__manager.cc index 0b034320ddc4..409d104e2151 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_x_x11__display__manager.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_x_x11__display__manager.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/base/x/x11_display_manager.cc.orig 2024-01-30 07:53:34 UTC +--- src/3rdparty/chromium/ui/base/x/x11_display_manager.cc.orig 2024-03-22 08:19:40 UTC +++ src/3rdparty/chromium/ui/base/x/x11_display_manager.cc -@@ -15,7 +15,7 @@ +@@ -16,7 +16,7 @@ #include "ui/gfx/x/randr.h" #include "ui/gfx/x/xproto.h" @@ -9,7 +9,7 @@ #include "ui/linux/linux_ui.h" #endif -@@ -91,7 +91,7 @@ void XDisplayManager::FetchDisplayList() { +@@ -92,7 +92,7 @@ void XDisplayManager::FetchDisplayList() { ? display::Display::GetForcedDeviceScaleFactor() : 1.0f}; const auto* display_config = &empty_display_config; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_x_x11__display__util.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_x_x11__display__util.cc deleted file mode 100644 index a0fc5fcd453e..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_x_x11__display__util.cc +++ /dev/null @@ -1,364 +0,0 @@ ---- src/3rdparty/chromium/ui/base/x/x11_display_util.cc.orig 2024-02-23 21:04:38 UTC -+++ src/3rdparty/chromium/ui/base/x/x11_display_util.cc -@@ -12,7 +12,6 @@ - #include - - #include "base/bits.h" --#include "base/containers/flat_map.h" - #include "base/logging.h" - #include "base/numerics/clamped_math.h" - #include "base/ranges/algorithm.h" -@@ -26,7 +25,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" -@@ -41,86 +39,42 @@ constexpr std::pair kMinVersionXra - - constexpr const char kRandrEdidProperty[] = "EDID"; - --std::map GetMonitors( -- const x11::Response& reply) { -- std::map 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 GetMonitors( -+ std::pair version, -+ x11::RandR* randr, -+ x11::Window window) { -+ std::map output_to_monitor; -+ if (version >= std::pair{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 GetWorkAreaFuture( -- x11::Connection* connection) { -- return connection->GetProperty({ -- .window = connection->default_root(), -- .property = connection->GetAtom("_NET_WORKAREA"), -- .long_length = 4, -- }); --} -- --gfx::Rect GetWorkAreaSync(x11::Future 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(); -- return gfx::Rect(value[0], value[1], value[2], value[3]); --} -- --x11::Future 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::max(), -- }); -- future.IgnoreError(); -- return future; --} -- --gfx::ICCProfile GetIccProfileSync(x11::Future 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 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* 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 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 -@@ -202,9 +156,14 @@ int DefaultBitsPerComponent() { - return visual.bits_per_rgb_value; - } - --// Get the EDID data from the `output` and stores to `edid`. --std::vector GetEdidProperty( -- x11::Response response) { -+// Get the EDID data from the |output| and stores to |edid|. -+std::vector 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 edid; - if (response && response->format == 8 && response->type != x11::Atom::None) { - edid = std::move(response->data); -@@ -256,8 +215,7 @@ gfx::PointF DisplayOriginPxToDip(const display::Displa - std::vector 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); - -@@ -283,10 +241,7 @@ std::vector GetFallbackDisplayList( - - std::vector 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; - } - -@@ -301,17 +256,7 @@ std::vector BuildDisplaysFromXRandRI - auto& randr = connection->randr(); - auto x_root_window = ui::GetX11RootWindow(); - std::vector displays; -- -- auto resources_future = randr.GetScreenResourcesCurrent({x_root_window}); -- auto output_primary_future = randr.GetOutputPrimary({x_root_window}); -- x11::Future monitors_future; -- if (connection->randr_version() >= std::pair{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); -@@ -320,65 +265,21 @@ std::vector BuildDisplaysFromXRandRI - const int depth = connection->default_screen().root_depth; - const int bits_per_component = DefaultBitsPerComponent(); - -- auto output_primary = output_primary_future.Sync(); -+ std::map 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(1, monitors_reply->monitors.size()) : 1; -- - int explicit_primary_display_index = -1; - int monitor_order_primary_display_index = -1; - -- std::vector> 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> 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> 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> 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 crtcs; -- for (size_t i = 0; i < resources->crtcs.size(); ++i) { -- crtcs.emplace(resources->crtcs[i], crtc_futures[i].Sync()); -- } -- -- std::vector 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; - } -@@ -393,16 +294,15 @@ std::vector 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(output_id))); - auto output_32 = static_cast(output_id); - int64_t display_id = - output_32 > 0xff ? 0 : edid_parser.GetIndexBasedDisplayId(output_32); -@@ -457,9 +357,8 @@ std::vector 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 -@@ -504,24 +403,63 @@ std::vector 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(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/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_x_x11__shm__image__pool.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_x_x11__shm__image__pool.cc index 5a9731a9dc50..b23e59b5388f 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_x_x11__shm__image__pool.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_x_x11__shm__image__pool.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ui/base/x/x11_shm_image_pool.cc.orig 2023-03-09 06:31:50 UTC +--- src/3rdparty/chromium/ui/base/x/x11_shm_image_pool.cc.orig 2024-04-19 13:02:56 UTC +++ src/3rdparty/chromium/ui/base/x/x11_shm_image_pool.cc @@ -16,6 +16,7 @@ #include "base/functional/callback.h" @@ -23,17 +23,35 @@ } 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; } @@ -42,7 +60,7 @@ // 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/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_x_x11__util.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_x_x11__util.cc deleted file mode 100644 index 0c640bc94f8b..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_x_x11__util.cc +++ /dev/null @@ -1,23 +0,0 @@ ---- src/3rdparty/chromium/ui/base/x/x11_util.cc.orig 2024-02-23 21:04:38 UTC -+++ src/3rdparty/chromium/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 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/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_x_x11__util.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_x_x11__util.h deleted file mode 100644 index 97ed1e50acc4..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_x_x11__util.h +++ /dev/null @@ -1,13 +0,0 @@ ---- src/3rdparty/chromium/ui/base/x/x11_util.h.orig 2024-02-23 21:04:38 UTC -+++ src/3rdparty/chromium/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/qt6-webengine/files/patch-src_3rdparty_chromium_ui_color_color__id.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_color_color__id.h index e8c59f2ace28..a7b4fd5fb9e6 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_color_color__id.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_color_color__id.h @@ -1,9 +1,9 @@ ---- src/3rdparty/chromium/ui/color/color_id.h.orig 2024-01-30 07:53:34 UTC +--- src/3rdparty/chromium/ui/color/color_id.h.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/ui/color/color_id.h -@@ -610,7 +610,7 @@ - E_CPONLY(kColorNativeColor6) \ - E_CPONLY(kColorNativeBaseColor) \ - E_CPONLY(kColorNativeSecondaryColor) +@@ -622,7 +622,7 @@ + \ + E_CPONLY(kColorCrosSysPositive) \ + E_CPONLY(kColorCrosSysComplementVariant) -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #define PLATFORM_SPECIFIC_COLOR_IDS \ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_color_color__provider__utils.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_color_color__provider__utils.cc index fb973da7740d..fb329027ed84 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_color_color__provider__utils.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_color_color__provider__utils.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/color/color_provider_utils.cc.orig 2023-12-10 06:10:27 UTC +--- src/3rdparty/chromium/ui/color/color_provider_utils.cc.orig 2024-08-26 12:06:38 UTC +++ src/3rdparty/chromium/ui/color/color_provider_utils.cc -@@ -187,7 +187,7 @@ base::StringPiece SystemThemeName(ui::SystemTheme syst +@@ -187,7 +187,7 @@ std::string_view SystemThemeName(ui::SystemTheme syste switch (system_theme) { case ui::SystemTheme::kDefault: return "kDefault"; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_compositor_compositor.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_compositor_compositor.cc index 8f1c7922259d..36f7889e1894 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_compositor_compositor.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_compositor_compositor.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/compositor/compositor.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/ui/compositor/compositor.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/ui/compositor/compositor.cc -@@ -894,7 +894,7 @@ void Compositor::OnResume() { +@@ -925,7 +925,7 @@ void Compositor::OnResume() { obs.ResetIfActive(); } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_compositor_compositor.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_compositor_compositor.h index aadafe45bd4c..d6e97bc3ee6e 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_compositor_compositor.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_compositor_compositor.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/compositor/compositor.h.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/ui/compositor/compositor.h.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/ui/compositor/compositor.h -@@ -461,7 +461,7 @@ class COMPOSITOR_EXPORT Compositor : public base::Powe +@@ -457,7 +457,7 @@ class COMPOSITOR_EXPORT Compositor : public base::Powe // base::PowerSuspendObserver: void OnResume() override; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_compositor_compositor__observer.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_compositor_compositor__observer.h index 1a26e88d0926..86fca6b9535c 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_compositor_compositor__observer.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_compositor_compositor__observer.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/compositor/compositor_observer.h.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/ui/compositor/compositor_observer.h.orig 2024-06-17 12:56:06 UTC +++ src/3rdparty/chromium/ui/compositor/compositor_observer.h -@@ -46,7 +46,7 @@ class COMPOSITOR_EXPORT CompositorObserver { +@@ -52,7 +52,7 @@ class COMPOSITOR_EXPORT CompositorObserver { // Called when a child of the compositor is resizing. virtual void OnCompositingChildResizing(Compositor* compositor) {} diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_display_screen.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_display_screen.cc index fe5c5793c05f..772c78480f49 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_display_screen.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_display_screen.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/display/screen.cc.orig 2022-10-24 13:33:33 UTC +--- src/3rdparty/chromium/ui/display/screen.cc.orig 2024-07-30 11:12:21 UTC +++ src/3rdparty/chromium/ui/display/screen.cc -@@ -85,7 +85,7 @@ void Screen::SetDisplayForNewWindows(int64_t display_i +@@ -86,7 +86,7 @@ void Screen::SetDisplayForNewWindows(int64_t display_i display_id_for_new_windows_ = display_id; } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_display_screen.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_display_screen.h index 3f62297573c9..d28651d96a0e 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_display_screen.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_display_screen.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/display/screen.h.orig 2024-01-30 07:53:34 UTC +--- src/3rdparty/chromium/ui/display/screen.h.orig 2024-07-30 11:12:21 UTC +++ src/3rdparty/chromium/ui/display/screen.h -@@ -131,7 +131,7 @@ class DISPLAY_EXPORT Screen { +@@ -140,7 +140,7 @@ class DISPLAY_EXPORT Screen { // (both of which may or may not be `nearest_id`). display::ScreenInfos GetScreenInfosNearestDisplay(int64_t nearest_id) const; @@ -9,7 +9,7 @@ // Object which suspends the platform-specific screensaver for the duration of // its existence. class ScreenSaverSuspender { -@@ -231,7 +231,7 @@ class DISPLAY_EXPORT Screen { +@@ -248,7 +248,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/qt6-webengine/files/patch-src_3rdparty_chromium_ui_events_devices_x11_device__data__manager__x11.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_events_devices_x11_device__data__manager__x11.cc index 72248055ffe8..23c04fd8b8ea 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_events_devices_x11_device__data__manager__x11.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_events_devices_x11_device__data__manager__x11.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/events/devices/x11/device_data_manager_x11.cc.orig 2024-01-30 07:53:34 UTC +--- src/3rdparty/chromium/ui/events/devices/x11/device_data_manager_x11.cc.orig 2024-09-30 07:45:04 UTC +++ src/3rdparty/chromium/ui/events/devices/x11/device_data_manager_x11.cc -@@ -844,6 +844,7 @@ void DeviceDataManagerX11::SetDisabledKeyboardAllowedK +@@ -849,6 +849,7 @@ void DeviceDataManagerX11::SetDisabledKeyboardAllowedK } void DeviceDataManagerX11::DisableDevice(x11::Input::DeviceId deviceid) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_events_event.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_events_event.cc index e866b2c80f83..0f635f2b6987 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_events_event.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_events_event.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/events/event.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/ui/events/event.cc.orig 2024-09-30 07:45:04 UTC +++ src/3rdparty/chromium/ui/events/event.cc -@@ -438,7 +438,7 @@ std::string LocatedEvent::ToString() const { +@@ -366,7 +366,7 @@ std::string LocatedEvent::ToString() const { MouseEvent::MouseEvent(const PlatformEvent& native_event) : LocatedEvent(native_event), changed_button_flags_(GetChangedMouseButtonFlagsFromNative(native_event)), @@ -9,7 +9,7 @@ movement_(GetMouseMovementFromNative(native_event)), #endif pointer_details_(GetMousePointerDetailsFromNative(native_event)) { -@@ -689,7 +689,7 @@ std::unique_ptr MouseWheelEvent::Clone() const +@@ -622,7 +622,7 @@ std::unique_ptr MouseWheelEvent::Clone() const return std::make_unique(*this); } @@ -18,7 +18,7 @@ // This value matches Windows, Fuchsia WHEEL_DELTA, and (roughly) Firefox on // Linux. // static -@@ -949,7 +949,7 @@ void KeyEvent::InitializeNative() { +@@ -882,7 +882,7 @@ void KeyEvent::InitializeNative() { if (synthesize_key_repeat_enabled_ && IsRepeated(GetLastKeyEvent())) SetFlags(flags() | EF_IS_REPEAT); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_events_keycodes_dom_keycode__converter.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_events_keycodes_dom_keycode__converter.cc index c12cdf17a173..07118d8c6847 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_events_keycodes_dom_keycode__converter.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_events_keycodes_dom_keycode__converter.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/events/keycodes/dom/keycode_converter.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/ui/events/keycodes/dom/keycode_converter.cc.orig 2024-09-30 07:45:04 UTC +++ src/3rdparty/chromium/ui/events/keycodes/dom/keycode_converter.cc -@@ -11,7 +11,7 @@ +@@ -18,7 +18,7 @@ #include "ui/events/keycodes/dom/dom_code.h" #include "ui/events/keycodes/dom/dom_key.h" @@ -9,7 +9,7 @@ #include #endif -@@ -24,7 +24,7 @@ namespace { +@@ -31,7 +31,7 @@ namespace { #if BUILDFLAG(IS_WIN) #define DOM_CODE(usb, evdev, xkb, win, mac, code, id) \ { usb, win, code } @@ -18,7 +18,7 @@ #define DOM_CODE(usb, evdev, xkb, win, mac, code, id) \ { usb, xkb, code } #elif BUILDFLAG(IS_APPLE) -@@ -63,7 +63,7 @@ struct DomKeyMapEntry { +@@ -70,7 +70,7 @@ struct DomKeyMapEntry { #undef DOM_KEY_UNI #undef DOM_KEY_MAP_DECLARATION_END @@ -27,7 +27,7 @@ // The offset between XKB Keycode and evdev code. constexpr int kXkbKeycodeOffset = 8; -@@ -184,7 +184,7 @@ int KeycodeConverter::DomCodeToNativeKeycode(DomCode c +@@ -191,7 +191,7 @@ int KeycodeConverter::DomCodeToNativeKeycode(DomCode c return UsbKeycodeToNativeKeycode(static_cast(code)); } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_events_keycodes_dom_keycode__converter.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_events_keycodes_dom_keycode__converter.h index a1ff40b6b263..5f88b4f7fd89 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_events_keycodes_dom_keycode__converter.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_events_keycodes_dom_keycode__converter.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/events/keycodes/dom/keycode_converter.h.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/ui/events/keycodes/dom/keycode_converter.h.orig 2024-06-17 12:56:06 UTC +++ src/3rdparty/chromium/ui/events/keycodes/dom/keycode_converter.h -@@ -63,7 +63,7 @@ class KeycodeConverter { +@@ -64,7 +64,7 @@ class KeycodeConverter { // Convert a DomCode into a native keycode. static int DomCodeToNativeKeycode(DomCode code); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_events_ozone_layout_xkb_xkb__keyboard__layout__engine.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_events_ozone_layout_xkb_xkb__keyboard__layout__engine.cc index f2d5da99c984..754d5ef5276c 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_events_ozone_layout_xkb_xkb__keyboard__layout__engine.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_events_ozone_layout_xkb_xkb__keyboard__layout__engine.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc.orig 2024-07-03 01:14:49 UTC +--- src/3rdparty/chromium/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc.orig 2025-02-21 12:29:33 UTC +++ src/3rdparty/chromium/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc -@@ -640,7 +640,7 @@ void LoadKeymap(const std::string& layout_name, +@@ -647,7 +647,7 @@ void LoadKeymap(const std::string& layout_name, .options = ""}; std::unique_ptr context; context.reset(xkb_context_new(XKB_CONTEXT_NO_DEFAULT_INCLUDES)); @@ -9,7 +9,7 @@ std::unique_ptr keymap; keymap.reset(xkb_keymap_new_from_names(context.get(), &names, XKB_KEYMAP_COMPILE_NO_FLAGS)); -@@ -674,7 +674,7 @@ XkbKeyboardLayoutEngine::XkbKeyboardLayoutEngine( +@@ -681,7 +681,7 @@ XkbKeyboardLayoutEngine::XkbKeyboardLayoutEngine( // TODO: add XKB_CONTEXT_NO_ENVIRONMENT_NAMES xkb_context_.reset(xkb_context_new(XKB_CONTEXT_NO_DEFAULT_INCLUDES)); xkb_context_include_path_append(xkb_context_.get(), diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_BUILD.gn index af2e4357efc3..9e6ae7d274e8 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_BUILD.gn @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ui/gfx/BUILD.gn.orig 2024-07-03 01:14:49 UTC +--- src/3rdparty/chromium/ui/gfx/BUILD.gn.orig 2025-02-21 12:29:33 UTC +++ src/3rdparty/chromium/ui/gfx/BUILD.gn @@ -665,7 +665,7 @@ jumbo_source_set("memory_buffer_sources") { deps += [ "//build/config/linux/libdrm" ] diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_codec_png__codec.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_codec_png__codec.cc deleted file mode 100644 index 9a21e49de835..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_codec_png__codec.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/ui/gfx/codec/png_codec.cc.orig 2023-10-11 18:22:24 UTC -+++ src/3rdparty/chromium/ui/gfx/codec/png_codec.cc -@@ -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" -+#include - #include "third_party/skia/include/core/SkBitmap.h" - #include "third_party/skia/include/core/SkColorPriv.h" - #include "third_party/skia/include/core/SkUnPreMultiply.h" diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_font__fallback__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_font__fallback__linux.cc index a7d05f81be20..1e5c4a4ca194 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_font__fallback__linux.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_font__fallback__linux.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/gfx/font_fallback_linux.cc.orig 2024-01-30 07:53:34 UTC +--- src/3rdparty/chromium/ui/gfx/font_fallback_linux.cc.orig 2024-09-30 07:45:04 UTC +++ src/3rdparty/chromium/ui/gfx/font_fallback_linux.cc -@@ -27,6 +27,8 @@ +@@ -32,6 +32,8 @@ #include "ui/gfx/linux/fontconfig_util.h" #include "ui/gfx/platform_font.h" diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_font__render__params.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_font__render__params.h index 2ec66c6f2d34..8ecb52d571a9 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_font__render__params.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_font__render__params.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/gfx/font_render_params.h.orig 2024-01-30 07:53:34 UTC +--- src/3rdparty/chromium/ui/gfx/font_render_params.h.orig 2024-04-19 13:02:56 UTC +++ src/3rdparty/chromium/ui/gfx/font_render_params.h -@@ -118,7 +118,7 @@ GFX_EXPORT FontRenderParams GetFontRenderParams( +@@ -115,7 +115,7 @@ GFX_EXPORT FontRenderParams GetFontRenderParams( const FontRenderParamsQuery& query, std::string* family_out); @@ -9,7 +9,7 @@ // Clears GetFontRenderParams()'s cache. Intended to be called by tests that are // changing Fontconfig's configuration. GFX_EXPORT void ClearFontRenderParamsCacheForTest(); -@@ -128,7 +128,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/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_font__render__params__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_font__render__params__linux.cc index 2bb10f76460d..eba7c3faca7e 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_font__render__params__linux.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_font__render__params__linux.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ui/gfx/font_render_params_linux.cc.orig 2022-08-31 12:19:35 UTC +--- src/3rdparty/chromium/ui/gfx/font_render_params_linux.cc.orig 2024-03-22 08:19:40 UTC +++ src/3rdparty/chromium/ui/gfx/font_render_params_linux.cc @@ -25,7 +25,7 @@ #include "ui/gfx/linux/fontconfig_util.h" @@ -15,6 +15,6 @@ 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/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_font__util.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_font__util.cc index 9ac5eac23a66..070d4b8a3f67 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_font__util.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_font__util.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ui/gfx/font_util.cc.orig 2022-02-28 16:54:41 UTC +--- src/3rdparty/chromium/ui/gfx/font_util.cc.orig 2024-03-22 08:19:40 UTC +++ src/3rdparty/chromium/ui/gfx/font_util.cc @@ -6,7 +6,7 @@ @@ -15,6 +15,6 @@ -#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/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_gpu__memory__buffer.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_gpu__memory__buffer.cc index 9a1e11fad117..f592b66d03a1 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_gpu__memory__buffer.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_gpu__memory__buffer.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/gfx/gpu_memory_buffer.cc.orig 2023-04-05 11:05:06 UTC +--- src/3rdparty/chromium/ui/gfx/gpu_memory_buffer.cc.orig 2024-05-21 18:07:39 UTC +++ src/3rdparty/chromium/ui/gfx/gpu_memory_buffer.cc -@@ -54,7 +54,7 @@ GpuMemoryBufferHandle GpuMemoryBufferHandle::Clone() c +@@ -55,7 +55,7 @@ GpuMemoryBufferHandle GpuMemoryBufferHandle::Clone() c handle.region = region.Duplicate(); handle.offset = offset; handle.stride = stride; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_gpu__memory__buffer.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_gpu__memory__buffer.h index 4302742fbe03..c25b04cc4427 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_gpu__memory__buffer.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_gpu__memory__buffer.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ui/gfx/gpu_memory_buffer.h.orig 2023-04-05 11:05:06 UTC +--- src/3rdparty/chromium/ui/gfx/gpu_memory_buffer.h.orig 2024-03-22 08:19:40 UTC +++ src/3rdparty/chromium/ui/gfx/gpu_memory_buffer.h @@ -15,7 +15,7 @@ #include "ui/gfx/geometry/rect.h" @@ -9,7 +9,7 @@ #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/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_linux_dmabuf__uapi.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_linux_dmabuf__uapi.h index fd0486031629..ae5856e2b271 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_linux_dmabuf__uapi.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_linux_dmabuf__uapi.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ui/gfx/linux/dmabuf_uapi.h.orig 2024-07-03 01:14:49 UTC +--- src/3rdparty/chromium/ui/gfx/linux/dmabuf_uapi.h.orig 2025-02-21 12:29:33 UTC +++ src/3rdparty/chromium/ui/gfx/linux/dmabuf_uapi.h @@ -5,12 +5,11 @@ #ifndef UI_GFX_LINUX_DMABUF_UAPI_H_ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_linux_gbm__wrapper.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_linux_gbm__wrapper.cc index 36ce1b245443..2a4d92824384 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_linux_gbm__wrapper.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_linux_gbm__wrapper.cc @@ -1,9 +1,9 @@ ---- src/3rdparty/chromium/ui/gfx/linux/gbm_wrapper.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/ui/gfx/linux/gbm_wrapper.cc.orig 2024-09-30 07:45:04 UTC +++ src/3rdparty/chromium/ui/gfx/linux/gbm_wrapper.cc -@@ -317,7 +317,7 @@ class Device final : public ui::GbmDevice { +@@ -319,7 +319,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 = + gfx::Size size_for_verification = -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) gfx::Size(1, 1); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_mojom_native__handle__types__mojom__traits.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_mojom_native__handle__types__mojom__traits.h index a188d98c6226..9b2f97eb4be0 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_mojom_native__handle__types__mojom__traits.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_mojom_native__handle__types__mojom__traits.h @@ -1,7 +1,7 @@ ---- src/3rdparty/chromium/ui/gfx/mojom/native_handle_types_mojom_traits.h.orig 2023-01-11 09:17:16 UTC +--- src/3rdparty/chromium/ui/gfx/mojom/native_handle_types_mojom_traits.h.orig 2024-03-22 08:19:40 UTC +++ src/3rdparty/chromium/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) @@ -9,7 +9,7 @@ #include "ui/gfx/native_pixmap_handle.h" #endif -@@ -25,7 +25,7 @@ +@@ -26,7 +26,7 @@ namespace mojo { @@ -18,7 +18,7 @@ template <> struct COMPONENT_EXPORT(GFX_NATIVE_HANDLE_TYPES_SHARED_MOJOM_TRAITS) StructTraitsIsCurrent(surface)); if (switched_real_contexts || virtual_context != current_virtual_context_) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__fence.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__fence.cc index 6f776755ee17..01d342dcb464 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__fence.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__fence.cc @@ -1,9 +1,9 @@ ---- src/3rdparty/chromium/ui/gl/gl_fence.cc.orig 2023-09-13 12:11:42 UTC +--- src/3rdparty/chromium/ui/gl/gl_fence.cc.orig 2024-08-26 12:06:38 UTC +++ src/3rdparty/chromium/ui/gl/gl_fence.cc -@@ -20,7 +20,7 @@ - #endif +@@ -17,7 +17,7 @@ + #include "ui/gl/gl_surface_egl.h" + #include "ui/gl/gl_version_info.h" - #if defined(USE_EGL) -#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #define USE_GL_FENCE_ANDROID_NATIVE_FENCE_SYNC diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__implementation.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__implementation.cc index cdb28850c76d..b7d6ae9bbfaf 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__implementation.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__implementation.cc @@ -1,7 +1,7 @@ ---- src/3rdparty/chromium/ui/gl/gl_implementation.cc.orig 2024-07-03 01:14:49 UTC +--- src/3rdparty/chromium/ui/gl/gl_implementation.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/ui/gl/gl_implementation.cc -@@ -286,7 +286,7 @@ GetRequestedGLImplementationFromCommandLine( - *fallback_to_software_gl = false; +@@ -253,7 +253,7 @@ GetRequestedGLImplementationFromCommandLine( + const base::CommandLine* command_line) { bool overrideUseSoftwareGL = command_line->HasSwitch(switches::kOverrideUseSoftwareGLForTests); -#if BUILDFLAG(IS_LINUX) || \ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__switches.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__switches.cc index 0b74d955e859..fc9a68f08e22 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__switches.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__switches.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ui/gl/gl_switches.cc.orig 2024-07-03 01:14:49 UTC +--- src/3rdparty/chromium/ui/gl/gl_switches.cc.orig 2025-02-21 12:29:33 UTC +++ src/3rdparty/chromium/ui/gl/gl_switches.cc @@ -12,7 +12,7 @@ #include "base/android/build_info.h" @@ -9,7 +9,7 @@ #include #include "third_party/angle/src/gpu_info_util/SystemInfo.h" // nogncheck #endif -@@ -301,7 +301,7 @@ bool IsDefaultANGLEVulkan() { +@@ -291,7 +291,7 @@ bool IsDefaultANGLEVulkan() { base::android::SDK_VERSION_Q) return false; #endif // BUILDFLAG(IS_ANDROID) @@ -18,7 +18,7 @@ angle::SystemInfo system_info; if (!angle::GetSystemInfoVulkan(&system_info)) return false; -@@ -313,7 +313,7 @@ bool IsDefaultANGLEVulkan() { +@@ -303,7 +303,7 @@ bool IsDefaultANGLEVulkan() { const auto& active_gpu = system_info.gpus[system_info.activeGPUIndex]; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_sync__control__vsync__provider.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_sync__control__vsync__provider.cc index 059a48e2cf77..d7e3ac3e98ed 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_sync__control__vsync__provider.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_sync__control__vsync__provider.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ui/gl/sync_control_vsync_provider.cc.orig 2022-02-28 16:54:41 UTC +--- src/3rdparty/chromium/ui/gl/sync_control_vsync_provider.cc.orig 2024-07-30 11:12:21 UTC +++ src/3rdparty/chromium/ui/gl/sync_control_vsync_provider.cc @@ -11,7 +11,7 @@ #include "base/trace_event/trace_event.h" @@ -24,10 +24,10 @@ TRACE_EVENT0("gpu", "SyncControlVSyncProvider::GetVSyncParameters"); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - // The actual clock used for the system time returned by glXGetSyncValuesOML - // is unspecified. In practice, the clock used is likely to be either - // CLOCK_REALTIME or CLOCK_MONOTONIC, so we compare the returned time to the -@@ -159,7 +159,7 @@ bool SyncControlVSyncProvider::GetVSyncParametersIfAva + // The actual clock used for the system time returned by + // eglGetSyncValuesCHROMIUM is unspecified. In practice, the clock used is + // likely to be either CLOCK_REALTIME or CLOCK_MONOTONIC, so we compare the +@@ -160,7 +160,7 @@ bool SyncControlVSyncProvider::GetVSyncParametersIfAva } bool SyncControlVSyncProvider::SupportGetVSyncParametersIfAvailable() const { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gtk_printing_print__dialog__gtk.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gtk_printing_print__dialog__gtk.cc index aa311ec79a5a..b45838145a10 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gtk_printing_print__dialog__gtk.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gtk_printing_print__dialog__gtk.cc @@ -1,11 +1,11 @@ ---- src/3rdparty/chromium/ui/gtk/printing/print_dialog_gtk.cc.orig 2023-11-03 10:09:45 UTC +--- src/3rdparty/chromium/ui/gtk/printing/print_dialog_gtk.cc.orig 2024-09-30 07:45:04 UTC +++ src/3rdparty/chromium/ui/gtk/printing/print_dialog_gtk.cc -@@ -433,7 +433,7 @@ void PrintDialogGtk::ShowDialog( +@@ -439,7 +439,7 @@ void PrintDialogGtk::ShowDialog( GtkPrintCapabilities cap = static_cast( GTK_PRINT_CAPABILITY_GENERATE_PDF | GTK_PRINT_CAPABILITY_PAGE_SET | GTK_PRINT_CAPABILITY_COPIES | GTK_PRINT_CAPABILITY_COLLATE | - GTK_PRINT_CAPABILITY_REVERSE); + GTK_PRINT_CAPABILITY_REVERSE | GTK_PRINT_CAPABILITY_GENERATE_PS); - gtk_print_unix_dialog_set_manual_capabilities(GTK_PRINT_UNIX_DIALOG(dialog_), - cap); - gtk_print_unix_dialog_set_embed_page_setup(GTK_PRINT_UNIX_DIALOG(dialog_), + gtk_print_unix_dialog_set_manual_capabilities( + GTK_PRINT_UNIX_DIALOG(dialog_.get()), cap); + gtk_print_unix_dialog_set_embed_page_setup( diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_message__center_views_message__popup__view.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_message__center_views_message__popup__view.cc index ef2affefba38..70e1e4f76913 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_message__center_views_message__popup__view.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_message__center_views_message__popup__view.cc @@ -1,8 +1,8 @@ ---- src/3rdparty/chromium/ui/message_center/views/message_popup_view.cc.orig 2023-12-10 06:10:27 UTC +--- src/3rdparty/chromium/ui/message_center/views/message_popup_view.cc.orig 2024-09-30 07:45:04 UTC +++ src/3rdparty/chromium/ui/message_center/views/message_popup_view.cc -@@ -135,7 +135,7 @@ void MessagePopupView::Show() { +@@ -144,7 +144,7 @@ std::unique_ptr MessagePopupView::Show( params.z_order = ui::ZOrderLevel::kFloatingWindow; - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // TODO(crbug.com/40118868): 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) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_native__theme_native__theme.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_native__theme_native__theme.h index 3fa0142466ac..9d9f5a1fe0d2 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_native__theme_native__theme.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_native__theme_native__theme.h @@ -1,8 +1,8 @@ ---- src/3rdparty/chromium/ui/native_theme/native_theme.h.orig 2023-10-11 18:22:24 UTC +--- src/3rdparty/chromium/ui/native_theme/native_theme.h.orig 2024-09-30 07:45:04 UTC +++ src/3rdparty/chromium/ui/native_theme/native_theme.h -@@ -62,7 +62,7 @@ class NATIVE_THEME_EXPORT NativeTheme { +@@ -64,7 +64,7 @@ class NATIVE_THEME_EXPORT NativeTheme { kCheckbox, - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // TODO(crbug.com/40118868): 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) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_native__theme_native__theme__base.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_native__theme_native__theme__base.cc index e6ee0753078f..bb44b065c9ac 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_native__theme_native__theme__base.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_native__theme_native__theme__base.cc @@ -1,8 +1,8 @@ ---- src/3rdparty/chromium/ui/native_theme/native_theme_base.cc.orig 2023-11-03 10:09:45 UTC +--- src/3rdparty/chromium/ui/native_theme/native_theme_base.cc.orig 2024-09-30 07:45:04 UTC +++ src/3rdparty/chromium/ui/native_theme/native_theme_base.cc -@@ -235,7 +235,7 @@ void NativeThemeBase::Paint(cc::PaintCanvas* canvas, +@@ -241,7 +241,7 @@ void NativeThemeBase::Paint(cc::PaintCanvas* canvas, break; - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // TODO(crbug.com/40118868): 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) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_common_features.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_common_features.cc index 9d319f36638e..f1411a927f3e 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_common_features.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_common_features.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ui/ozone/common/features.cc.orig 2023-05-31 08:12:17 UTC +--- src/3rdparty/chromium/ui/ozone/common/features.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/ui/ozone/common/features.cc @@ -30,7 +30,7 @@ BASE_FEATURE(kWaylandSurfaceSubmissionInPixelCoordinat // enabled. @@ -9,3 +9,12 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT +@@ -42,7 +42,7 @@ BASE_FEATURE(kWaylandFractionalScaleV1, + // protocol is supported. + BASE_FEATURE(kWaylandXdgToplevelDrag, + "WaylandXdgToplevelDrag", +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + base::FEATURE_ENABLED_BY_DEFAULT + #else + base::FEATURE_DISABLED_BY_DEFAULT diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_headless_headless__surface__factory.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_headless_headless__surface__factory.cc index 8e2195dfa204..0235f047e872 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_headless_headless__surface__factory.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_headless_headless__surface__factory.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ui/ozone/platform/headless/headless_surface_factory.cc.orig 2023-03-09 06:31:50 UTC +--- src/3rdparty/chromium/ui/ozone/platform/headless/headless_surface_factory.cc.orig 2024-08-26 12:06:38 UTC +++ src/3rdparty/chromium/ui/ozone/platform/headless/headless_surface_factory.cc @@ -34,7 +34,7 @@ #include "ui/ozone/platform/headless/headless_window_manager.h" @@ -9,7 +9,7 @@ #include "ui/ozone/platform/headless/vulkan_implementation_headless.h" #endif -@@ -281,7 +281,7 @@ std::unique_ptr +@@ -280,7 +280,7 @@ std::unique_ptr HeadlessSurfaceFactory::CreateVulkanImplementation( bool use_swiftshader, bool allow_protected_memory) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_headless_ozone__platform__headless.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_headless_ozone__platform__headless.cc index 5bd7e902a72e..88845a0545db 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_headless_ozone__platform__headless.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_headless_ozone__platform__headless.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/ozone/platform/headless/ozone_platform_headless.cc.orig 2022-07-22 17:30:31 UTC +--- src/3rdparty/chromium/ui/ozone/platform/headless/ozone_platform_headless.cc.orig 2024-03-27 13:31:02 UTC +++ src/3rdparty/chromium/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/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_headless_vulkan__implementation__headless.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_headless_vulkan__implementation__headless.cc index 91765f7c1d9e..da31d4b567bc 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_headless_vulkan__implementation__headless.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_headless_vulkan__implementation__headless.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/ozone/platform/headless/vulkan_implementation_headless.cc.orig 2023-10-11 18:22:24 UTC +--- src/3rdparty/chromium/ui/ozone/platform/headless/vulkan_implementation_headless.cc.orig 2024-03-22 08:19:40 UTC +++ src/3rdparty/chromium/ui/ozone/platform/headless/vulkan_implementation_headless.cc -@@ -117,7 +117,7 @@ VulkanImplementationHeadless::ExportVkFenceToGpuFence( +@@ -118,7 +118,7 @@ VulkanImplementationHeadless::ExportVkFenceToGpuFence( VkExternalSemaphoreHandleTypeFlagBits VulkanImplementationHeadless::GetExternalSemaphoreHandleType() { @@ -9,7 +9,7 @@ return VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_SYNC_FD_BIT; #else return VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT; -@@ -127,7 +127,7 @@ VulkanImplementationHeadless::GetExternalSemaphoreHand +@@ -128,7 +128,7 @@ VulkanImplementationHeadless::GetExternalSemaphoreHand bool VulkanImplementationHeadless::CanImportGpuMemoryBuffer( gpu::VulkanDeviceQueue* device_queue, gfx::GpuMemoryBufferType memory_buffer_type) { @@ -18,7 +18,7 @@ const auto& enabled_extensions = device_queue->enabled_extensions(); return gfx::HasExtension(enabled_extensions, VK_EXT_EXTERNAL_MEMORY_DMA_BUF_EXTENSION_NAME) && -@@ -150,7 +150,7 @@ VulkanImplementationHeadless::CreateImageFromGpuMemory +@@ -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/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_common_wayland__util.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_common_wayland__util.cc index c11324e691ba..8b8fd14d2044 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_common_wayland__util.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_common_wayland__util.cc @@ -1,11 +1,20 @@ ---- src/3rdparty/chromium/ui/ozone/platform/wayland/common/wayland_util.cc.orig 2024-01-30 07:53:34 UTC +--- src/3rdparty/chromium/ui/ozone/platform/wayland/common/wayland_util.cc.orig 2024-10-23 07:00:35 UTC +++ src/3rdparty/chromium/ui/ozone/platform/wayland/common/wayland_util.cc -@@ -335,7 +335,7 @@ void TransformToWlArray( +@@ -347,7 +347,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 + // TODO(crbug.com/40287874): `milliseconds` comes from Weston that // uses timestamp from libinput, which is different from TimeTicks. // Use EventTimeForNow(), for now. +@@ -389,7 +389,7 @@ bool MaybeHandlePlatformEventForDrag(const ui::Platfor + } + + void RecordConnectionMetrics(wl_display* display) { +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) + CHECK(display); + + // These values are logged to metrics so must not be changed. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_emulate_wayland__input__emulate.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_emulate_wayland__input__emulate.cc index 7904a961265a..f66db0380ac2 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_emulate_wayland__input__emulate.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_emulate_wayland__input__emulate.cc @@ -1,8 +1,8 @@ ---- src/3rdparty/chromium/ui/ozone/platform/wayland/emulate/wayland_input_emulate.cc.orig 2023-12-10 06:10:27 UTC +--- src/3rdparty/chromium/ui/ozone/platform/wayland/emulate/wayland_input_emulate.cc.orig 2024-03-22 08:19:40 UTC +++ src/3rdparty/chromium/ui/ozone/platform/wayland/emulate/wayland_input_emulate.cc -@@ -230,7 +230,7 @@ void WaylandInputEmulate::EmulateTouch(int action, - wayland_proxy->FlushForTesting(); +@@ -284,7 +284,7 @@ void WaylandInputEmulate::EmulateUpdateDisplay(const s } + #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_emulate_wayland__input__emulate.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_emulate_wayland__input__emulate.h index 05378af3f1e1..f21fd341c1d4 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_emulate_wayland__input__emulate.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_emulate_wayland__input__emulate.h @@ -1,8 +1,8 @@ ---- src/3rdparty/chromium/ui/ozone/platform/wayland/emulate/wayland_input_emulate.h.orig 2023-12-10 06:10:27 UTC +--- src/3rdparty/chromium/ui/ozone/platform/wayland/emulate/wayland_input_emulate.h.orig 2024-03-22 08:19:40 UTC +++ src/3rdparty/chromium/ui/ozone/platform/wayland/emulate/wayland_input_emulate.h -@@ -61,7 +61,7 @@ class WaylandInputEmulate : public wl::WaylandProxy::D - int touch_id, - uint32_t request_id); +@@ -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) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_host_wayland__connection.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_host_wayland__connection.cc new file mode 100644 index 000000000000..626835aa2501 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_host_wayland__connection.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/ui/ozone/platform/wayland/host/wayland_connection.cc.orig 2024-10-22 08:31:56 UTC ++++ src/3rdparty/chromium/ui/ozone/platform/wayland/host/wayland_connection.cc +@@ -541,7 +541,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/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_host_wayland__input__method__context.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_host_wayland__input__method__context.cc new file mode 100644 index 000000000000..4e6d27b79def --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_host_wayland__input__method__context.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/ui/ozone/platform/wayland/host/wayland_input_method_context.cc.orig 2024-09-30 07:45:04 UTC ++++ src/3rdparty/chromium/ui/ozone/platform/wayland/host/wayland_input_method_context.cc +@@ -60,7 +60,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/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_host_wayland__popup.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_host_wayland__popup.cc new file mode 100644 index 000000000000..2c7494594110 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_host_wayland__popup.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/ui/ozone/platform/wayland/host/wayland_popup.cc.orig 2024-05-21 18:07:39 UTC ++++ src/3rdparty/chromium/ui/ozone/platform/wayland/host/wayland_popup.cc +@@ -34,7 +34,7 @@ WaylandPopup::WaylandPopup(PlatformWindowDelegate* del + WaylandWindow* parent) + : WaylandWindow(delegate, connection) { + set_parent_window(parent); +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // TODO(crbug.com/330384470): Whether the popup appear depends on whether + // anchor point is outside of the parent xdg_surface. On Mutter the popup will + // not show when outside. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_host_wayland__screen.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_host_wayland__screen.cc new file mode 100644 index 000000000000..c5a663967d43 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_host_wayland__screen.cc @@ -0,0 +1,29 @@ +--- src/3rdparty/chromium/ui/ozone/platform/wayland/host/wayland_screen.cc.orig 2024-10-22 08:31:56 UTC ++++ src/3rdparty/chromium/ui/ozone/platform/wayland/host/wayland_screen.cc +@@ -46,7 +46,7 @@ + #include "ui/ozone/platform/wayland/host/org_gnome_mutter_idle_monitor.h" + #endif + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "ui/linux/linux_ui.h" + #endif + +@@ -133,7 +133,7 @@ WaylandScreen::WaylandScreen(WaylandConnection* connec + tablet_state_ = connection_->GetTabletState(); + #endif + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (auto* linux_ui = ui::LinuxUi::instance()) { + OnDeviceScaleFactorChanged(); + display_scale_factor_observer_.Observe(linux_ui); +@@ -606,7 +606,7 @@ bool WaylandScreen::VerifyOutputStateConsistentForTest + return true; + } + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + void WaylandScreen::OnDeviceScaleFactorChanged() { + if (const auto* linux_ui = ui::LinuxUi::instance()) { + const float new_font_scale = linux_ui->display_config().font_scale; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_host_wayland__screen.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_host_wayland__screen.h new file mode 100644 index 000000000000..7c040f670fb8 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_host_wayland__screen.h @@ -0,0 +1,38 @@ +--- src/3rdparty/chromium/ui/ozone/platform/wayland/host/wayland_screen.h.orig 2024-10-22 08:31:56 UTC ++++ src/3rdparty/chromium/ui/ozone/platform/wayland/host/wayland_screen.h +@@ -24,7 +24,7 @@ + #include "ui/ozone/platform/wayland/host/wayland_output.h" + #include "ui/ozone/public/platform_screen.h" + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "base/scoped_observation.h" + #include "ui/linux/device_scale_factor_observer.h" + #include "ui/linux/linux_ui.h" +@@ -44,7 +44,7 @@ class OrgGnomeMutterIdleMonitor; + + // A PlatformScreen implementation for Wayland. + class WaylandScreen : public PlatformScreen +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + , + public DeviceScaleFactorObserver + #endif +@@ -96,7 +96,7 @@ class WaylandScreen : public PlatformScreen + display::TabletState GetTabletState() const override; + #endif + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // DeviceScaleFactorObserver: + void OnDeviceScaleFactorChanged() override; + #endif +@@ -158,7 +158,7 @@ class WaylandScreen : public PlatformScreen + display::TabletState tablet_state_; + #endif + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + float font_scale_ = 1.0f; + + base::ScopedObservation diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_host_wayland__toplevel__window.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_host_wayland__toplevel__window.cc index 5b6b572ba6c8..17edc8c684a4 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_host_wayland__toplevel__window.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_host_wayland__toplevel__window.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/ozone/platform/wayland/host/wayland_toplevel_window.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/ui/ozone/platform/wayland/host/wayland_toplevel_window.cc.orig 2024-09-30 07:45:04 UTC +++ src/3rdparty/chromium/ui/ozone/platform/wayland/host/wayland_toplevel_window.cc -@@ -611,7 +611,7 @@ void WaylandToplevelWindow::HandleAuraToplevelConfigur +@@ -634,7 +634,7 @@ void WaylandToplevelWindow::HandleAuraToplevelConfigur const bool did_active_change = is_active_ != window_states.is_activated; is_active_ = window_states.is_activated; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_host_wayland__toplevel__window.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_host_wayland__toplevel__window.h index e3c1e123064d..5517b4b03c08 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_host_wayland__toplevel__window.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_host_wayland__toplevel__window.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/ozone/platform/wayland/host/wayland_toplevel_window.h.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/ui/ozone/platform/wayland/host/wayland_toplevel_window.h.orig 2024-09-30 07:45:04 UTC +++ src/3rdparty/chromium/ui/ozone/platform/wayland/host/wayland_toplevel_window.h -@@ -260,7 +260,7 @@ class WaylandToplevelWindow : public WaylandWindow, +@@ -261,7 +261,7 @@ class WaylandToplevelWindow : public WaylandWindow, // The display ID to switch to in case the state is `kFullscreen`. int64_t fullscreen_display_id_ = display::kInvalidDisplayId; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_host_wayland__window.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_host_wayland__window.cc index a136d99cb372..da50befdb630 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_host_wayland__window.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_host_wayland__window.cc @@ -1,15 +1,15 @@ ---- src/3rdparty/chromium/ui/ozone/platform/wayland/host/wayland_window.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/ui/ozone/platform/wayland/host/wayland_window.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/ui/ozone/platform/wayland/host/wayland_window.cc -@@ -235,7 +235,7 @@ void WaylandWindow::OnPointerFocusChanged(bool focused +@@ -318,7 +318,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. -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) if (focused && async_cursor_) { - async_cursor_->AddCursorLoadedCallback( - base::BindOnce(&WaylandWindow::OnCursorLoaded, -@@ -496,7 +496,7 @@ bool WaylandWindow::ShouldUseNativeFrame() const { + async_cursor_->AddCursorLoadedCallback(base::BindOnce( + &WaylandWindow::OnCursorLoaded, AsWeakPtr(), async_cursor_)); +@@ -584,7 +584,7 @@ bool WaylandWindow::ShouldUseNativeFrame() const { void WaylandWindow::SetCursor(scoped_refptr platform_cursor) { DCHECK(platform_cursor); @@ -18,7 +18,7 @@ auto async_cursor = WaylandAsyncCursor::FromPlatformCursor(platform_cursor); if (async_cursor_ == async_cursor) { -@@ -676,7 +676,7 @@ std::string WaylandWindow::WindowStates::ToString() co +@@ -795,7 +795,7 @@ std::string WaylandWindow::WindowStates::ToString() co } else { base::TrimString(states, " ", &states); } @@ -27,7 +27,7 @@ states += "; tiled_edges: "; std::string tiled = ""; if (tiled_edges.left) { -@@ -1147,12 +1147,12 @@ void WaylandWindow::UpdateCursorShape(scoped_refptrbitmaps(), hotspot_in_dips, std::ceil(cursor->cursor_image_scale_factor())); } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_host_wayland__window.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_host_wayland__window.h index f1dd7e10ba00..f923c04a91d0 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_host_wayland__window.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_host_wayland__window.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/ozone/platform/wayland/host/wayland_window.h.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/ui/ozone/platform/wayland/host/wayland_window.h.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/ui/ozone/platform/wayland/host/wayland_window.h -@@ -39,7 +39,7 @@ +@@ -41,7 +41,7 @@ #include "ui/platform_window/platform_window_init_properties.h" #include "ui/platform_window/wm/wm_drag_handler.h" @@ -9,16 +9,16 @@ #include "ui/ozone/platform/wayland/host/wayland_async_cursor.h" #endif -@@ -246,7 +246,7 @@ class WaylandWindow : public PlatformWindow, - bool is_snapped_primary = false; +@@ -285,7 +285,7 @@ class WaylandWindow : public PlatformWindow, bool is_snapped_secondary = false; bool is_floated = false; + bool is_pip = false; -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) WindowTiledEdges tiled_edges; #endif -@@ -500,7 +500,7 @@ class WaylandWindow : public PlatformWindow, +@@ -569,7 +569,7 @@ class WaylandWindow : public PlatformWindow, void UpdateCursorShape(scoped_refptr cursor); @@ -27,7 +27,7 @@ void OnCursorLoaded(scoped_refptr cursor, scoped_refptr bitmap_cursor); #endif -@@ -559,7 +559,7 @@ class WaylandWindow : public PlatformWindow, +@@ -638,7 +638,7 @@ class WaylandWindow : public PlatformWindow, wl::Object aura_surface_; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_host_xdg__toplevel__wrapper__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_host_xdg__toplevel__wrapper__impl.cc index 506aac291997..14ed518ae69b 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_host_xdg__toplevel__wrapper__impl.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_host_xdg__toplevel__wrapper__impl.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/ozone/platform/wayland/host/xdg_toplevel_wrapper_impl.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/ui/ozone/platform/wayland/host/xdg_toplevel_wrapper_impl.cc.orig 2024-09-30 07:45:04 UTC +++ src/3rdparty/chromium/ui/ozone/platform/wayland/host/xdg_toplevel_wrapper_impl.cc -@@ -315,7 +315,7 @@ void XDGToplevelWrapperImpl::OnToplevelConfigure(void* +@@ -322,7 +322,7 @@ void XDGToplevelWrapperImpl::OnToplevelConfigure(void* window_states.is_activated = CheckIfWlArrayHasValue(states, XDG_TOPLEVEL_STATE_ACTIVATED); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_host_zwp__text__input__wrapper__v1.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_host_zwp__text__input__wrapper__v1.cc index 8c52b061b82e..8bf28aefa951 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_host_zwp__text__input__wrapper__v1.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_host_zwp__text__input__wrapper__v1.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/ozone/platform/wayland/host/zwp_text_input_wrapper_v1.cc.orig 2024-01-30 07:53:34 UTC +--- src/3rdparty/chromium/ui/ozone/platform/wayland/host/zwp_text_input_wrapper_v1.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/ui/ozone/platform/wayland/host/zwp_text_input_wrapper_v1.cc -@@ -226,6 +226,10 @@ void ZWPTextInputWrapperV1::SetSurroundingText( +@@ -256,6 +256,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) { @@ -11,7 +11,7 @@ base::ScopedFD memfd(memfd_create("surrounding_text", MFD_CLOEXEC)); if (!memfd.get()) { PLOG(ERROR) << "Failed to create memfd"; -@@ -238,6 +242,7 @@ void ZWPTextInputWrapperV1::SetSurroundingText( +@@ -268,6 +272,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/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_ozone__platform__wayland.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_ozone__platform__wayland.cc index e3a7becbb65b..2171460ee99f 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_ozone__platform__wayland.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_ozone__platform__wayland.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ui/ozone/platform/wayland/ozone_platform_wayland.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/ui/ozone/platform/wayland/ozone_platform_wayland.cc.orig 2024-09-30 07:45:04 UTC +++ src/3rdparty/chromium/ui/ozone/platform/wayland/ozone_platform_wayland.cc @@ -66,13 +66,13 @@ #include "ui/events/ozone/layout/stub/stub_keyboard_layout_engine.h" @@ -34,7 +34,16 @@ linux_ui_delegate_ = std::make_unique(connection_.get()); #endif -@@ -514,7 +514,7 @@ class OzonePlatformWayland : public OzonePlatform, +@@ -343,7 +343,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 +@@ -545,7 +545,7 @@ class OzonePlatformWayland : public OzonePlatform, DrmRenderNodePathFinder path_finder_; #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_x11_vulkan__implementation__x11.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_x11_vulkan__implementation__x11.cc index 4e62f56938ea..11d0fa706ce0 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_x11_vulkan__implementation__x11.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_x11_vulkan__implementation__x11.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/ozone/platform/x11/vulkan_implementation_x11.cc.orig 2022-03-25 21:59:56 UTC +--- src/3rdparty/chromium/ui/ozone/platform/x11/vulkan_implementation_x11.cc.orig 2024-03-22 08:19:40 UTC +++ src/3rdparty/chromium/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/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_x11_x11__screen__ozone.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_x11_x11__screen__ozone.cc index 729f91ce5fe3..3e0c586a2e6b 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_x11_x11__screen__ozone.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_x11_x11__screen__ozone.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ui/ozone/platform/x11/x11_screen_ozone.cc.orig 2023-11-03 10:09:45 UTC +--- src/3rdparty/chromium/ui/ozone/platform/x11/x11_screen_ozone.cc.orig 2024-03-22 08:19:40 UTC +++ src/3rdparty/chromium/ui/ozone/platform/x11/x11_screen_ozone.cc @@ -22,7 +22,7 @@ #include "ui/ozone/platform/x11/x11_window.h" @@ -9,7 +9,7 @@ #include "ui/linux/linux_ui.h" #endif -@@ -77,7 +77,7 @@ X11ScreenOzone::X11ScreenOzone() +@@ -97,7 +97,7 @@ X11ScreenOzone::X11ScreenOzone() window_manager_(X11WindowManager::GetInstance()), x11_display_manager_(std::make_unique(this)) { DCHECK(window_manager_); @@ -18,3 +18,12 @@ 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::OnDeviceScaleFactorChanged() { + x11_display_manager_->DispatchDelayedDisplayListUpdate(); + } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_x11_x11__screen__ozone.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_x11_x11__screen__ozone.h index b7bcdaa5f21e..0d564b162cfd 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_x11_x11__screen__ozone.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_x11_x11__screen__ozone.h @@ -1,6 +1,33 @@ ---- src/3rdparty/chromium/ui/ozone/platform/x11/x11_screen_ozone.h.orig 2023-11-03 10:09:45 UTC +--- src/3rdparty/chromium/ui/ozone/platform/x11/x11_screen_ozone.h.orig 2024-03-22 08:19:40 UTC +++ src/3rdparty/chromium/ui/ozone/platform/x11/x11_screen_ozone.h -@@ -102,7 +102,7 @@ class X11ScreenOzone : public PlatformScreen, +@@ -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) + #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; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_x11_x11__window.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_x11_x11__window.cc index 5a2dd3af0f2d..cb803d961f39 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_x11_x11__window.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_x11_x11__window.cc @@ -1,11 +1,11 @@ ---- src/3rdparty/chromium/ui/ozone/platform/x11/x11_window.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/ui/ozone/platform/x11/x11_window.cc.orig 2024-09-30 07:45:04 UTC +++ src/3rdparty/chromium/ui/ozone/platform/x11/x11_window.cc -@@ -1499,7 +1499,7 @@ void X11Window::OnXWindowStateChanged() { +@@ -1504,7 +1504,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); + UpdateDecorationInsets(); #endif - } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_test_mock__platform__window__delegate.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_test_mock__platform__window__delegate.h index 1d4437f395e7..0564516bf372 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_test_mock__platform__window__delegate.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_test_mock__platform__window__delegate.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/ozone/test/mock_platform_window_delegate.h.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/ui/ozone/test/mock_platform_window_delegate.h.orig 2024-06-17 12:56:06 UTC +++ src/3rdparty/chromium/ui/ozone/test/mock_platform_window_delegate.h -@@ -32,7 +32,7 @@ class MockPlatformWindowDelegate : public PlatformWind +@@ -35,7 +35,7 @@ class MockPlatformWindowDelegate : public PlatformWind MOCK_METHOD2(OnWindowStateChanged, void(PlatformWindowState old_state, PlatformWindowState new_state)); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_platform__window_platform__window__delegate.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_platform__window_platform__window__delegate.cc index e4908db67ef5..8eefac7bb627 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_platform__window_platform__window__delegate.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_platform__window_platform__window__delegate.cc @@ -1,8 +1,8 @@ ---- src/3rdparty/chromium/ui/platform_window/platform_window_delegate.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/ui/platform_window/platform_window_delegate.cc.orig 2024-06-17 12:56:06 UTC +++ src/3rdparty/chromium/ui/platform_window/platform_window_delegate.cc -@@ -42,7 +42,7 @@ PlatformWindowDelegate::PlatformWindowDelegate() = def - - PlatformWindowDelegate::~PlatformWindowDelegate() = default; +@@ -61,7 +61,7 @@ gfx::Insets PlatformWindowDelegate::CalculateInsetsInD + return gfx::Insets(); + } -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_platform__window_platform__window__delegate.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_platform__window_platform__window__delegate.h index ec58934f7b1f..2c93359486aa 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_platform__window_platform__window__delegate.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_platform__window_platform__window__delegate.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/platform_window/platform_window_delegate.h.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/ui/platform_window/platform_window_delegate.h.orig 2024-07-30 11:12:21 UTC +++ src/3rdparty/chromium/ui/platform_window/platform_window_delegate.h -@@ -157,7 +157,7 @@ class COMPONENT_EXPORT(PLATFORM_WINDOW) PlatformWindow +@@ -181,7 +181,7 @@ class COMPONENT_EXPORT(PLATFORM_WINDOW) PlatformWindow virtual void OnWindowStateChanged(PlatformWindowState old_state, PlatformWindowState new_state) = 0; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_platform__window_platform__window__init__properties.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_platform__window_platform__window__init__properties.h index 3e5bc7e07f31..a81893a46ef0 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_platform__window_platform__window__init__properties.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_platform__window_platform__window__init__properties.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ui/platform_window/platform_window_init_properties.h.orig 2022-09-24 10:57:32 UTC +--- src/3rdparty/chromium/ui/platform_window/platform_window_init_properties.h.orig 2024-06-17 12:56:06 UTC +++ src/3rdparty/chromium/ui/platform_window/platform_window_init_properties.h @@ -56,7 +56,7 @@ class WorkspaceExtensionDelegate; class ScenicWindowDelegate; @@ -9,7 +9,7 @@ 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; @@ -17,4 +17,4 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) bool prefer_dark_theme = false; raw_ptr icon = nullptr; - absl::optional background_color; + std::optional background_color; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_controls_prefix__selector.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_controls_prefix__selector.cc index 9f7c18790a9d..1c466b503a5b 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_controls_prefix__selector.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_controls_prefix__selector.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/views/controls/prefix_selector.cc.orig 2022-09-24 10:57:32 UTC +--- src/3rdparty/chromium/ui/views/controls/prefix_selector.cc.orig 2024-09-30 07:45:04 UTC +++ src/3rdparty/chromium/ui/views/controls/prefix_selector.cc -@@ -174,7 +174,7 @@ bool PrefixSelector::ShouldDoLearning() { +@@ -178,7 +178,7 @@ bool PrefixSelector::ShouldDoLearning() { return false; } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_controls_prefix__selector.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_controls_prefix__selector.h index d515d51dbdc9..33880046fb1d 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_controls_prefix__selector.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_controls_prefix__selector.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/views/controls/prefix_selector.h.orig 2022-08-31 12:19:35 UTC +--- src/3rdparty/chromium/ui/views/controls/prefix_selector.h.orig 2024-09-30 07:45:04 UTC +++ src/3rdparty/chromium/ui/views/controls/prefix_selector.h -@@ -83,7 +83,7 @@ class VIEWS_EXPORT PrefixSelector : public ui::TextInp +@@ -85,7 +85,7 @@ class VIEWS_EXPORT PrefixSelector : public ui::TextInp ukm::SourceId GetClientSourceForMetrics() const override; bool ShouldDoLearning() override; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_controls_textfield_textfield.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_controls_textfield_textfield.cc index b3cd0826cf5c..c83e97db5670 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_controls_textfield_textfield.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_controls_textfield_textfield.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/views/controls/textfield/textfield.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/ui/views/controls/textfield/textfield.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/ui/views/controls/textfield/textfield.cc -@@ -84,7 +84,7 @@ +@@ -85,7 +85,7 @@ #include "base/win/win_util.h" #endif @@ -18,7 +18,7 @@ return flags & ui::EF_CONTROL_DOWN; #else return false; -@@ -744,7 +744,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event +@@ -761,7 +761,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event if (!textfield) return handled; @@ -27,7 +27,7 @@ auto* linux_ui = ui::LinuxUi::instance(); std::vector commands; if (!handled && linux_ui && -@@ -927,7 +927,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo +@@ -944,7 +944,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo } bool Textfield::SkipDefaultKeyEventProcessing(const ui::KeyEvent& event) { @@ -36,16 +36,16 @@ // Skip any accelerator handling that conflicts with custom keybindings. auto* linux_ui = ui::LinuxUi::instance(); std::vector commands; -@@ -1969,7 +1969,7 @@ bool Textfield::ShouldDoLearning() { +@@ -1994,7 +1994,7 @@ bool Textfield::ShouldDoLearning() { return false; } -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - // TODO(https://crbug.com/952355): Implement this method to support Korean IME + // TODO(crbug.com/41452689): Implement this method to support Korean IME // reconversion feature on native text fields (e.g. find bar). bool Textfield::SetCompositionFromExistingText( -@@ -2465,14 +2465,14 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent( +@@ -2500,14 +2500,14 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent( #endif return ui::TextEditCommand::DELETE_BACKWARD; } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_controls_textfield_textfield.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_controls_textfield_textfield.h index fbdcedef5b59..652aebc9ba44 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_controls_textfield_textfield.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_controls_textfield_textfield.h @@ -1,7 +1,7 @@ ---- src/3rdparty/chromium/ui/views/controls/textfield/textfield.h.orig 2024-01-30 07:53:34 UTC +--- src/3rdparty/chromium/ui/views/controls/textfield/textfield.h.orig 2024-09-30 07:45:04 UTC +++ src/3rdparty/chromium/ui/views/controls/textfield/textfield.h -@@ -46,7 +46,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) @@ -9,7 +9,7 @@ #include #endif -@@ -454,7 +454,7 @@ class VIEWS_EXPORT Textfield : public View, +@@ -463,7 +463,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/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_corewm_tooltip__aura.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_corewm_tooltip__aura.cc index 20dd34306bb6..18f93c58add1 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_corewm_tooltip__aura.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_corewm_tooltip__aura.cc @@ -1,8 +1,8 @@ ---- src/3rdparty/chromium/ui/views/corewm/tooltip_aura.cc.orig 2023-04-28 17:01:32 UTC +--- src/3rdparty/chromium/ui/views/corewm/tooltip_aura.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/ui/views/corewm/tooltip_aura.cc -@@ -38,7 +38,7 @@ namespace { +@@ -37,7 +37,7 @@ namespace { bool CanUseTranslucentTooltipWidget() { - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // TODO(crbug.com/40118868): Revisit the macro expression 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) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_examples_widget__example.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_examples_widget__example.cc index 767a55e6f2b7..1d47086b6d75 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_examples_widget__example.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_examples_widget__example.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/views/examples/widget_example.cc.orig 2023-01-11 09:17:16 UTC +--- src/3rdparty/chromium/ui/views/examples/widget_example.cc.orig 2024-09-30 07:45:04 UTC +++ src/3rdparty/chromium/ui/views/examples/widget_example.cc -@@ -49,7 +49,7 @@ void WidgetExample::CreateExampleView(View* container) +@@ -50,7 +50,7 @@ void WidgetExample::CreateExampleView(View* container) modal_button->SetCallback( base::BindRepeating(&WidgetExample::CreateDialogWidget, base::Unretained(this), modal_button, true)); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_focus_focus__manager.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_focus_focus__manager.cc index 56647f4fc04d..a1eae222d44e 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_focus_focus__manager.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_focus_focus__manager.cc @@ -1,17 +1,17 @@ ---- src/3rdparty/chromium/ui/views/focus/focus_manager.cc.orig 2023-08-17 07:33:31 UTC +--- src/3rdparty/chromium/ui/views/focus/focus_manager.cc.orig 2024-08-26 12:06:38 UTC +++ src/3rdparty/chromium/ui/views/focus/focus_manager.cc -@@ -577,7 +577,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi +@@ -585,7 +585,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // TODO(crbug.com/40118868): 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) // 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 +@@ -602,7 +602,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // TODO(crbug.com/40118868): 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) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_style_platform__style.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_style_platform__style.cc index ea2b48192249..fc70e97ab9cd 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_style_platform__style.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_style_platform__style.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ui/views/style/platform_style.cc.orig 2023-02-08 09:03:45 UTC +--- src/3rdparty/chromium/ui/views/style/platform_style.cc.orig 2024-03-22 08:19:40 UTC +++ src/3rdparty/chromium/ui/views/style/platform_style.cc @@ -17,7 +17,7 @@ #include "ui/views/controls/focusable_border.h" @@ -18,12 +18,12 @@ false; #else true; -@@ -58,7 +58,7 @@ const bool PlatformStyle::kAdjustBubbleIfOffscreen = - +@@ -59,7 +59,7 @@ const bool PlatformStyle::kAdjustBubbleIfOffscreen = // static - std::unique_ptr PlatformStyle::CreateScrollBar(bool is_horizontal) { + std::unique_ptr 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(is_horizontal); + return std::make_unique(orientation); #else - return std::make_unique(is_horizontal); + return std::make_unique(orientation); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_test_ui__controls__factory__desktop__aura__ozone.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_test_ui__controls__factory__desktop__aura__ozone.cc index d55588edbd7b..d3a96527382d 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_test_ui__controls__factory__desktop__aura__ozone.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_test_ui__controls__factory__desktop__aura__ozone.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/views/test/ui_controls_factory_desktop_aura_ozone.cc.orig 2023-12-10 06:10:27 UTC +--- src/3rdparty/chromium/ui/views/test/ui_controls_factory_desktop_aura_ozone.cc.orig 2024-03-22 08:19:40 UTC +++ src/3rdparty/chromium/ui/views/test/ui_controls_factory_desktop_aura_ozone.cc -@@ -284,7 +284,7 @@ bool SendTouchEventsNotifyWhenDone(int action, +@@ -296,7 +296,7 @@ void UpdateDisplaySync(const std::string& display_spec } #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.cc index 9537077cb07f..01caf1c093c1 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.cc @@ -1,7 +1,7 @@ ---- src/3rdparty/chromium/ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.cc -@@ -195,7 +195,7 @@ DragOperation DesktopDragDropClientOzone::StartDragAnd - return drag_operation_; +@@ -206,7 +206,7 @@ DragOperation DesktopDragDropClientOzone::StartDragAnd + return selected_operation_; } -#if BUILDFLAG(IS_LINUX) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.h index 77b5965e2c12..edd01820e958 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.h.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.h.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.h -@@ -65,7 +65,7 @@ class VIEWS_EXPORT DesktopDragDropClientOzone +@@ -66,7 +66,7 @@ class VIEWS_EXPORT DesktopDragDropClientOzone // The offset of |drag_widget_| relative to the mouse position. gfx::Vector2d offset; @@ -9,7 +9,7 @@ // 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() -@@ -86,7 +86,7 @@ class VIEWS_EXPORT DesktopDragDropClientOzone +@@ -87,7 +87,7 @@ class VIEWS_EXPORT DesktopDragDropClientOzone const gfx::Point& root_location, int allowed_operations, ui::mojom::DragEventSource source) override; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc index 79af15186120..bd7bd41c7569 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig 2024-09-30 07:45:04 UTC +++ src/3rdparty/chromium/ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc -@@ -45,7 +45,7 @@ +@@ -48,7 +48,7 @@ #include "ui/wm/core/window_util.h" #include "ui/wm/public/window_move_client.h" @@ -9,16 +9,7 @@ #include "ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone_linux.h" #endif -@@ -266,7 +266,7 @@ void DesktopWindowTreeHostPlatform::Init(const Widget: - if (params.type == Widget::InitParams::TYPE_WINDOW) - GetContentWindow()->SetProperty(aura::client::kAnimationsDisabledKey, true); - --#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)) - const bool requires_accelerated_widget = params.requires_accelerated_widget; - #else - const bool requires_accelerated_widget = false; -@@ -350,7 +350,7 @@ std::unique_ptr +@@ -358,7 +358,7 @@ std::unique_ptr DesktopWindowTreeHostPlatform::CreateDragDropClient() { ui::WmDragHandler* drag_handler = ui::GetWmDragHandler(*(platform_window())); std::unique_ptr drag_drop_client = @@ -27,7 +18,7 @@ std::make_unique(window(), drag_handler); #else std::make_unique(window(), drag_handler); -@@ -1092,7 +1092,7 @@ bool DesktopWindowTreeHostPlatform::RotateFocusForWidg +@@ -1175,7 +1175,7 @@ bool DesktopWindowTreeHostPlatform::RotateFocusForWidg // DesktopWindowTreeHost: // Linux subclasses this host and adds some Linux specific bits. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_desktop__aura_desktop__window__tree__host__platform__impl__interactive__uitest.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_desktop__aura_desktop__window__tree__host__platform__impl__interactive__uitest.cc index c52dad67327f..e6333332d807 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_desktop__aura_desktop__window__tree__host__platform__impl__interactive__uitest.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_desktop__aura_desktop__window__tree__host__platform__impl__interactive__uitest.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/views/widget/desktop_aura/desktop_window_tree_host_platform_impl_interactive_uitest.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/ui/views/widget/desktop_aura/desktop_window_tree_host_platform_impl_interactive_uitest.cc.orig 2024-04-19 13:02:56 UTC +++ src/3rdparty/chromium/ui/views/widget/desktop_aura/desktop_window_tree_host_platform_impl_interactive_uitest.cc -@@ -22,7 +22,7 @@ +@@ -23,7 +23,7 @@ #include "ui/views/widget/widget_delegate.h" #include "ui/views/window/native_frame_view.h" diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_root__view.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_root__view.cc index f2042772c2e9..a50d11463dee 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_root__view.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_root__view.cc @@ -1,11 +1,11 @@ ---- src/3rdparty/chromium/ui/views/widget/root_view.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/ui/views/widget/root_view.cc.orig 2025-02-21 12:29:33 UTC +++ src/3rdparty/chromium/ui/views/widget/root_view.cc -@@ -127,7 +127,7 @@ class AnnounceTextView : public View { +@@ -109,7 +109,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; + GetViewAccessibility().SetRole(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). + // TODO(crbug.com/40658933): Use live regions (do not use alerts). // May require setting kLiveStatus, kContainerLiveStatus to "polite". - node_data->role = ax::mojom::Role::kAlert; + GetViewAccessibility().SetRole(ax::mojom::Role::kAlert); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_widget.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_widget.cc index 665be7e9b3c5..b0b927dfe229 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_widget.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_widget.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/views/widget/widget.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/ui/views/widget/widget.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/ui/views/widget/widget.cc -@@ -54,7 +54,7 @@ +@@ -58,7 +58,7 @@ #include "ui/views/window/custom_frame_view.h" #include "ui/views/window/dialog_delegate.h" @@ -9,7 +9,7 @@ #include "ui/linux/linux_ui.h" #endif -@@ -2093,7 +2093,7 @@ const ui::NativeTheme* Widget::GetNativeTheme() const +@@ -2203,7 +2203,7 @@ const ui::NativeTheme* Widget::GetNativeTheme() const if (parent_) return parent_->GetNativeTheme(); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_widget.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_widget.h deleted file mode 100644 index 77b19d61d4ed..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_widget.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/ui/views/widget/widget.h.orig 2024-02-23 21:04:38 UTC -+++ src/3rdparty/chromium/ui/views/widget/widget.h -@@ -422,7 +422,7 @@ class VIEWS_EXPORT Widget : public internal::NativeWid - // If set, the widget was created in headless mode. - bool headless_mode = false; - --#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)) - // Indicates whether the desktop native widget is required for the widget. - // This may enforce changing the type of the underlying platform window. - // See crbug.com/1280332 diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_window_custom__frame__view.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_window_custom__frame__view.cc index 351cc1de60db..3597d8cd90d0 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_window_custom__frame__view.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_window_custom__frame__view.cc @@ -1,8 +1,8 @@ ---- src/3rdparty/chromium/ui/views/window/custom_frame_view.cc.orig 2022-10-24 13:33:33 UTC +--- src/3rdparty/chromium/ui/views/window/custom_frame_view.cc.orig 2024-08-26 12:06:38 UTC +++ src/3rdparty/chromium/ui/views/window/custom_frame_view.cc -@@ -266,7 +266,7 @@ int CustomFrameView::CaptionButtonY() const { +@@ -268,7 +268,7 @@ int CustomFrameView::CaptionButtonY() const { // drawn flush with the screen edge, they still obey Fitts' Law. - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // TODO(crbug.com/40118868): 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) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_window_dialog__delegate.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_window_dialog__delegate.cc index 32a1a5ad2b7a..18d6b7a75476 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_window_dialog__delegate.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_window_dialog__delegate.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/views/window/dialog_delegate.cc.orig 2023-12-10 06:10:27 UTC +--- src/3rdparty/chromium/ui/views/window/dialog_delegate.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/ui/views/window/dialog_delegate.cc -@@ -79,7 +79,7 @@ Widget* DialogDelegate::CreateDialogWidget( +@@ -105,7 +105,7 @@ Widget* DialogDelegate::CreateDialogWidget( // static bool DialogDelegate::CanSupportCustomFrame(gfx::NativeView parent) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_BUILD.gn index 8639956a10c7..429accee11d7 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_BUILD.gn @@ -1,21 +1,28 @@ ---- src/3rdparty/chromium/v8/BUILD.gn.orig 2024-07-03 01:14:49 UTC +--- src/3rdparty/chromium/v8/BUILD.gn.orig 2025-02-21 12:29:33 UTC +++ src/3rdparty/chromium/v8/BUILD.gn -@@ -1448,6 +1448,14 @@ config("toolchain") { - } else if (target_os == "chromeos") { - defines += [ "V8_HAVE_TARGET_OS" ] - defines += [ "V8_TARGET_OS_CHROMEOS" ] -+ } else if (target_os == "openbsd") { -+ defines += [ "V8_HAVE_TARGET_OS" ] -+ defines += [ "V8_TARGET_OS_OPENBSD" ] -+ defines += [ "V8_TARGET_OS_BSD" ] -+ } else if (target_os == "freebsd") { -+ defines += [ "V8_HAVE_TARGET_OS" ] -+ defines += [ "V8_TARGET_OS_FREEBSD" ] -+ defines += [ "V8_TARGET_OS_BSD" ] - } +@@ -908,6 +908,8 @@ external_v8_defines = [ + "V8_TARGET_OS_MACOS", + "V8_TARGET_OS_WIN", + "V8_TARGET_OS_CHROMEOS", ++ "V8_TARGET_OS_OPENBSD", ++ "V8_TARGET_OS_FREEBSD", + ] + + enabled_external_v8_defines = [ +@@ -984,6 +986,12 @@ if (target_os == "android") { + } else if (target_os == "chromeos") { + enabled_external_v8_defines += [ "V8_HAVE_TARGET_OS" ] + enabled_external_v8_defines += [ "V8_TARGET_OS_CHROMEOS" ] ++} else if (target_os == "openbsd") { ++ enabled_external_v8_defines += [ "V8_HAVE_TARGET_OS" ] ++ enabled_external_v8_defines += [ "V8_TARGET_OS_OPENBSD" ] ++} else if (target_os == "freebsd") { ++ enabled_external_v8_defines += [ "V8_HAVE_TARGET_OS" ] ++ enabled_external_v8_defines += [ "V8_TARGET_OS_FREEBSD" ] + } - # TODO(infra): Support v8_enable_prof on Windows. -@@ -2414,6 +2422,12 @@ template("run_mksnapshot") { + disabled_external_v8_defines = external_v8_defines - enabled_external_v8_defines +@@ -2538,6 +2546,12 @@ template("run_mksnapshot") { if (!v8_enable_builtins_profiling && v8_enable_builtins_reordering) { args += [ "--reorder-builtins" ] } @@ -27,8 +34,8 @@ + } } - # This is needed to distinguish between generating code for the simulator -@@ -6423,7 +6437,7 @@ v8_component("v8_libbase") { + if (v8_enable_turboshaft_csa) { +@@ -6704,7 +6718,7 @@ v8_component("v8_libbase") { } } @@ -37,7 +44,7 @@ sources += [ "src/base/debug/stack_trace_posix.cc", "src/base/platform/platform-linux.cc", -@@ -6434,6 +6448,18 @@ v8_component("v8_libbase") { +@@ -6715,6 +6729,18 @@ v8_component("v8_libbase") { "dl", "rt", ] diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_include_v8-internal.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_include_v8-internal.h index be06e6c22d56..2ea51316a66e 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_include_v8-internal.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_include_v8-internal.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/v8/include/v8-internal.h.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/v8/include/v8-internal.h.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/v8/include/v8-internal.h -@@ -175,7 +175,7 @@ using SandboxedPointer_t = Address; +@@ -229,7 +229,7 @@ using SandboxedPointer_t = Address; #ifdef V8_ENABLE_SANDBOX // Size of the sandbox, excluding the guard regions surrounding it. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_include_v8config.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_include_v8config.h index 33059ab89a57..65311acf12ce 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_include_v8config.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_include_v8config.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/v8/include/v8config.h.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/v8/include/v8config.h.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/v8/include/v8config.h -@@ -185,6 +185,8 @@ path. Add it with -I to the command line +@@ -201,6 +201,8 @@ path. Add it with -I to the command line && !defined(V8_TARGET_OS_FUCHSIA) \ && !defined(V8_TARGET_OS_IOS) \ && !defined(V8_TARGET_OS_LINUX) \ @@ -9,7 +9,7 @@ && !defined(V8_TARGET_OS_MACOS) \ && !defined(V8_TARGET_OS_WIN) \ && !defined(V8_TARGET_OS_CHROMEOS) -@@ -197,6 +199,8 @@ path. Add it with -I to the command line +@@ -213,6 +215,8 @@ path. Add it with -I to the command line || defined(V8_TARGET_OS_FUCHSIA) \ || defined(V8_TARGET_OS_IOS) \ || defined(V8_TARGET_OS_LINUX) \ @@ -18,12 +18,10 @@ || defined(V8_TARGET_OS_MACOS) \ || defined(V8_TARGET_OS_WIN) \ || defined(V8_TARGET_OS_CHROMEOS) -@@ -218,6 +222,16 @@ path. Add it with -I to the command line - - #ifdef V8_OS_LINUX +@@ -236,6 +240,16 @@ path. Add it with -I to the command line # define V8_TARGET_OS_LINUX -+#endif -+ + #endif + +#ifdef V8_OS_OPENBSD +# define V8_TARGET_OS_OPENBSD +# define V8_TARGET_OS_BSD @@ -32,6 +30,18 @@ +#ifdef V8_OS_FREEBSD +# define V8_TARGET_OS_OPENBSD +# define V8_TARGET_OS_BSD - #endif - ++#endif ++ #ifdef V8_OS_MACOS + # define V8_TARGET_OS_MACOS + #endif +@@ -381,7 +395,8 @@ path. Add it with -I to the command line + // preserve_most in clang >= 17 (see https://reviews.llvm.org/D143425). + #if (defined(_M_X64) || defined(__x86_64__) /* x64 (everywhere) */ \ + || ((defined(__AARCH64EL__) || defined(_M_ARM64)) /* arm64, but ... */ \ +- && !defined(_WIN32))) /* not on windows */ \ ++ && !defined(_WIN32) /* not on windows */ \ ++ && !defined(__OpenBSD__))) /* not on OpenBSD */ \ + && !defined(COMPONENT_BUILD) /* no component build */\ + && __clang_major__ >= 17 /* clang >= 17 */ + # define V8_HAS_ATTRIBUTE_PRESERVE_MOST (__has_attribute(preserve_most)) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_api_api.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_api_api.cc index 0f19a6086682..3e3ca5fb8378 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_api_api.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_api_api.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/v8/src/api/api.cc.orig 2024-02-23 21:04:38 UTC +--- src/3rdparty/chromium/v8/src/api/api.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/v8/src/api/api.cc -@@ -141,7 +141,7 @@ +@@ -149,7 +149,7 @@ #include "src/wasm/wasm-serialization.h" #endif // V8_ENABLE_WEBASSEMBLY @@ -9,7 +9,7 @@ #include #include -@@ -6393,7 +6393,7 @@ bool v8::V8::Initialize(const int build_config) { +@@ -6525,7 +6525,7 @@ bool v8::V8::Initialize(const int build_config) { return true; } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_base_platform_memory.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_base_platform_memory.h index ec0ea5f43489..b8cf280c2187 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_base_platform_memory.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_base_platform_memory.h @@ -1,16 +1,18 @@ ---- src/3rdparty/chromium/v8/src/base/platform/memory.h.orig 2023-02-08 09:03:45 UTC +--- src/3rdparty/chromium/v8/src/base/platform/memory.h.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/v8/src/base/platform/memory.h -@@ -19,11 +19,11 @@ - - #if V8_OS_DARWIN +@@ -21,13 +21,13 @@ #include --#else // !V8_OS_DARWIN -+#elif !V8_OS_BSD + #elif V8_OS_OPENBSD + #include +-#elif V8_OS_ZOS ++#elif (V8_OS_ZOS || V8_OS_BSD) + #include + #else #include - #endif // !V8_OS_DARWIN + #endif --#if (V8_OS_POSIX && !V8_OS_AIX && !V8_OS_SOLARIS) || V8_OS_WIN -+#if (V8_OS_POSIX && !V8_OS_AIX && !V8_OS_SOLARIS && !V8_OS_BSD) || V8_OS_WIN +-#if (V8_OS_POSIX && !V8_OS_AIX && !V8_OS_SOLARIS && !V8_OS_ZOS && !V8_OS_OPENBSD) || V8_OS_WIN ++#if (V8_OS_POSIX && !V8_OS_AIX && !V8_OS_SOLARIS && !V8_OS_ZOS && !V8_OS_BSD) || V8_OS_WIN #define V8_HAS_MALLOC_USABLE_SIZE 1 - #endif // (V8_OS_POSIX && !V8_OS_AIX && !V8_OS_SOLARIS) || V8_OS_WIN + #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_base_platform_platform-freebsd.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_base_platform_platform-freebsd.cc index e03d9e35b45c..3c3165a63310 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_base_platform_platform-freebsd.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_base_platform_platform-freebsd.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/v8/src/base/platform/platform-freebsd.cc.orig 2023-11-20 16:08:07 UTC +--- src/3rdparty/chromium/v8/src/base/platform/platform-freebsd.cc.orig 2022-02-07 13:39:41 UTC +++ src/3rdparty/chromium/v8/src/base/platform/platform-freebsd.cc @@ -43,14 +43,10 @@ TimezoneCache* OS::CreateTimezoneCache() { return new PosixDefaultTimezoneCache(); @@ -20,7 +20,7 @@ lib_name = std::string(path); } result.push_back(SharedLibraryAddress( -+#if defined(__i386__) || defined(__arm__) || defined(OS_FREEBSD) ++#if defined(__i386__) || defined(OS_FREEBSD) + lib_name, static_cast(map->kve_start), + static_cast(map->kve_end))); +#else diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_base_platform_platform-openbsd.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_base_platform_platform-openbsd.cc index bf245be77f38..56468ef16124 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_base_platform_platform-openbsd.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_base_platform_platform-openbsd.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/v8/src/base/platform/platform-openbsd.cc.orig 2023-04-28 17:01:32 UTC +--- src/3rdparty/chromium/v8/src/base/platform/platform-openbsd.cc.orig 2024-07-30 11:12:21 UTC +++ src/3rdparty/chromium/v8/src/base/platform/platform-openbsd.cc @@ -6,6 +6,7 @@ // POSIX-compatible parts, the implementation is in platform-posix.cc. @@ -24,5 +24,5 @@ + return reinterpret_cast(base) + ss.ss_size; +} - std::vector OS::GetFreeMemoryRangesWithin( + std::optional OS::GetFirstFreeMemoryRangeWithin( OS::Address boundary_start, OS::Address boundary_end, size_t minimum_size, diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_base_platform_platform-posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_base_platform_platform-posix.cc index 9492b6c0aec1..ee23148ec530 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_base_platform_platform-posix.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_base_platform_platform-posix.cc @@ -1,15 +1,6 @@ ---- src/3rdparty/chromium/v8/src/base/platform/platform-posix.cc.orig 2023-12-10 06:10:27 UTC +--- src/3rdparty/chromium/v8/src/base/platform/platform-posix.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/v8/src/base/platform/platform-posix.cc -@@ -54,7 +54,7 @@ - #if V8_OS_DARWIN - #include - #include --#else -+#elif !V8_OS_BSD - #include - #endif - -@@ -72,7 +72,7 @@ +@@ -75,7 +75,7 @@ #include #endif @@ -18,7 +9,7 @@ #define MAP_ANONYMOUS MAP_ANON #endif -@@ -303,8 +303,15 @@ void OS::SetRandomMmapSeed(int64_t seed) { +@@ -314,8 +314,15 @@ void OS::SetRandomMmapSeed(int64_t seed) { } } @@ -34,7 +25,7 @@ uintptr_t raw_addr; { MutexGuard guard(rng_mutex.Pointer()); -@@ -399,6 +406,7 @@ void* OS::GetRandomMmapAddr() { +@@ -416,6 +423,7 @@ void* OS::GetRandomMmapAddr() { #endif return reinterpret_cast(raw_addr); } @@ -42,8 +33,8 @@ // TODO(bbudge) Move Cygwin and Fuchsia stuff into platform-specific files. #if !V8_OS_CYGWIN && !V8_OS_FUCHSIA -@@ -672,7 +680,7 @@ void OS::DestroySharedMemoryHandle(PlatformSharedMemor - +@@ -704,7 +712,7 @@ void OS::DestroySharedMemoryHandle(PlatformSharedMemor + #if !V8_OS_ZOS // static bool OS::HasLazyCommits() { -#if V8_OS_AIX || V8_OS_LINUX || V8_OS_DARWIN @@ -51,7 +42,7 @@ return true; #else // TODO(bbudge) Return true for all POSIX platforms. -@@ -1303,7 +1311,7 @@ void Thread::SetThreadLocal(LocalStorageKey key, void* +@@ -1350,7 +1358,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/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_base_sys-info.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_base_sys-info.cc index 41b13e8453b8..18d5e64ff0d7 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_base_sys-info.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_base_sys-info.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/v8/src/base/sys-info.cc.orig 2022-02-07 13:39:41 UTC +--- src/3rdparty/chromium/v8/src/base/sys-info.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/v8/src/base/sys-info.cc -@@ -38,7 +38,7 @@ namespace base { +@@ -36,7 +36,7 @@ namespace base { // static int SysInfo::NumberOfProcessors() { #if V8_OS_OPENBSD diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_builtins_x64_builtins-x64.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_builtins_x64_builtins-x64.cc new file mode 100644 index 000000000000..b27b6c0558d8 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_builtins_x64_builtins-x64.cc @@ -0,0 +1,14 @@ +--- src/3rdparty/chromium/v8/src/builtins/x64/builtins-x64.cc.orig 2024-10-22 08:31:56 UTC ++++ src/3rdparty/chromium/v8/src/builtins/x64/builtins-x64.cc +@@ -2838,7 +2838,11 @@ void Generate_OSREntry(MacroAssembler* masm, Register + // Drop the return address on the stack and jump to the OSR entry + // point of the function. + __ Drop(1); ++#ifdef V8_ENABLE_CET_IBT ++ __ jmp(entry_address, /*notrack=*/true); ++#else + __ jmp(entry_address); ++#endif + } + + enum class OsrSourceTier { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_codegen_arm_cpu-arm.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_codegen_arm_cpu-arm.cc deleted file mode 100644 index e9c6528415ac..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_codegen_arm_cpu-arm.cc +++ /dev/null @@ -1,24 +0,0 @@ ---- src/3rdparty/chromium/v8/src/codegen/arm/cpu-arm.cc.orig 2023-11-20 16:08:07 UTC -+++ src/3rdparty/chromium/v8/src/codegen/arm/cpu-arm.cc -@@ -3,6 +3,10 @@ - // found in the LICENSE file. - - // CPU specific code for arm independent of OS goes here. -+#if V8_TARGET_ARCH_ARM -+ -+#include "src/codegen/cpu-features.h" -+ - #ifdef __arm__ - #ifdef __QNXNTO__ - #include // for cache flushing. -@@ -16,10 +20,6 @@ - #include // for cache flushing. - #endif - #endif -- --#if V8_TARGET_ARCH_ARM -- --#include "src/codegen/cpu-features.h" - - namespace v8 { - namespace internal { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_execution_isolate.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_execution_isolate.cc index f05da0a0f14f..d685d66c2d07 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_execution_isolate.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_execution_isolate.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/v8/src/execution/isolate.cc.orig 2024-10-02 15:40:01 UTC +--- src/3rdparty/chromium/v8/src/execution/isolate.cc.orig 2025-02-21 12:29:33 UTC +++ src/3rdparty/chromium/v8/src/execution/isolate.cc -@@ -148,6 +148,10 @@ +@@ -168,6 +168,10 @@ #include "src/execution/simulator-base.h" #endif @@ -11,14 +11,16 @@ 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_[]; -@@ -4226,6 +4230,11 @@ void Isolate::InitializeDefaultEmbeddedBlob() { +@@ -4973,6 +4977,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(const_cast(code)), -+ code_size, PROT_READ | PROT_EXEC); ++ if (code_size > 0) { ++ mprotect(reinterpret_cast(const_cast(code)), ++ code_size, PROT_READ | PROT_EXEC); ++ } +#endif if (StickyEmbeddedBlobCode() != nullptr) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_flags_flags.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_flags_flags.cc index dc6f0177ed9c..9bf8f2cfd29d 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_flags_flags.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_flags_flags.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/v8/src/flags/flags.cc.orig 2024-01-30 07:53:34 UTC +--- src/3rdparty/chromium/v8/src/flags/flags.cc.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/v8/src/flags/flags.cc -@@ -13,6 +13,10 @@ +@@ -16,6 +16,10 @@ #include #include @@ -9,21 +9,9 @@ +#endif + #include "src/base/functional.h" - #include "src/base/logging.h" + #include "src/base/lazy-instance.h" #include "src/base/platform/platform.h" -@@ -32,7 +36,11 @@ - namespace v8::internal { - - // Define {v8_flags}, declared in flags.h. -+#if V8_OS_OPENBSD -+FlagValues v8_flags __attribute__((section(".openbsd.mutable"))); -+#else - FlagValues v8_flags; -+#endif - - // {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 -@@ -912,6 +920,10 @@ void FlagList::FreezeFlags() { +@@ -807,6 +811,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/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_sandbox_sandbox.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_sandbox_sandbox.cc index 3825d4bd6f8f..0e6057d07456 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_sandbox_sandbox.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_sandbox_sandbox.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/v8/src/sandbox/sandbox.cc.orig 2023-02-08 09:03:45 UTC +--- src/3rdparty/chromium/v8/src/sandbox/sandbox.cc.orig 2024-08-26 12:06:38 UTC +++ src/3rdparty/chromium/v8/src/sandbox/sandbox.cc -@@ -46,7 +46,7 @@ static Address DetermineAddressSpaceLimit() { +@@ -48,7 +48,7 @@ static Address DetermineAddressSpaceLimit() { } #endif // V8_TARGET_ARCH_X64 diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_snapshot_embedded_platform-embedded-file-writer-base.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_snapshot_embedded_platform-embedded-file-writer-base.cc index 9c9ccda5cb30..8a0c68411a3c 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_snapshot_embedded_platform-embedded-file-writer-base.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_snapshot_embedded_platform-embedded-file-writer-base.cc @@ -1,9 +1,9 @@ ---- src/3rdparty/chromium/v8/src/snapshot/embedded/platform-embedded-file-writer-base.cc.orig 2023-11-03 10:09:45 UTC +--- src/3rdparty/chromium/v8/src/snapshot/embedded/platform-embedded-file-writer-base.cc.orig 2024-08-26 12:06:38 UTC +++ src/3rdparty/chromium/v8/src/snapshot/embedded/platform-embedded-file-writer-base.cc -@@ -143,6 +143,8 @@ EmbeddedTargetOs ToEmbeddedTargetOs(const char* s) { - return EmbeddedTargetOs::kWin; - } else if (string == "starboard") { +@@ -148,6 +148,8 @@ EmbeddedTargetOs ToEmbeddedTargetOs(const char* s) { return EmbeddedTargetOs::kStarboard; + } else if (string == "zos") { + return EmbeddedTargetOs::kZOS; + } else if (string == "openbsd") { + return EmbeddedTargetOs::kOpenBSD; } else { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_snapshot_embedded_platform-embedded-file-writer-base.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_snapshot_embedded_platform-embedded-file-writer-base.h index 424977f754e8..16e4ce1934a4 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_snapshot_embedded_platform-embedded-file-writer-base.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_snapshot_embedded_platform-embedded-file-writer-base.h @@ -1,9 +1,9 @@ ---- src/3rdparty/chromium/v8/src/snapshot/embedded/platform-embedded-file-writer-base.h.orig 2023-02-08 09:03:45 UTC +--- src/3rdparty/chromium/v8/src/snapshot/embedded/platform-embedded-file-writer-base.h.orig 2024-09-30 07:45:04 UTC +++ src/3rdparty/chromium/v8/src/snapshot/embedded/platform-embedded-file-writer-base.h -@@ -31,6 +31,7 @@ enum class EmbeddedTargetOs { - kMac, +@@ -36,6 +36,7 @@ enum class EmbeddedTargetOs { kWin, kStarboard, + kZOS, + kOpenBSD, kGeneric, // Everything not covered above falls in here. }; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_trap-handler_handler-inside-posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_trap-handler_handler-inside-posix.cc index 610fcff41a46..0a85b42f22e3 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_trap-handler_handler-inside-posix.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_trap-handler_handler-inside-posix.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/v8/src/trap-handler/handler-inside-posix.cc.orig 2023-12-10 06:10:27 UTC +--- src/3rdparty/chromium/v8/src/trap-handler/handler-inside-posix.cc.orig 2024-04-19 13:02:56 UTC +++ src/3rdparty/chromium/v8/src/trap-handler/handler-inside-posix.cc @@ -61,6 +61,8 @@ namespace trap_handler { #define CONTEXT_REG(reg, REG) &uc->uc_mcontext->__ss.__##reg @@ -9,7 +9,7 @@ #else #error "Unsupported platform." #endif -@@ -78,8 +80,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/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_wasm_baseline_ia32_liftoff-assembler-ia32-inl.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_wasm_baseline_ia32_liftoff-assembler-ia32-inl.h new file mode 100644 index 000000000000..91213efa1ce1 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_wasm_baseline_ia32_liftoff-assembler-ia32-inl.h @@ -0,0 +1,128 @@ +--- src/3rdparty/chromium/v8/src/wasm/baseline/ia32/liftoff-assembler-ia32-inl.h.orig 2024-10-22 08:31:56 UTC ++++ src/3rdparty/chromium/v8/src/wasm/baseline/ia32/liftoff-assembler-ia32-inl.h +@@ -512,7 +512,7 @@ void LiftoffAssembler::StoreTaggedPointer(Register dst + } + + void LiftoffAssembler::Load(LiftoffRegister dst, Register src_addr, +- Register offset_reg, uint32_t offset_imm, ++ Register offset_reg, uintptr_t offset_imm, + LoadType type, uint32_t* protected_load_pc, + bool /* is_load_mem */, bool /* i64_offset */, + bool needs_shift) { +@@ -592,7 +592,7 @@ void LiftoffAssembler::Load(LiftoffRegister dst, Regis + } + + void LiftoffAssembler::Store(Register dst_addr, Register offset_reg, +- uint32_t offset_imm, LiftoffRegister src, ++ uintptr_t offset_imm, LiftoffRegister src, + StoreType type, LiftoffRegList pinned, + uint32_t* protected_store_pc, + bool /* is_store_mem */, bool /* i64_offset */) { +@@ -671,7 +671,7 @@ void LiftoffAssembler::Store(Register dst_addr, Regist + } + + void LiftoffAssembler::AtomicLoad(LiftoffRegister dst, Register src_addr, +- Register offset_reg, uint32_t offset_imm, ++ Register offset_reg, uintptr_t offset_imm, + LoadType type, LiftoffRegList /* pinned */, + bool /* i64_offset */) { + if (type.value() != LoadType::kI64Load) { +@@ -689,7 +689,7 @@ void LiftoffAssembler::AtomicLoad(LiftoffRegister dst, + } + + void LiftoffAssembler::AtomicStore(Register dst_addr, Register offset_reg, +- uint32_t offset_imm, LiftoffRegister src, ++ uintptr_t offset_imm, LiftoffRegister src, + StoreType type, LiftoffRegList pinned, + bool /* i64_offset */) { + DCHECK_LE(offset_imm, std::numeric_limits::max()); +@@ -759,7 +759,7 @@ enum Binop { kAdd, kSub, kAnd, kOr, kXor, kExchange }; + + inline void AtomicAddOrSubOrExchange32(LiftoffAssembler* lasm, Binop binop, + Register dst_addr, Register offset_reg, +- uint32_t offset_imm, ++ uintptr_t offset_imm, + LiftoffRegister value, + LiftoffRegister result, StoreType type) { + DCHECK_EQ(value, result); +@@ -827,7 +827,7 @@ inline void AtomicAddOrSubOrExchange32(LiftoffAssemble + } + + inline void AtomicBinop32(LiftoffAssembler* lasm, Binop op, Register dst_addr, +- Register offset_reg, uint32_t offset_imm, ++ Register offset_reg, uintptr_t offset_imm, + LiftoffRegister value, LiftoffRegister result, + StoreType type) { + DCHECK_EQ(value, result); +@@ -942,7 +942,7 @@ inline void AtomicBinop32(LiftoffAssembler* lasm, Bino + } + + inline void AtomicBinop64(LiftoffAssembler* lasm, Binop op, Register dst_addr, +- Register offset_reg, uint32_t offset_imm, ++ Register offset_reg, uintptr_t offset_imm, + 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 +@@ -1038,7 +1038,7 @@ inline void AtomicBinop64(LiftoffAssembler* lasm, Bino + } // namespace liftoff + + void LiftoffAssembler::AtomicAdd(Register dst_addr, Register offset_reg, +- uint32_t offset_imm, LiftoffRegister value, ++ uintptr_t offset_imm, LiftoffRegister value, + LiftoffRegister result, StoreType type, + bool /* i64_offset */) { + if (type.value() == StoreType::kI64Store) { +@@ -1052,7 +1052,7 @@ void LiftoffAssembler::AtomicAdd(Register dst_addr, Re + } + + void LiftoffAssembler::AtomicSub(Register dst_addr, Register offset_reg, +- uint32_t offset_imm, LiftoffRegister value, ++ uintptr_t offset_imm, LiftoffRegister value, + LiftoffRegister result, StoreType type, + bool /* i64_offset */) { + if (type.value() == StoreType::kI64Store) { +@@ -1065,7 +1065,7 @@ void LiftoffAssembler::AtomicSub(Register dst_addr, Re + } + + void LiftoffAssembler::AtomicAnd(Register dst_addr, Register offset_reg, +- uint32_t offset_imm, LiftoffRegister value, ++ uintptr_t offset_imm, LiftoffRegister value, + LiftoffRegister result, StoreType type, + bool /* i64_offset */) { + if (type.value() == StoreType::kI64Store) { +@@ -1079,7 +1079,7 @@ void LiftoffAssembler::AtomicAnd(Register dst_addr, Re + } + + void LiftoffAssembler::AtomicOr(Register dst_addr, Register offset_reg, +- uint32_t offset_imm, LiftoffRegister value, ++ uintptr_t offset_imm, LiftoffRegister value, + LiftoffRegister result, StoreType type, + bool /* i64_offset */) { + if (type.value() == StoreType::kI64Store) { +@@ -1093,7 +1093,7 @@ void LiftoffAssembler::AtomicOr(Register dst_addr, Reg + } + + void LiftoffAssembler::AtomicXor(Register dst_addr, Register offset_reg, +- uint32_t offset_imm, LiftoffRegister value, ++ uintptr_t offset_imm, LiftoffRegister value, + LiftoffRegister result, StoreType type, + bool /* i64_offset */) { + if (type.value() == StoreType::kI64Store) { +@@ -1107,7 +1107,7 @@ void LiftoffAssembler::AtomicXor(Register dst_addr, Re + } + + void LiftoffAssembler::AtomicExchange(Register dst_addr, Register offset_reg, +- uint32_t offset_imm, ++ uintptr_t offset_imm, + LiftoffRegister value, + LiftoffRegister result, StoreType type, + bool /* i64_offset */) { +@@ -1122,7 +1122,7 @@ void LiftoffAssembler::AtomicExchange(Register dst_add + } + + void LiftoffAssembler::AtomicCompareExchange( +- Register dst_addr, Register offset_reg, uint32_t offset_imm, ++ Register dst_addr, Register offset_reg, uintptr_t offset_imm, + LiftoffRegister expected, LiftoffRegister new_value, LiftoffRegister result, + StoreType type, bool /* i64_offset */) { + // We expect that the offset has already been added to {dst_addr}, and no diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_tools_run.py b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_tools_run.py index 48b5966ed3c7..cab7172bb798 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_tools_run.py +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_tools_run.py @@ -1,11 +1,11 @@ ---- src/3rdparty/chromium/v8/tools/run.py.orig 2022-05-19 14:06:27 UTC +--- src/3rdparty/chromium/v8/tools/run.py.orig 2024-10-22 08:31:56 UTC +++ src/3rdparty/chromium/v8/tools/run.py -@@ -9,7 +9,7 @@ scripts.""" - import subprocess - import sys +@@ -21,7 +21,7 @@ if cmd and cmd[0] == '--redirect-stdout': + kwargs = dict(stdout=subprocess.PIPE) + cmd = cmd[2:] --result = subprocess.call(sys.argv[1:]) -+sys.exit(subprocess.call(sys.argv[1:], env={"LD_LIBRARY_PATH":"${WRKSRC}/out/Release"})) - if result != 0: - # Windows error codes such as 0xC0000005 and 0xC0000409 are much easier - # to recognize and differentiate in hex. +-process = subprocess.Popen(cmd, **kwargs) ++process = subprocess.Popen(cmd, env={"LD_LIBRARY_PATH":"${WRKSRC}/out/Release"}, **kwargs) + stdout, _ = process.communicate() + if stdout_file: + with stdout_file.open('w') as f: diff --git a/www/qt6-webengine/files/patch-src_3rdparty_gn_build_build__linux.ninja.template b/www/qt6-webengine/files/patch-src_3rdparty_gn_build_build__linux.ninja.template index 0f65e9a34802..ee3463a68846 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_gn_build_build__linux.ninja.template +++ b/www/qt6-webengine/files/patch-src_3rdparty_gn_build_build__linux.ninja.template @@ -1,11 +1,11 @@ ---- src/3rdparty/gn/build/build_linux.ninja.template.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/gn/build/build_linux.ninja.template.orig 2025-02-21 12:29:33 UTC +++ src/3rdparty/gn/build/build_linux.ninja.template @@ -5,7 +5,7 @@ rule alink_thin deps = gcc rule alink_thin -- command = rm -f $out && $ar rcsT $out $in -+ command = rm -f $out && $ar rcs $out $in +- command = $ar rcsT $out $in ++ command = $ar rcs $out $in description = AR $out rule link diff --git a/www/qt6-webengine/files/patch-src_3rdparty_gn_build_gen.py b/www/qt6-webengine/files/patch-src_3rdparty_gn_build_gen.py index 01ef4e3b469f..da6877002422 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_gn_build_gen.py +++ b/www/qt6-webengine/files/patch-src_3rdparty_gn_build_gen.py @@ -1,4 +1,4 @@ ---- src/3rdparty/gn/build/gen.py.orig 2024-10-02 15:40:01 UTC +--- src/3rdparty/gn/build/gen.py.orig 2025-02-21 12:29:33 UTC +++ src/3rdparty/gn/build/gen.py @@ -94,6 +94,12 @@ class Platform(object): def is_solaris(self): @@ -13,7 +13,7 @@ def is_posix(self): return self._platform in ['linux', 'freebsd', 'darwin', 'aix', 'openbsd', 'haiku', 'solaris', 'msys', 'netbsd', 'serenity'] -@@ -327,7 +333,7 @@ def WriteGenericNinja(path, static_libraries, executab +@@ -329,7 +335,7 @@ def WriteGenericNinja(path, static_libraries, executab 'linux': 'build_linux.ninja.template', 'freebsd': 'build_linux.ninja.template', 'aix': 'build_aix.ninja.template', @@ -22,7 +22,7 @@ 'haiku': 'build_haiku.ninja.template', 'solaris': 'build_linux.ninja.template', 'netbsd': 'build_linux.ninja.template', -@@ -589,6 +595,9 @@ def WriteGNNinja(path, platform, host, options, args_l +@@ -602,6 +608,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/qt6-webengine/files/patch-src_3rdparty_gn_src_base_files_file__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_gn_src_base_files_file__posix.cc index 5cd8826324eb..0bb0e8a85f23 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_gn_src_base_files_file__posix.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_gn_src_base_files_file__posix.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/gn/src/base/files/file_posix.cc.orig 2023-08-16 19:50:41 UTC +--- src/3rdparty/gn/src/base/files/file_posix.cc.orig 2025-02-21 12:29:33 UTC +++ src/3rdparty/gn/src/base/files/file_posix.cc -@@ -371,7 +371,7 @@ bool File::Flush() { +@@ -359,7 +359,7 @@ bool File::Flush() { bool File::Flush() { DCHECK(IsValid()); diff --git a/www/qt6-webengine/files/patch-src_core_CMakeLists.txt b/www/qt6-webengine/files/patch-src_core_CMakeLists.txt index 9170ddd23ed3..4c6f56a2e4e2 100644 --- a/www/qt6-webengine/files/patch-src_core_CMakeLists.txt +++ b/www/qt6-webengine/files/patch-src_core_CMakeLists.txt @@ -1,11 +1,11 @@ ---- src/core/CMakeLists.txt.orig 2024-10-02 15:40:01 UTC +--- src/core/CMakeLists.txt.orig 2025-03-09 19:36:47 UTC +++ src/core/CMakeLists.txt @@ -21,7 +21,7 @@ add_subdirectory(tools/qwebengine_convert_dict) # TOOLCHAIN SETUP ## --if(LINUX) -+if(LINUX OR FREEBSD) +-if(LINUX OR WIN32) ++if(LINUX OR WIN32 OR FREEBSD) setup_toolchains() endif() @@ -13,21 +13,33 @@ accessibility_activation_observer.cpp accessibility_activation_observer.h ) -- extend_gn_target(${buildGn} CONDITION LINUX OR WIN32 -+ extend_gn_target(${buildGn} CONDITION LINUX OR FREEBSD OR WIN32 - SOURCES - compositor/content_gpu_client_qt.cpp compositor/content_gpu_client_qt.h - ozone/gl_context_qt.cpp ozone/gl_context_qt.h -@@ -213,7 +213,7 @@ foreach(arch ${archs}) - ozone/gl_surface_wgl_qt.cpp ozone/gl_surface_wgl_qt.h - ) - - extend_gn_target(${buildGn} CONDITION LINUX + extend_gn_target(${buildGn} CONDITION LINUX OR FREEBSD SOURCES ozone/gl_ozone_angle_qt.cpp ozone/gl_ozone_angle_qt.h - ozone/gl_ozone_egl_qt.cpp ozone/gl_ozone_egl_qt.h -@@ -436,7 +436,7 @@ foreach(arch ${archs}) + ozone/ozone_util_qt.cpp ozone/ozone_util_qt.h +@@ -208,17 +208,17 @@ foreach(arch ${archs}) + ozone/surface_factory_qt.cpp ozone/surface_factory_qt.h + ) + +- extend_gn_target(${buildGn} CONDITION LINUX AND QT_FEATURE_opengl ++ extend_gn_target(${buildGn} CONDITION (LINUX OR FREEBSD) AND QT_FEATURE_opengl + SOURCES + ozone/gl_helper.cpp ozone/gl_helper.h + ) + +- extend_gn_target(${buildGn} CONDITION LINUX AND QT_FEATURE_opengl AND QT_FEATURE_webengine_ozone_x11 AND QT_FEATURE_xcb_glx_plugin ++ extend_gn_target(${buildGn} CONDITION (LINUX OR FREEBSD) AND QT_FEATURE_opengl AND QT_FEATURE_webengine_ozone_x11 AND QT_FEATURE_xcb_glx_plugin + SOURCES + ozone/glx_helper.cpp ozone/glx_helper.h + ) + +- extend_gn_target(${buildGn} CONDITION LINUX AND QT_FEATURE_opengl AND QT_FEATURE_egl ++ extend_gn_target(${buildGn} CONDITION (LINUX OR FREEBSD) AND QT_FEATURE_opengl AND QT_FEATURE_egl + SOURCES + ozone/egl_helper.cpp ozone/egl_helper.h + ) +@@ -438,7 +438,7 @@ foreach(arch ${archs}) CONDITION QT_FEATURE_webenginedriver ) @@ -36,16 +48,7 @@ list(APPEND gnArgArg angle_enable_gl=true use_gtk=false # GTK toolkit bindings -@@ -445,7 +445,7 @@ foreach(arch ${archs}) - use_bundled_fontconfig=false - use_glib=false - use_bluez=false -- use_udev=true -+ use_udev=false - is_cfi=false - use_ozone=true - ozone_auto_platforms=false -@@ -504,6 +504,10 @@ foreach(arch ${archs}) +@@ -505,6 +505,10 @@ foreach(arch ${archs}) extend_gn_list(gnArgArg ARGS use_pulseaudio CONDITION QT_FEATURE_webengine_system_pulseaudio diff --git a/www/qt6-webengine/files/patch-src_core_api_configure.cmake b/www/qt6-webengine/files/patch-src_core_api_configure.cmake index 8d6089b57209..05e20daffc73 100644 --- a/www/qt6-webengine/files/patch-src_core_api_configure.cmake +++ b/www/qt6-webengine/files/patch-src_core_api_configure.cmake @@ -1,4 +1,4 @@ ---- src/core/api/configure.cmake.orig 2024-10-02 15:40:01 UTC +--- src/core/api/configure.cmake.orig 2025-02-21 12:29:33 UTC +++ src/core/api/configure.cmake @@ -10,6 +10,7 @@ if(NOT QT_CONFIGURE_RUNNING) if(PkgConfig_FOUND AND QT_FEATURE_pkg_config) @@ -6,9 +6,9 @@ pkg_check_modules(PULSEAUDIO libpulse>=0.9.10 libpulse-mainloop-glib) + pkg_check_modules(SNDIO libsndio) pkg_check_modules(XDAMAGE xdamage) - pkg_check_modules(POPPLER_CPP poppler-cpp IMPORTED_TARGET) pkg_check_modules(GBM gbm) -@@ -87,6 +88,11 @@ qt_feature("webengine-printing-and-pdf" PRIVATE + pkg_check_modules(LIBVA libva>=1.14) +@@ -76,6 +77,11 @@ qt_feature("webengine-printing-and-pdf" PRIVATE AUTODETECT NOT QT_FEATURE_webengine_embedded_build CONDITION TARGET Qt::PrintSupport AND QT_FEATURE_printer ) @@ -20,7 +20,7 @@ qt_feature("webengine-pepper-plugins" PRIVATE LABEL "Pepper Plugins" PURPOSE "Enables use of Pepper plugins." -@@ -167,7 +173,7 @@ qt_feature("webengine-vaapi" PRIVATE +@@ -157,7 +163,7 @@ qt_feature("webengine-vaapi" PRIVATE PURPOSE "Enables support for VA-API hardware acceleration" AUTODETECT GBM_FOUND AND LIBVA_FOUND AND QT_FEATURE_vulkan # hardware accelerated encoding requires bundled libvpx @@ -29,7 +29,7 @@ ) list(LENGTH CMAKE_OSX_ARCHITECTURES osx_arch_count) qt_feature("webenginedriver" PUBLIC -@@ -211,15 +217,19 @@ qt_configure_add_summary_entry( +@@ -196,15 +202,19 @@ qt_configure_add_summary_entry( ) qt_configure_add_summary_entry( ARGS "webengine-vaapi" diff --git a/www/qt6-webengine/files/patch-src_core_compositor_native__skia__output__device__opengl.cpp b/www/qt6-webengine/files/patch-src_core_compositor_native__skia__output__device__opengl.cpp index 38cf98cc563c..079bb283b405 100644 --- a/www/qt6-webengine/files/patch-src_core_compositor_native__skia__output__device__opengl.cpp +++ b/www/qt6-webengine/files/patch-src_core_compositor_native__skia__output__device__opengl.cpp @@ -1,6 +1,6 @@ ---- src/core/compositor/native_skia_output_device_opengl.cpp.orig 2024-11-21 04:36:37 UTC +--- src/core/compositor/native_skia_output_device_opengl.cpp.orig 2025-03-09 19:36:47 UTC +++ src/core/compositor/native_skia_output_device_opengl.cpp -@@ -289,7 +289,7 @@ QSGTexture *NativeSkiaOutputDeviceOpenGL::texture(QQui +@@ -247,7 +247,7 @@ QSGTexture *NativeSkiaOutputDeviceOpenGL::texture(QQui EGL_LINUX_DRM_FOURCC_EXT, drmFormat, EGL_DMA_BUF_PLANE0_FD_EXT, scopedFd.get(), EGL_DMA_BUF_PLANE0_OFFSET_EXT, static_cast(nativePixmap->GetDmaBufOffset(0)), diff --git a/www/qt6-webengine/files/patch-src_pdf_CMakeLists.txt b/www/qt6-webengine/files/patch-src_pdf_CMakeLists.txt index 77ec8be8912e..5f1fe5de5b2c 100644 --- a/www/qt6-webengine/files/patch-src_pdf_CMakeLists.txt +++ b/www/qt6-webengine/files/patch-src_pdf_CMakeLists.txt @@ -1,20 +1,20 @@ ---- src/pdf/CMakeLists.txt.orig 2024-10-02 15:40:01 UTC +--- src/pdf/CMakeLists.txt.orig 2025-02-21 12:29:33 UTC +++ src/pdf/CMakeLists.txt -@@ -70,7 +70,7 @@ add_dependencies(prepare_docs_Pdf generate_pdf_attribu +@@ -69,7 +69,7 @@ add_dependencies(prepare_docs_Pdf generate_pdf_attribu # TOOLCHAIN SETUP ## --if(LINUX OR MINGW OR ANDROID) -+if(LINUX OR MINGW OR ANDROID OR FREEBSD) +-if(LINUX OR MINGW OR ANDROID OR WIN32) ++if(LINUX OR MINGW OR ANDROID OR WIN32 OR FREEBSD) setup_toolchains() endif() -@@ -138,7 +138,7 @@ foreach(arch ${archs}) - v8_enable_webassembly=false - ) +@@ -143,7 +143,7 @@ foreach(arch ${archs}) + v8_use_external_startup_data=false + ) - if(LINUX OR ANDROID) + if(LINUX OR ANDROID OR FREEBSD) list(APPEND gnArgArg + enable_vr=false is_cfi=false - ozone_auto_platforms=false diff --git a/www/qt6-webengine/pkg-plist b/www/qt6-webengine/pkg-plist index b0631d3d4fa7..f00767be8cfc 100644 --- a/www/qt6-webengine/pkg-plist +++ b/www/qt6-webengine/pkg-plist @@ -11,6 +11,7 @@ %%QT_INCDIR%%/QtWebEngineCore/%%FULLVER%%/QtWebEngineCore/private/qwebenginepage_p.h %%QT_INCDIR%%/QtWebEngineCore/%%FULLVER%%/QtWebEngineCore/private/qwebenginepermission_p.h %%QT_INCDIR%%/QtWebEngineCore/%%FULLVER%%/QtWebEngineCore/private/qwebengineprofile_p.h +%%QT_INCDIR%%/QtWebEngineCore/%%FULLVER%%/QtWebEngineCore/private/qwebengineprofilebuilder_p.h %%QT_INCDIR%%/QtWebEngineCore/%%FULLVER%%/QtWebEngineCore/private/qwebenginescriptcollection_p.h %%QT_INCDIR%%/QtWebEngineCore/%%FULLVER%%/QtWebEngineCore/private/qwebengineurlrequestinfo_p.h %%QT_INCDIR%%/QtWebEngineCore/%%FULLVER%%/QtWebEngineCore/private/qwebenginewebauthuxrequest_p.h @@ -38,6 +39,7 @@ %%QT_INCDIR%%/QtWebEngineCore/QWebEnginePage %%QT_INCDIR%%/QtWebEngineCore/QWebEnginePermission %%QT_INCDIR%%/QtWebEngineCore/QWebEngineProfile +%%QT_INCDIR%%/QtWebEngineCore/QWebEngineProfileBuilder %%QT_INCDIR%%/QtWebEngineCore/QWebEngineQuotaRequest %%QT_INCDIR%%/QtWebEngineCore/QWebEngineRegisterProtocolHandlerRequest %%QT_INCDIR%%/QtWebEngineCore/QWebEngineScript @@ -78,6 +80,7 @@ %%QT_INCDIR%%/QtWebEngineCore/qwebenginepage.h %%QT_INCDIR%%/QtWebEngineCore/qwebenginepermission.h %%QT_INCDIR%%/QtWebEngineCore/qwebengineprofile.h +%%QT_INCDIR%%/QtWebEngineCore/qwebengineprofilebuilder.h %%QT_INCDIR%%/QtWebEngineCore/qwebenginequotarequest.h %%QT_INCDIR%%/QtWebEngineCore/qwebengineregisterprotocolhandlerrequest.h %%QT_INCDIR%%/QtWebEngineCore/qwebenginescript.h @@ -98,6 +101,8 @@ %%QT_INCDIR%%/QtWebEngineQuick/%%FULLVER%%/QtWebEngineQuick/private/qquickwebengineforeigntypes_p.h %%QT_INCDIR%%/QtWebEngineQuick/%%FULLVER%%/QtWebEngineQuick/private/qquickwebenginenewwindowrequest_p.h %%QT_INCDIR%%/QtWebEngineQuick/%%FULLVER%%/QtWebEngineQuick/private/qquickwebengineprofile_p.h +%%QT_INCDIR%%/QtWebEngineQuick/%%FULLVER%%/QtWebEngineQuick/private/qquickwebengineprofileprototype_p.h +%%QT_INCDIR%%/QtWebEngineQuick/%%FULLVER%%/QtWebEngineQuick/private/qquickwebengineprofileprototype_p_p.h %%QT_INCDIR%%/QtWebEngineQuick/%%FULLVER%%/QtWebEngineQuick/private/qquickwebenginescriptcollection_p.h %%QT_INCDIR%%/QtWebEngineQuick/%%FULLVER%%/QtWebEngineQuick/private/qquickwebenginescriptcollection_p_p.h %%QT_INCDIR%%/QtWebEngineQuick/%%FULLVER%%/QtWebEngineQuick/private/qquickwebenginesettings_p.h @@ -171,6 +176,14 @@ lib/cmake/Qt6WebEngineCore/Qt6WebEngineCoreTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6WebEngineCore/Qt6WebEngineCoreTargets.cmake lib/cmake/Qt6WebEngineCore/Qt6WebEngineCoreVersionlessAliasTargets.cmake lib/cmake/Qt6WebEngineCore/Qt6WebEngineCoreVersionlessTargets.cmake +lib/cmake/Qt6WebEngineCorePrivate/Qt6WebEngineCorePrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6WebEngineCorePrivate/Qt6WebEngineCorePrivateConfig.cmake +lib/cmake/Qt6WebEngineCorePrivate/Qt6WebEngineCorePrivateConfigVersion.cmake +lib/cmake/Qt6WebEngineCorePrivate/Qt6WebEngineCorePrivateConfigVersionImpl.cmake +lib/cmake/Qt6WebEngineCorePrivate/Qt6WebEngineCorePrivateDependencies.cmake +lib/cmake/Qt6WebEngineCorePrivate/Qt6WebEngineCorePrivateTargets.cmake +lib/cmake/Qt6WebEngineCorePrivate/Qt6WebEngineCorePrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6WebEngineCorePrivate/Qt6WebEngineCorePrivateVersionlessTargets.cmake lib/cmake/Qt6WebEngineCoreTools/Qt6WebEngineCoreToolsAdditionalTargetInfo.cmake lib/cmake/Qt6WebEngineCoreTools/Qt6WebEngineCoreToolsConfig.cmake lib/cmake/Qt6WebEngineCoreTools/Qt6WebEngineCoreToolsConfigVersion.cmake @@ -196,6 +209,22 @@ lib/cmake/Qt6WebEngineQuickDelegatesQml/Qt6WebEngineQuickDelegatesQmlTargets-%%C lib/cmake/Qt6WebEngineQuickDelegatesQml/Qt6WebEngineQuickDelegatesQmlTargets.cmake lib/cmake/Qt6WebEngineQuickDelegatesQml/Qt6WebEngineQuickDelegatesQmlVersionlessAliasTargets.cmake lib/cmake/Qt6WebEngineQuickDelegatesQml/Qt6WebEngineQuickDelegatesQmlVersionlessTargets.cmake +lib/cmake/Qt6WebEngineQuickDelegatesQmlPrivate/Qt6WebEngineQuickDelegatesQmlPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6WebEngineQuickDelegatesQmlPrivate/Qt6WebEngineQuickDelegatesQmlPrivateConfig.cmake +lib/cmake/Qt6WebEngineQuickDelegatesQmlPrivate/Qt6WebEngineQuickDelegatesQmlPrivateConfigVersion.cmake +lib/cmake/Qt6WebEngineQuickDelegatesQmlPrivate/Qt6WebEngineQuickDelegatesQmlPrivateConfigVersionImpl.cmake +lib/cmake/Qt6WebEngineQuickDelegatesQmlPrivate/Qt6WebEngineQuickDelegatesQmlPrivateDependencies.cmake +lib/cmake/Qt6WebEngineQuickDelegatesQmlPrivate/Qt6WebEngineQuickDelegatesQmlPrivateTargets.cmake +lib/cmake/Qt6WebEngineQuickDelegatesQmlPrivate/Qt6WebEngineQuickDelegatesQmlPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6WebEngineQuickDelegatesQmlPrivate/Qt6WebEngineQuickDelegatesQmlPrivateVersionlessTargets.cmake +lib/cmake/Qt6WebEngineQuickPrivate/Qt6WebEngineQuickPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6WebEngineQuickPrivate/Qt6WebEngineQuickPrivateConfig.cmake +lib/cmake/Qt6WebEngineQuickPrivate/Qt6WebEngineQuickPrivateConfigVersion.cmake +lib/cmake/Qt6WebEngineQuickPrivate/Qt6WebEngineQuickPrivateConfigVersionImpl.cmake +lib/cmake/Qt6WebEngineQuickPrivate/Qt6WebEngineQuickPrivateDependencies.cmake +lib/cmake/Qt6WebEngineQuickPrivate/Qt6WebEngineQuickPrivateTargets.cmake +lib/cmake/Qt6WebEngineQuickPrivate/Qt6WebEngineQuickPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6WebEngineQuickPrivate/Qt6WebEngineQuickPrivateVersionlessTargets.cmake lib/cmake/Qt6WebEngineWidgets/Qt6WebEngineWidgetsAdditionalTargetInfo.cmake lib/cmake/Qt6WebEngineWidgets/Qt6WebEngineWidgetsConfig.cmake lib/cmake/Qt6WebEngineWidgets/Qt6WebEngineWidgetsConfigVersion.cmake @@ -205,6 +234,14 @@ lib/cmake/Qt6WebEngineWidgets/Qt6WebEngineWidgetsTargets-%%CMAKE_BUILD_TYPE%%.cm lib/cmake/Qt6WebEngineWidgets/Qt6WebEngineWidgetsTargets.cmake lib/cmake/Qt6WebEngineWidgets/Qt6WebEngineWidgetsVersionlessAliasTargets.cmake lib/cmake/Qt6WebEngineWidgets/Qt6WebEngineWidgetsVersionlessTargets.cmake +lib/cmake/Qt6WebEngineWidgetsPrivate/Qt6WebEngineWidgetsPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6WebEngineWidgetsPrivate/Qt6WebEngineWidgetsPrivateConfig.cmake +lib/cmake/Qt6WebEngineWidgetsPrivate/Qt6WebEngineWidgetsPrivateConfigVersion.cmake +lib/cmake/Qt6WebEngineWidgetsPrivate/Qt6WebEngineWidgetsPrivateConfigVersionImpl.cmake +lib/cmake/Qt6WebEngineWidgetsPrivate/Qt6WebEngineWidgetsPrivateDependencies.cmake +lib/cmake/Qt6WebEngineWidgetsPrivate/Qt6WebEngineWidgetsPrivateTargets.cmake +lib/cmake/Qt6WebEngineWidgetsPrivate/Qt6WebEngineWidgetsPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6WebEngineWidgetsPrivate/Qt6WebEngineWidgetsPrivateVersionlessTargets.cmake %%QT_LIBDIR%%/libQt6WebEngineCore.prl %%QT_LIBDIR%%/libQt6WebEngineCore.so %%QT_LIBDIR%%/libQt6WebEngineCore.so.6 @@ -267,7 +304,6 @@ libdata/pkgconfig/Qt6WebEngineWidgets.pc %%QT_DATADIR%%/modules/WebEngineQuickDelegatesQml.json %%QT_DATADIR%%/modules/WebEngineWidgets.json %%QT_DATADIR%%/resources/icudtl.dat -@dir %%QT_DATADIR%%/resources/locales %%QT_DATADIR%%/resources/qtwebengine_devtools_resources.pak %%QT_DATADIR%%/resources/qtwebengine_resources.pak %%QT_DATADIR%%/resources/qtwebengine_resources_100p.pak @@ -326,3 +362,4 @@ libdata/pkgconfig/Qt6WebEngineWidgets.pc %%QT_L10NDIR%%/qtwebengine_locales/vi.pak %%QT_L10NDIR%%/qtwebengine_locales/zh-CN.pak %%QT_L10NDIR%%/qtwebengine_locales/zh-TW.pak +@dir %%QT_DATADIR%%/resources/locales diff --git a/www/qt6-websockets/distinfo b/www/qt6-websockets/distinfo index efbb16a0bc8f..4567b5a5508a 100644 --- a/www/qt6-websockets/distinfo +++ b/www/qt6-websockets/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1743027865 -SHA256 (KDE/Qt/6.8.3/qtwebsockets-everywhere-src-6.8.3.tar.xz) = fc6310c1b12d6e22a31062727aa6574ed69239d036c8a4247b3b089902709b11 -SIZE (KDE/Qt/6.8.3/qtwebsockets-everywhere-src-6.8.3.tar.xz) = 461996 +TIMESTAMP = 1743709260 +SHA256 (KDE/Qt/6.9.0/qtwebsockets-everywhere-src-6.9.0.tar.xz) = 6b3add7cacf3a4e0b448d5e69d9dac42795fef63309038af1dc5a454ce514940 +SIZE (KDE/Qt/6.9.0/qtwebsockets-everywhere-src-6.9.0.tar.xz) = 462240 diff --git a/www/qt6-websockets/pkg-plist b/www/qt6-websockets/pkg-plist index 9b732085ba99..16f86b891c6c 100644 --- a/www/qt6-websockets/pkg-plist +++ b/www/qt6-websockets/pkg-plist @@ -42,6 +42,14 @@ lib/cmake/Qt6WebSockets/Qt6WebSocketsTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6WebSockets/Qt6WebSocketsTargets.cmake lib/cmake/Qt6WebSockets/Qt6WebSocketsVersionlessAliasTargets.cmake lib/cmake/Qt6WebSockets/Qt6WebSocketsVersionlessTargets.cmake +lib/cmake/Qt6WebSocketsPrivate/Qt6WebSocketsPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6WebSocketsPrivate/Qt6WebSocketsPrivateConfig.cmake +lib/cmake/Qt6WebSocketsPrivate/Qt6WebSocketsPrivateConfigVersion.cmake +lib/cmake/Qt6WebSocketsPrivate/Qt6WebSocketsPrivateConfigVersionImpl.cmake +lib/cmake/Qt6WebSocketsPrivate/Qt6WebSocketsPrivateDependencies.cmake +lib/cmake/Qt6WebSocketsPrivate/Qt6WebSocketsPrivateTargets.cmake +lib/cmake/Qt6WebSocketsPrivate/Qt6WebSocketsPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6WebSocketsPrivate/Qt6WebSocketsPrivateVersionlessTargets.cmake %%QT_LIBDIR%%/libQt6WebSockets.prl %%QT_LIBDIR%%/libQt6WebSockets.so %%QT_LIBDIR%%/libQt6WebSockets.so.6 diff --git a/www/qt6-webview/distinfo b/www/qt6-webview/distinfo index c620e9f39416..ea46aab57b57 100644 --- a/www/qt6-webview/distinfo +++ b/www/qt6-webview/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1743027866 -SHA256 (KDE/Qt/6.8.3/qtwebview-everywhere-src-6.8.3.tar.xz) = 2c46e472034c8a254bb4dbd15250a3fa8f727135a14718a3ff1175697b487ed2 -SIZE (KDE/Qt/6.8.3/qtwebview-everywhere-src-6.8.3.tar.xz) = 141020 +TIMESTAMP = 1743709263 +SHA256 (KDE/Qt/6.9.0/qtwebview-everywhere-src-6.9.0.tar.xz) = 5b24070e8ceb12c3c4df5a887f3ffc3544193646386e6ce18e41c20d42d7ed6b +SIZE (KDE/Qt/6.9.0/qtwebview-everywhere-src-6.9.0.tar.xz) = 141132 diff --git a/www/qt6-webview/pkg-plist b/www/qt6-webview/pkg-plist index bb342e20b1ed..857f51140d12 100644 --- a/www/qt6-webview/pkg-plist +++ b/www/qt6-webview/pkg-plist @@ -44,6 +44,14 @@ lib/cmake/Qt6WebView/Qt6WebViewTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6WebView/Qt6WebViewTargets.cmake lib/cmake/Qt6WebView/Qt6WebViewVersionlessAliasTargets.cmake lib/cmake/Qt6WebView/Qt6WebViewVersionlessTargets.cmake +lib/cmake/Qt6WebViewPrivate/Qt6WebViewPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6WebViewPrivate/Qt6WebViewPrivateConfig.cmake +lib/cmake/Qt6WebViewPrivate/Qt6WebViewPrivateConfigVersion.cmake +lib/cmake/Qt6WebViewPrivate/Qt6WebViewPrivateConfigVersionImpl.cmake +lib/cmake/Qt6WebViewPrivate/Qt6WebViewPrivateDependencies.cmake +lib/cmake/Qt6WebViewPrivate/Qt6WebViewPrivateTargets.cmake +lib/cmake/Qt6WebViewPrivate/Qt6WebViewPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6WebViewPrivate/Qt6WebViewPrivateVersionlessTargets.cmake lib/cmake/Qt6WebViewQuick/Qt6WebViewQuickAdditionalTargetInfo.cmake lib/cmake/Qt6WebViewQuick/Qt6WebViewQuickConfig.cmake lib/cmake/Qt6WebViewQuick/Qt6WebViewQuickConfigVersion.cmake @@ -53,6 +61,14 @@ lib/cmake/Qt6WebViewQuick/Qt6WebViewQuickTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6WebViewQuick/Qt6WebViewQuickTargets.cmake lib/cmake/Qt6WebViewQuick/Qt6WebViewQuickVersionlessAliasTargets.cmake lib/cmake/Qt6WebViewQuick/Qt6WebViewQuickVersionlessTargets.cmake +lib/cmake/Qt6WebViewQuickPrivate/Qt6WebViewQuickPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6WebViewQuickPrivate/Qt6WebViewQuickPrivateConfig.cmake +lib/cmake/Qt6WebViewQuickPrivate/Qt6WebViewQuickPrivateConfigVersion.cmake +lib/cmake/Qt6WebViewQuickPrivate/Qt6WebViewQuickPrivateConfigVersionImpl.cmake +lib/cmake/Qt6WebViewQuickPrivate/Qt6WebViewQuickPrivateDependencies.cmake +lib/cmake/Qt6WebViewQuickPrivate/Qt6WebViewQuickPrivateTargets.cmake +lib/cmake/Qt6WebViewQuickPrivate/Qt6WebViewQuickPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6WebViewQuickPrivate/Qt6WebViewQuickPrivateVersionlessTargets.cmake %%QT_LIBDIR%%/libQt6WebView.prl %%QT_LIBDIR%%/libQt6WebView.so %%QT_LIBDIR%%/libQt6WebView.so.6 diff --git a/x11-toolkits/py-qt6-charts/distinfo b/x11-toolkits/py-qt6-charts/distinfo index 6d526fe5c31c..9da1224d89c1 100644 --- a/x11-toolkits/py-qt6-charts/distinfo +++ b/x11-toolkits/py-qt6-charts/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1733628726 -SHA256 (PyQt6_Charts-6.8.0.tar.gz) = f86705b8740e3041667ce211aeaa205b750eb6baf4c908f4e3f6dc8c720d10f1 -SIZE (PyQt6_Charts-6.8.0.tar.gz) = 41558 +TIMESTAMP = 1743732573 +SHA256 (pyqt6_charts-6.9.0.tar.gz) = 7efbe9bb7e6ad4f9845211a0efe0f91ca5e14f9362ed1ba84d55f2b8515091f7 +SIZE (pyqt6_charts-6.9.0.tar.gz) = 41661 diff --git a/x11-toolkits/py-qt6-datavis3d/distinfo b/x11-toolkits/py-qt6-datavis3d/distinfo index 7aed52e5cebc..ce2d24bbe3e0 100644 --- a/x11-toolkits/py-qt6-datavis3d/distinfo +++ b/x11-toolkits/py-qt6-datavis3d/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1733628739 -SHA256 (PyQt6_DataVisualization-6.8.0.tar.gz) = 822a94163b8177b9dd507988aff4da7c79ce26bc47fc5f9780dea6989c531171 -SIZE (PyQt6_DataVisualization-6.8.0.tar.gz) = 210142 +TIMESTAMP = 1743732588 +SHA256 (pyqt6_datavisualization-6.9.0.tar.gz) = 1515475f1b2c37275ecf6ac74017a64fae8335d97b87fbbaf14bac3f82cdaa0a +SIZE (pyqt6_datavisualization-6.9.0.tar.gz) = 210264 diff --git a/x11-toolkits/py-qt6-graphs/Makefile b/x11-toolkits/py-qt6-graphs/Makefile index d03d1fe5a821..8b06b4ef243b 100644 --- a/x11-toolkits/py-qt6-graphs/Makefile +++ b/x11-toolkits/py-qt6-graphs/Makefile @@ -1,6 +1,5 @@ PORTNAME= graphs DISTVERSION= ${PYQTGRAPHS_VERSION} -PORTREVISION= 1 CATEGORIES= x11-toolkits devel python MASTER_SITES= ${MASTER_SITES_PYQTGRAPHS} PKGNAMEPREFIX= ${PYQT_PY_RELNAME}- diff --git a/x11-toolkits/py-qt6-graphs/distinfo b/x11-toolkits/py-qt6-graphs/distinfo index dcace7d89e2f..f05456eadf08 100644 --- a/x11-toolkits/py-qt6-graphs/distinfo +++ b/x11-toolkits/py-qt6-graphs/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1733632888 -SHA256 (PyQt6_Graphs-6.8.0.tar.gz) = 9c457c1b218593ca2d7ef046426f01ef493636aa6567421941750321ed37e4ce -SIZE (PyQt6_Graphs-6.8.0.tar.gz) = 34305 +TIMESTAMP = 1743732609 +SHA256 (pyqt6_graphs-6.9.0.tar.gz) = f96eca719ce8c8c1647695136e69837d05fe56c31ca66533db568e108c8cc919 +SIZE (pyqt6_graphs-6.9.0.tar.gz) = 35234 diff --git a/x11-toolkits/py-qt6-graphs/pkg-plist b/x11-toolkits/py-qt6-graphs/pkg-plist index bffe18f0e4ec..fbcad27ece6e 100644 --- a/x11-toolkits/py-qt6-graphs/pkg-plist +++ b/x11-toolkits/py-qt6-graphs/pkg-plist @@ -36,6 +36,7 @@ %%PYQT_SIPDIR%%/QtGraphs/qscatterdataitem.sip %%PYQT_SIPDIR%%/QtGraphs/qscatterdataproxy.sip %%PYQT_SIPDIR%%/QtGraphs/qscatterseries.sip +%%PYQT_SIPDIR%%/QtGraphs/qspline3dseries.sip %%PYQT_SIPDIR%%/QtGraphs/qsplineseries.sip %%PYQT_SIPDIR%%/QtGraphs/qsurface3dseries.sip %%PYQT_SIPDIR%%/QtGraphs/qsurfacedataitem.sip diff --git a/x11-toolkits/qt6-charts/distinfo b/x11-toolkits/qt6-charts/distinfo index b748c02c96fd..ad1a04aab107 100644 --- a/x11-toolkits/qt6-charts/distinfo +++ b/x11-toolkits/qt6-charts/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1743027867 -SHA256 (KDE/Qt/6.8.3/qtcharts-everywhere-src-6.8.3.tar.xz) = 34aa5f5a48bb7481c9bd62172696831c73c2cef327aa6b871b1861693b3e0914 -SIZE (KDE/Qt/6.8.3/qtcharts-everywhere-src-6.8.3.tar.xz) = 4664228 +TIMESTAMP = 1743709273 +SHA256 (KDE/Qt/6.9.0/qtcharts-everywhere-src-6.9.0.tar.xz) = 8a1c9287f25fe47b110ada87e8c73b928a93f05435440d0a27f591d25c317f28 +SIZE (KDE/Qt/6.9.0/qtcharts-everywhere-src-6.9.0.tar.xz) = 4664476 diff --git a/x11-toolkits/qt6-charts/pkg-plist b/x11-toolkits/qt6-charts/pkg-plist index 590c29e9ea9c..6ca45be9038d 100644 --- a/x11-toolkits/qt6-charts/pkg-plist +++ b/x11-toolkits/qt6-charts/pkg-plist @@ -295,6 +295,14 @@ lib/cmake/Qt6Charts/Qt6ChartsTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6Charts/Qt6ChartsTargets.cmake lib/cmake/Qt6Charts/Qt6ChartsVersionlessAliasTargets.cmake lib/cmake/Qt6Charts/Qt6ChartsVersionlessTargets.cmake +lib/cmake/Qt6ChartsPrivate/Qt6ChartsPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6ChartsPrivate/Qt6ChartsPrivateConfig.cmake +lib/cmake/Qt6ChartsPrivate/Qt6ChartsPrivateConfigVersion.cmake +lib/cmake/Qt6ChartsPrivate/Qt6ChartsPrivateConfigVersionImpl.cmake +lib/cmake/Qt6ChartsPrivate/Qt6ChartsPrivateDependencies.cmake +lib/cmake/Qt6ChartsPrivate/Qt6ChartsPrivateTargets.cmake +lib/cmake/Qt6ChartsPrivate/Qt6ChartsPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6ChartsPrivate/Qt6ChartsPrivateVersionlessTargets.cmake lib/cmake/Qt6ChartsQml/Qt6ChartsQmlAdditionalTargetInfo.cmake lib/cmake/Qt6ChartsQml/Qt6ChartsQmlConfig.cmake lib/cmake/Qt6ChartsQml/Qt6ChartsQmlConfigVersion.cmake @@ -304,6 +312,14 @@ lib/cmake/Qt6ChartsQml/Qt6ChartsQmlTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6ChartsQml/Qt6ChartsQmlTargets.cmake lib/cmake/Qt6ChartsQml/Qt6ChartsQmlVersionlessAliasTargets.cmake lib/cmake/Qt6ChartsQml/Qt6ChartsQmlVersionlessTargets.cmake +lib/cmake/Qt6ChartsQmlPrivate/Qt6ChartsQmlPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6ChartsQmlPrivate/Qt6ChartsQmlPrivateConfig.cmake +lib/cmake/Qt6ChartsQmlPrivate/Qt6ChartsQmlPrivateConfigVersion.cmake +lib/cmake/Qt6ChartsQmlPrivate/Qt6ChartsQmlPrivateConfigVersionImpl.cmake +lib/cmake/Qt6ChartsQmlPrivate/Qt6ChartsQmlPrivateDependencies.cmake +lib/cmake/Qt6ChartsQmlPrivate/Qt6ChartsQmlPrivateTargets.cmake +lib/cmake/Qt6ChartsQmlPrivate/Qt6ChartsQmlPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6ChartsQmlPrivate/Qt6ChartsQmlPrivateVersionlessTargets.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6qtchartsqml2AdditionalTargetInfo.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6qtchartsqml2Config.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6qtchartsqml2ConfigVersion.cmake diff --git a/x11-toolkits/qt6-datavis3d/distinfo b/x11-toolkits/qt6-datavis3d/distinfo index e8caebfe3af3..486b68a63383 100644 --- a/x11-toolkits/qt6-datavis3d/distinfo +++ b/x11-toolkits/qt6-datavis3d/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1743027869 -SHA256 (KDE/Qt/6.8.3/qtdatavis3d-everywhere-src-6.8.3.tar.xz) = 8323b6d4ad719b9332343760de27f0e8511f75bc2b8750c7821b08988585fe1a -SIZE (KDE/Qt/6.8.3/qtdatavis3d-everywhere-src-6.8.3.tar.xz) = 3954668 +TIMESTAMP = 1743709279 +SHA256 (KDE/Qt/6.9.0/qtdatavis3d-everywhere-src-6.9.0.tar.xz) = 310cb713d58c932a8dfaee3c7cd4cac7f2f77ee8e01038ff7df3f0c87f9d8015 +SIZE (KDE/Qt/6.9.0/qtdatavis3d-everywhere-src-6.9.0.tar.xz) = 3954764 diff --git a/x11-toolkits/qt6-datavis3d/pkg-plist b/x11-toolkits/qt6-datavis3d/pkg-plist index 4e11051f5eb2..afbf048e8d45 100644 --- a/x11-toolkits/qt6-datavis3d/pkg-plist +++ b/x11-toolkits/qt6-datavis3d/pkg-plist @@ -182,6 +182,14 @@ lib/cmake/Qt6DataVisualization/Qt6DataVisualizationTargets-%%CMAKE_BUILD_TYPE%%. lib/cmake/Qt6DataVisualization/Qt6DataVisualizationTargets.cmake lib/cmake/Qt6DataVisualization/Qt6DataVisualizationVersionlessAliasTargets.cmake lib/cmake/Qt6DataVisualization/Qt6DataVisualizationVersionlessTargets.cmake +lib/cmake/Qt6DataVisualizationPrivate/Qt6DataVisualizationPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6DataVisualizationPrivate/Qt6DataVisualizationPrivateConfig.cmake +lib/cmake/Qt6DataVisualizationPrivate/Qt6DataVisualizationPrivateConfigVersion.cmake +lib/cmake/Qt6DataVisualizationPrivate/Qt6DataVisualizationPrivateConfigVersionImpl.cmake +lib/cmake/Qt6DataVisualizationPrivate/Qt6DataVisualizationPrivateDependencies.cmake +lib/cmake/Qt6DataVisualizationPrivate/Qt6DataVisualizationPrivateTargets.cmake +lib/cmake/Qt6DataVisualizationPrivate/Qt6DataVisualizationPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6DataVisualizationPrivate/Qt6DataVisualizationPrivateVersionlessTargets.cmake lib/cmake/Qt6DataVisualizationQml/Qt6DataVisualizationQmlAdditionalTargetInfo.cmake lib/cmake/Qt6DataVisualizationQml/Qt6DataVisualizationQmlConfig.cmake lib/cmake/Qt6DataVisualizationQml/Qt6DataVisualizationQmlConfigVersion.cmake @@ -191,6 +199,14 @@ lib/cmake/Qt6DataVisualizationQml/Qt6DataVisualizationQmlTargets-%%CMAKE_BUILD_T lib/cmake/Qt6DataVisualizationQml/Qt6DataVisualizationQmlTargets.cmake lib/cmake/Qt6DataVisualizationQml/Qt6DataVisualizationQmlVersionlessAliasTargets.cmake lib/cmake/Qt6DataVisualizationQml/Qt6DataVisualizationQmlVersionlessTargets.cmake +lib/cmake/Qt6DataVisualizationQmlPrivate/Qt6DataVisualizationQmlPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6DataVisualizationQmlPrivate/Qt6DataVisualizationQmlPrivateConfig.cmake +lib/cmake/Qt6DataVisualizationQmlPrivate/Qt6DataVisualizationQmlPrivateConfigVersion.cmake +lib/cmake/Qt6DataVisualizationQmlPrivate/Qt6DataVisualizationQmlPrivateConfigVersionImpl.cmake +lib/cmake/Qt6DataVisualizationQmlPrivate/Qt6DataVisualizationQmlPrivateDependencies.cmake +lib/cmake/Qt6DataVisualizationQmlPrivate/Qt6DataVisualizationQmlPrivateTargets.cmake +lib/cmake/Qt6DataVisualizationQmlPrivate/Qt6DataVisualizationQmlPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6DataVisualizationQmlPrivate/Qt6DataVisualizationQmlPrivateVersionlessTargets.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6DataVisualizationQmlpluginAdditionalTargetInfo.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6DataVisualizationQmlpluginConfig.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6DataVisualizationQmlpluginConfigVersion.cmake diff --git a/x11-toolkits/qt6-declarative/distinfo b/x11-toolkits/qt6-declarative/distinfo index cdfb21bbe1cd..a7618b4b8ed9 100644 --- a/x11-toolkits/qt6-declarative/distinfo +++ b/x11-toolkits/qt6-declarative/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1743027870 -SHA256 (KDE/Qt/6.8.3/qtdeclarative-everywhere-src-6.8.3.tar.xz) = 1f03a2b8f5588b4face7da87926e9b2c1372b3a32157c52df07a75067a9db1af -SIZE (KDE/Qt/6.8.3/qtdeclarative-everywhere-src-6.8.3.tar.xz) = 36503988 +TIMESTAMP = 1743709305 +SHA256 (KDE/Qt/6.9.0/qtdeclarative-everywhere-src-6.9.0.tar.xz) = a3175fa510847a136734f989e2bfea7f7bbb9dc9acc98b40b544d26f5ba20d3d +SIZE (KDE/Qt/6.9.0/qtdeclarative-everywhere-src-6.9.0.tar.xz) = 36835960 diff --git a/x11-toolkits/qt6-declarative/pkg-plist b/x11-toolkits/qt6-declarative/pkg-plist index 2a8c3414ad06..dd89c12c1762 100644 --- a/x11-toolkits/qt6-declarative/pkg-plist +++ b/x11-toolkits/qt6-declarative/pkg-plist @@ -48,7 +48,7 @@ bin/qmlscene6 %%QT_INCDIR%%/QtLabsPlatform/QtLabsPlatformVersion %%QT_INCDIR%%/QtLabsPlatform/qtlabsplatformexports.h %%QT_INCDIR%%/QtLabsPlatform/qtlabsplatformversion.h -%%QT_INCDIR%%/QtLabsQmlModels/%%FULLVER%%/QtLabsQmlModels/private/qqmldelegatecomponent_p.h +%%QT_INCDIR%%/QtLabsQmlModels/%%FULLVER%%/QtLabsQmlModels/private/qqmldelegatechooser_p.h %%QT_INCDIR%%/QtLabsQmlModels/%%FULLVER%%/QtLabsQmlModels/private/qqmlmodelsglobal_p.h %%QT_INCDIR%%/QtLabsQmlModels/%%FULLVER%%/QtLabsQmlModels/private/qqmltablemodel_p.h %%QT_INCDIR%%/QtLabsQmlModels/%%FULLVER%%/QtLabsQmlModels/private/qqmltablemodelcolumn_p.h @@ -194,6 +194,7 @@ bin/qmlscene6 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlpropertyindex_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlpropertyresolver_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlpropertytopropertybinding_p.h +%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlpropertyutils_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlpropertyvalidator_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlpropertyvalueinterceptor_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlproxymetaobject_p.h @@ -331,6 +332,7 @@ bin/qmlscene6 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4urlobject_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4util_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4value_p.h +%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4variantassociationobject_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4variantobject_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4vme_moth_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4vtable_p.h @@ -449,6 +451,7 @@ bin/qmlscene6 %%QT_INCDIR%%/QtQmlCompiler/%%FULLVER%%/QtQmlCompiler/private/qqmljsscopesbyid_p.h %%QT_INCDIR%%/QtQmlCompiler/%%FULLVER%%/QtQmlCompiler/private/qqmljsshadowcheck_p.h %%QT_INCDIR%%/QtQmlCompiler/%%FULLVER%%/QtQmlCompiler/private/qqmljsstoragegeneralizer_p.h +%%QT_INCDIR%%/QtQmlCompiler/%%FULLVER%%/QtQmlCompiler/private/qqmljsstorageinitializer_p.h %%QT_INCDIR%%/QtQmlCompiler/%%FULLVER%%/QtQmlCompiler/private/qqmljstypedescriptionreader_p.h %%QT_INCDIR%%/QtQmlCompiler/%%FULLVER%%/QtQmlCompiler/private/qqmljstypepropagator_p.h %%QT_INCDIR%%/QtQmlCompiler/%%FULLVER%%/QtQmlCompiler/private/qqmljstypereader_p.h @@ -508,7 +511,6 @@ bin/qmlscene6 %%QT_INCDIR%%/QtQmlDom/%%FULLVER%%/QtQmlDom/private/qqmldom_utils_p.h %%QT_INCDIR%%/QtQmlDom/%%FULLVER%%/QtQmlDom/private/qqmldomastcreator_p.h %%QT_INCDIR%%/QtQmlDom/%%FULLVER%%/QtQmlDom/private/qqmldomastdumper_p.h -%%QT_INCDIR%%/QtQmlDom/%%FULLVER%%/QtQmlDom/private/qqmldomattachedinfo_p.h %%QT_INCDIR%%/QtQmlDom/%%FULLVER%%/QtQmlDom/private/qqmldomcodeformatter_p.h %%QT_INCDIR%%/QtQmlDom/%%FULLVER%%/QtQmlDom/private/qqmldomcomments_p.h %%QT_INCDIR%%/QtQmlDom/%%FULLVER%%/QtQmlDom/private/qqmldomcompare_p.h @@ -517,11 +519,13 @@ bin/qmlscene6 %%QT_INCDIR%%/QtQmlDom/%%FULLVER%%/QtQmlDom/private/qqmldomerrormessage_p.h %%QT_INCDIR%%/QtQmlDom/%%FULLVER%%/QtQmlDom/private/qqmldomexternalitems_p.h %%QT_INCDIR%%/QtQmlDom/%%FULLVER%%/QtQmlDom/private/qqmldomfieldfilter_p.h +%%QT_INCDIR%%/QtQmlDom/%%FULLVER%%/QtQmlDom/private/qqmldomfilelocations_p.h %%QT_INCDIR%%/QtQmlDom/%%FULLVER%%/QtQmlDom/private/qqmldomfilewriter_p.h %%QT_INCDIR%%/QtQmlDom/%%FULLVER%%/QtQmlDom/private/qqmldomfunctionref_p.h %%QT_INCDIR%%/QtQmlDom/%%FULLVER%%/QtQmlDom/private/qqmldomindentinglinewriter_p.h %%QT_INCDIR%%/QtQmlDom/%%FULLVER%%/QtQmlDom/private/qqmldomitem_p.h %%QT_INCDIR%%/QtQmlDom/%%FULLVER%%/QtQmlDom/private/qqmldomlinewriter_p.h +%%QT_INCDIR%%/QtQmlDom/%%FULLVER%%/QtQmlDom/private/qqmldomlinewriterfactory_p.h %%QT_INCDIR%%/QtQmlDom/%%FULLVER%%/QtQmlDom/private/qqmldommock_p.h %%QT_INCDIR%%/QtQmlDom/%%FULLVER%%/QtQmlDom/private/qqmldommoduleindex_p.h %%QT_INCDIR%%/QtQmlDom/%%FULLVER%%/QtQmlDom/private/qqmldomoutwriter_p.h @@ -537,11 +541,18 @@ bin/qmlscene6 %%QT_INCDIR%%/QtQmlDom/QtQmlDomVersion %%QT_INCDIR%%/QtQmlDom/qqmldom_global.h %%QT_INCDIR%%/QtQmlDom/qtqmldomversion.h +%%QT_INCDIR%%/QtQmlFormat/%%FULLVER%%/QtQmlFormat/private/qqmlformatoptions_p.h +%%QT_INCDIR%%/QtQmlFormat/%%FULLVER%%/QtQmlFormat/private/qqmlformatsettings_p.h +%%QT_INCDIR%%/QtQmlFormat/QtQmlFormat +%%QT_INCDIR%%/QtQmlFormat/QtQmlFormatDepends +%%QT_INCDIR%%/QtQmlFormat/QtQmlFormatVersion +%%QT_INCDIR%%/QtQmlFormat/qtqmlformatversion.h %%QT_INCDIR%%/QtQmlIntegration/QtQmlIntegration %%QT_INCDIR%%/QtQmlIntegration/QtQmlIntegrationDepends %%QT_INCDIR%%/QtQmlIntegration/QtQmlIntegrationVersion %%QT_INCDIR%%/QtQmlIntegration/qqmlintegration.h %%QT_INCDIR%%/QtQmlIntegration/qtqmlintegrationversion.h +%%QT_INCDIR%%/QtQmlLS/%%FULLVER%%/QtQmlLS/private/documentsymbolutils_p.h %%QT_INCDIR%%/QtQmlLS/%%FULLVER%%/QtQmlLS/private/qdochtmlparser_p.h %%QT_INCDIR%%/QtQmlLS/%%FULLVER%%/QtQmlLS/private/qlanguageserver_p.h %%QT_INCDIR%%/QtQmlLS/%%FULLVER%%/QtQmlLS/private/qlspcustomtypes_p.h @@ -549,6 +560,7 @@ bin/qmlscene6 %%QT_INCDIR%%/QtQmlLS/%%FULLVER%%/QtQmlLS/private/qqmlcodemodel_p.h %%QT_INCDIR%%/QtQmlLS/%%FULLVER%%/QtQmlLS/private/qqmlcompletioncontextstrings_p.h %%QT_INCDIR%%/QtQmlLS/%%FULLVER%%/QtQmlLS/private/qqmlcompletionsupport_p.h +%%QT_INCDIR%%/QtQmlLS/%%FULLVER%%/QtQmlLS/private/qqmldocumentsymbolsupport_p.h %%QT_INCDIR%%/QtQmlLS/%%FULLVER%%/QtQmlLS/private/qqmlfindusagessupport_p.h %%QT_INCDIR%%/QtQmlLS/%%FULLVER%%/QtQmlLS/private/qqmlformatting_p.h %%QT_INCDIR%%/QtQmlLS/%%FULLVER%%/QtQmlLS/private/qqmlgotodefinitionsupport_p.h @@ -597,6 +609,7 @@ bin/qmlscene6 %%QT_INCDIR%%/QtQmlModels/%%FULLVER%%/QtQmlModels/private/qqmladaptormodel_p.h %%QT_INCDIR%%/QtQmlModels/%%FULLVER%%/QtQmlModels/private/qqmladaptormodelenginedata_p.h %%QT_INCDIR%%/QtQmlModels/%%FULLVER%%/QtQmlModels/private/qqmlchangeset_p.h +%%QT_INCDIR%%/QtQmlModels/%%FULLVER%%/QtQmlModels/private/qqmldelegatecomponent_p.h %%QT_INCDIR%%/QtQmlModels/%%FULLVER%%/QtQmlModels/private/qqmldelegatemodel_p.h %%QT_INCDIR%%/QtQmlModels/%%FULLVER%%/QtQmlModels/private/qqmldelegatemodel_p_p.h %%QT_INCDIR%%/QtQmlModels/%%FULLVER%%/QtQmlModels/private/qqmldmabstractitemmodeldata_p.h @@ -721,6 +734,7 @@ bin/qmlscene6 %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickflickablebehavior_p.h %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickflipable_p.h %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickfocusscope_p.h +%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickfontinfo_p.h %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickfontloader_p.h %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickfontmetrics_p.h %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickforeignutils_p.h @@ -786,6 +800,7 @@ bin/qmlscene6 %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickrepeater_p.h %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickrepeater_p_p.h %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickrhiitem_p.h +%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquicksafearea_p.h %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickscalegrid_p_p.h %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickscreen_p.h %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickselectable_p.h @@ -1035,7 +1050,9 @@ bin/qmlscene6 %%QT_INCDIR%%/QtQuickControls2BasicStyleImpl/QtQuickControls2BasicStyleImplVersion %%QT_INCDIR%%/QtQuickControls2BasicStyleImpl/qtquickcontrols2basicstyleimplexports.h %%QT_INCDIR%%/QtQuickControls2BasicStyleImpl/qtquickcontrols2basicstyleimplversion.h +%%QT_INCDIR%%/QtQuickControls2FluentWinUI3StyleImpl/%%FULLVER%%/QtQuickControls2FluentWinUI3StyleImpl/private/qquickfluentwinui3focusframe_p.h %%QT_INCDIR%%/QtQuickControls2FluentWinUI3StyleImpl/%%FULLVER%%/QtQuickControls2FluentWinUI3StyleImpl/private/qquickfluentwinui3focusstroke_p.h +%%QT_INCDIR%%/QtQuickControls2FluentWinUI3StyleImpl/%%FULLVER%%/QtQuickControls2FluentWinUI3StyleImpl/private/qquickfluentwinui3styleimplglobal_p.h %%QT_INCDIR%%/QtQuickControls2FluentWinUI3StyleImpl/QtQuickControls2FluentWinUI3StyleImpl %%QT_INCDIR%%/QtQuickControls2FluentWinUI3StyleImpl/QtQuickControls2FluentWinUI3StyleImplDepends %%QT_INCDIR%%/QtQuickControls2FluentWinUI3StyleImpl/QtQuickControls2FluentWinUI3StyleImplVersion @@ -1151,6 +1168,7 @@ bin/qmlscene6 %%QT_INCDIR%%/QtQuickDialogs2QuickImpl/%%FULLVER%%/QtQuickDialogs2QuickImpl/private/qquickcolorinputs_p.h %%QT_INCDIR%%/QtQuickDialogs2QuickImpl/%%FULLVER%%/QtQuickDialogs2QuickImpl/private/qquickdialogimplfactory_p.h %%QT_INCDIR%%/QtQuickDialogs2QuickImpl/%%FULLVER%%/QtQuickDialogs2QuickImpl/private/qquickfiledialogdelegate_p.h +%%QT_INCDIR%%/QtQuickDialogs2QuickImpl/%%FULLVER%%/QtQuickDialogs2QuickImpl/private/qquickfiledialogdelegate_p_p.h %%QT_INCDIR%%/QtQuickDialogs2QuickImpl/%%FULLVER%%/QtQuickDialogs2QuickImpl/private/qquickfiledialogimpl_p.h %%QT_INCDIR%%/QtQuickDialogs2QuickImpl/%%FULLVER%%/QtQuickDialogs2QuickImpl/private/qquickfiledialogimpl_p_p.h %%QT_INCDIR%%/QtQuickDialogs2QuickImpl/%%FULLVER%%/QtQuickDialogs2QuickImpl/private/qquickfolderbreadcrumbbar_p.h @@ -1167,6 +1185,8 @@ bin/qmlscene6 %%QT_INCDIR%%/QtQuickDialogs2QuickImpl/%%FULLVER%%/QtQuickDialogs2QuickImpl/private/qquickplatformfontdialog_p.h %%QT_INCDIR%%/QtQuickDialogs2QuickImpl/%%FULLVER%%/QtQuickDialogs2QuickImpl/private/qquickplatformmessagedialog_p.h %%QT_INCDIR%%/QtQuickDialogs2QuickImpl/%%FULLVER%%/QtQuickDialogs2QuickImpl/private/qquicksaturationlightnesspicker_p.h +%%QT_INCDIR%%/QtQuickDialogs2QuickImpl/%%FULLVER%%/QtQuickDialogs2QuickImpl/private/qquicksidebar_p.h +%%QT_INCDIR%%/QtQuickDialogs2QuickImpl/%%FULLVER%%/QtQuickDialogs2QuickImpl/private/qquicksidebar_p_p.h %%QT_INCDIR%%/QtQuickDialogs2QuickImpl/%%FULLVER%%/QtQuickDialogs2QuickImpl/private/qtquickdialogs2quickimplforeign_p.h %%QT_INCDIR%%/QtQuickDialogs2QuickImpl/%%FULLVER%%/QtQuickDialogs2QuickImpl/private/qtquickdialogs2quickimplglobal_p.h %%QT_INCDIR%%/QtQuickDialogs2QuickImpl/QtQuickDialogs2QuickImpl @@ -1185,6 +1205,8 @@ bin/qmlscene6 %%QT_INCDIR%%/QtQuickEffects/%%FULLVER%%/QtQuickEffects/private/qgfxsourceproxy_p.h %%QT_INCDIR%%/QtQuickEffects/%%FULLVER%%/QtQuickEffects/private/qquickmultieffect_p.h %%QT_INCDIR%%/QtQuickEffects/%%FULLVER%%/QtQuickEffects/private/qquickmultieffect_p_p.h +%%QT_INCDIR%%/QtQuickEffects/%%FULLVER%%/QtQuickEffects/private/qquickrectangularshadow_p.h +%%QT_INCDIR%%/QtQuickEffects/%%FULLVER%%/QtQuickEffects/private/qquickrectangularshadow_p_p.h %%QT_INCDIR%%/QtQuickEffects/%%FULLVER%%/QtQuickEffects/private/qtquickeffectsglobal_p.h %%QT_INCDIR%%/QtQuickEffects/QtQuickEffects %%QT_INCDIR%%/QtQuickEffects/QtQuickEffectsDepends @@ -1268,6 +1290,7 @@ bin/qmlscene6 %%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquickcontainer_p.h %%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquickcontainer_p_p.h %%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquickcontentitem_p.h +%%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquickcontextmenu_p.h %%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquickcontrol_p.h %%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquickcontrol_p_p.h %%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquickdayofweekmodel_p.h @@ -1349,6 +1372,7 @@ bin/qmlscene6 %%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquickswitchdelegate_p.h %%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquicktabbar_p.h %%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquicktabbutton_p.h +%%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquicktableviewdelegate_p.h %%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquicktemplatesutils_p.h %%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquicktextarea_p.h %%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquicktextarea_p_p.h @@ -1438,6 +1462,14 @@ lib/cmake/Qt6LabsAnimation/Qt6LabsAnimationTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6LabsAnimation/Qt6LabsAnimationTargets.cmake lib/cmake/Qt6LabsAnimation/Qt6LabsAnimationVersionlessAliasTargets.cmake lib/cmake/Qt6LabsAnimation/Qt6LabsAnimationVersionlessTargets.cmake +lib/cmake/Qt6LabsAnimationPrivate/Qt6LabsAnimationPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6LabsAnimationPrivate/Qt6LabsAnimationPrivateConfig.cmake +lib/cmake/Qt6LabsAnimationPrivate/Qt6LabsAnimationPrivateConfigVersion.cmake +lib/cmake/Qt6LabsAnimationPrivate/Qt6LabsAnimationPrivateConfigVersionImpl.cmake +lib/cmake/Qt6LabsAnimationPrivate/Qt6LabsAnimationPrivateDependencies.cmake +lib/cmake/Qt6LabsAnimationPrivate/Qt6LabsAnimationPrivateTargets.cmake +lib/cmake/Qt6LabsAnimationPrivate/Qt6LabsAnimationPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6LabsAnimationPrivate/Qt6LabsAnimationPrivateVersionlessTargets.cmake lib/cmake/Qt6LabsFolderListModel/Qt6LabsFolderListModelAdditionalTargetInfo.cmake lib/cmake/Qt6LabsFolderListModel/Qt6LabsFolderListModelConfig.cmake lib/cmake/Qt6LabsFolderListModel/Qt6LabsFolderListModelConfigVersion.cmake @@ -1447,6 +1479,14 @@ lib/cmake/Qt6LabsFolderListModel/Qt6LabsFolderListModelTargets-%%CMAKE_BUILD_TYP lib/cmake/Qt6LabsFolderListModel/Qt6LabsFolderListModelTargets.cmake lib/cmake/Qt6LabsFolderListModel/Qt6LabsFolderListModelVersionlessAliasTargets.cmake lib/cmake/Qt6LabsFolderListModel/Qt6LabsFolderListModelVersionlessTargets.cmake +lib/cmake/Qt6LabsFolderListModelPrivate/Qt6LabsFolderListModelPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6LabsFolderListModelPrivate/Qt6LabsFolderListModelPrivateConfig.cmake +lib/cmake/Qt6LabsFolderListModelPrivate/Qt6LabsFolderListModelPrivateConfigVersion.cmake +lib/cmake/Qt6LabsFolderListModelPrivate/Qt6LabsFolderListModelPrivateConfigVersionImpl.cmake +lib/cmake/Qt6LabsFolderListModelPrivate/Qt6LabsFolderListModelPrivateDependencies.cmake +lib/cmake/Qt6LabsFolderListModelPrivate/Qt6LabsFolderListModelPrivateTargets.cmake +lib/cmake/Qt6LabsFolderListModelPrivate/Qt6LabsFolderListModelPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6LabsFolderListModelPrivate/Qt6LabsFolderListModelPrivateVersionlessTargets.cmake lib/cmake/Qt6LabsPlatform/Qt6LabsPlatformAdditionalTargetInfo.cmake lib/cmake/Qt6LabsPlatform/Qt6LabsPlatformConfig.cmake lib/cmake/Qt6LabsPlatform/Qt6LabsPlatformConfigVersion.cmake @@ -1456,6 +1496,14 @@ lib/cmake/Qt6LabsPlatform/Qt6LabsPlatformTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6LabsPlatform/Qt6LabsPlatformTargets.cmake lib/cmake/Qt6LabsPlatform/Qt6LabsPlatformVersionlessAliasTargets.cmake lib/cmake/Qt6LabsPlatform/Qt6LabsPlatformVersionlessTargets.cmake +lib/cmake/Qt6LabsPlatformPrivate/Qt6LabsPlatformPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6LabsPlatformPrivate/Qt6LabsPlatformPrivateConfig.cmake +lib/cmake/Qt6LabsPlatformPrivate/Qt6LabsPlatformPrivateConfigVersion.cmake +lib/cmake/Qt6LabsPlatformPrivate/Qt6LabsPlatformPrivateConfigVersionImpl.cmake +lib/cmake/Qt6LabsPlatformPrivate/Qt6LabsPlatformPrivateDependencies.cmake +lib/cmake/Qt6LabsPlatformPrivate/Qt6LabsPlatformPrivateTargets.cmake +lib/cmake/Qt6LabsPlatformPrivate/Qt6LabsPlatformPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6LabsPlatformPrivate/Qt6LabsPlatformPrivateVersionlessTargets.cmake lib/cmake/Qt6LabsQmlModels/Qt6LabsQmlModelsAdditionalTargetInfo.cmake lib/cmake/Qt6LabsQmlModels/Qt6LabsQmlModelsConfig.cmake lib/cmake/Qt6LabsQmlModels/Qt6LabsQmlModelsConfigVersion.cmake @@ -1465,6 +1513,14 @@ lib/cmake/Qt6LabsQmlModels/Qt6LabsQmlModelsTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6LabsQmlModels/Qt6LabsQmlModelsTargets.cmake lib/cmake/Qt6LabsQmlModels/Qt6LabsQmlModelsVersionlessAliasTargets.cmake lib/cmake/Qt6LabsQmlModels/Qt6LabsQmlModelsVersionlessTargets.cmake +lib/cmake/Qt6LabsQmlModelsPrivate/Qt6LabsQmlModelsPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6LabsQmlModelsPrivate/Qt6LabsQmlModelsPrivateConfig.cmake +lib/cmake/Qt6LabsQmlModelsPrivate/Qt6LabsQmlModelsPrivateConfigVersion.cmake +lib/cmake/Qt6LabsQmlModelsPrivate/Qt6LabsQmlModelsPrivateConfigVersionImpl.cmake +lib/cmake/Qt6LabsQmlModelsPrivate/Qt6LabsQmlModelsPrivateDependencies.cmake +lib/cmake/Qt6LabsQmlModelsPrivate/Qt6LabsQmlModelsPrivateTargets.cmake +lib/cmake/Qt6LabsQmlModelsPrivate/Qt6LabsQmlModelsPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6LabsQmlModelsPrivate/Qt6LabsQmlModelsPrivateVersionlessTargets.cmake lib/cmake/Qt6LabsSettings/Qt6LabsSettingsAdditionalTargetInfo.cmake lib/cmake/Qt6LabsSettings/Qt6LabsSettingsConfig.cmake lib/cmake/Qt6LabsSettings/Qt6LabsSettingsConfigVersion.cmake @@ -1474,6 +1530,14 @@ lib/cmake/Qt6LabsSettings/Qt6LabsSettingsTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6LabsSettings/Qt6LabsSettingsTargets.cmake lib/cmake/Qt6LabsSettings/Qt6LabsSettingsVersionlessAliasTargets.cmake lib/cmake/Qt6LabsSettings/Qt6LabsSettingsVersionlessTargets.cmake +lib/cmake/Qt6LabsSettingsPrivate/Qt6LabsSettingsPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6LabsSettingsPrivate/Qt6LabsSettingsPrivateConfig.cmake +lib/cmake/Qt6LabsSettingsPrivate/Qt6LabsSettingsPrivateConfigVersion.cmake +lib/cmake/Qt6LabsSettingsPrivate/Qt6LabsSettingsPrivateConfigVersionImpl.cmake +lib/cmake/Qt6LabsSettingsPrivate/Qt6LabsSettingsPrivateDependencies.cmake +lib/cmake/Qt6LabsSettingsPrivate/Qt6LabsSettingsPrivateTargets.cmake +lib/cmake/Qt6LabsSettingsPrivate/Qt6LabsSettingsPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6LabsSettingsPrivate/Qt6LabsSettingsPrivateVersionlessTargets.cmake lib/cmake/Qt6LabsSharedImage/Qt6LabsSharedImageAdditionalTargetInfo.cmake lib/cmake/Qt6LabsSharedImage/Qt6LabsSharedImageConfig.cmake lib/cmake/Qt6LabsSharedImage/Qt6LabsSharedImageConfigVersion.cmake @@ -1483,6 +1547,14 @@ lib/cmake/Qt6LabsSharedImage/Qt6LabsSharedImageTargets-%%CMAKE_BUILD_TYPE%%.cmak lib/cmake/Qt6LabsSharedImage/Qt6LabsSharedImageTargets.cmake lib/cmake/Qt6LabsSharedImage/Qt6LabsSharedImageVersionlessAliasTargets.cmake lib/cmake/Qt6LabsSharedImage/Qt6LabsSharedImageVersionlessTargets.cmake +lib/cmake/Qt6LabsSharedImagePrivate/Qt6LabsSharedImagePrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6LabsSharedImagePrivate/Qt6LabsSharedImagePrivateConfig.cmake +lib/cmake/Qt6LabsSharedImagePrivate/Qt6LabsSharedImagePrivateConfigVersion.cmake +lib/cmake/Qt6LabsSharedImagePrivate/Qt6LabsSharedImagePrivateConfigVersionImpl.cmake +lib/cmake/Qt6LabsSharedImagePrivate/Qt6LabsSharedImagePrivateDependencies.cmake +lib/cmake/Qt6LabsSharedImagePrivate/Qt6LabsSharedImagePrivateTargets.cmake +lib/cmake/Qt6LabsSharedImagePrivate/Qt6LabsSharedImagePrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6LabsSharedImagePrivate/Qt6LabsSharedImagePrivateVersionlessTargets.cmake lib/cmake/Qt6LabsWavefrontMesh/Qt6LabsWavefrontMeshAdditionalTargetInfo.cmake lib/cmake/Qt6LabsWavefrontMesh/Qt6LabsWavefrontMeshConfig.cmake lib/cmake/Qt6LabsWavefrontMesh/Qt6LabsWavefrontMeshConfigVersion.cmake @@ -1492,6 +1564,14 @@ lib/cmake/Qt6LabsWavefrontMesh/Qt6LabsWavefrontMeshTargets-%%CMAKE_BUILD_TYPE%%. lib/cmake/Qt6LabsWavefrontMesh/Qt6LabsWavefrontMeshTargets.cmake lib/cmake/Qt6LabsWavefrontMesh/Qt6LabsWavefrontMeshVersionlessAliasTargets.cmake lib/cmake/Qt6LabsWavefrontMesh/Qt6LabsWavefrontMeshVersionlessTargets.cmake +lib/cmake/Qt6LabsWavefrontMeshPrivate/Qt6LabsWavefrontMeshPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6LabsWavefrontMeshPrivate/Qt6LabsWavefrontMeshPrivateConfig.cmake +lib/cmake/Qt6LabsWavefrontMeshPrivate/Qt6LabsWavefrontMeshPrivateConfigVersion.cmake +lib/cmake/Qt6LabsWavefrontMeshPrivate/Qt6LabsWavefrontMeshPrivateConfigVersionImpl.cmake +lib/cmake/Qt6LabsWavefrontMeshPrivate/Qt6LabsWavefrontMeshPrivateDependencies.cmake +lib/cmake/Qt6LabsWavefrontMeshPrivate/Qt6LabsWavefrontMeshPrivateTargets.cmake +lib/cmake/Qt6LabsWavefrontMeshPrivate/Qt6LabsWavefrontMeshPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6LabsWavefrontMeshPrivate/Qt6LabsWavefrontMeshPrivateVersionlessTargets.cmake lib/cmake/Qt6PacketProtocolPrivate/Qt6PacketProtocolPrivateAdditionalTargetInfo.cmake lib/cmake/Qt6PacketProtocolPrivate/Qt6PacketProtocolPrivateConfig.cmake lib/cmake/Qt6PacketProtocolPrivate/Qt6PacketProtocolPrivateConfigVersion.cmake @@ -1694,12 +1774,6 @@ lib/cmake/Qt6Qml/QmlPlugins/Qt6qtquickcontrols2materialstylepluginConfigVersion. lib/cmake/Qt6Qml/QmlPlugins/Qt6qtquickcontrols2materialstylepluginConfigVersionImpl.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6qtquickcontrols2materialstylepluginTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6qtquickcontrols2materialstylepluginTargets.cmake -lib/cmake/Qt6Qml/QmlPlugins/Qt6qtquickcontrols2nativestylepluginAdditionalTargetInfo.cmake -lib/cmake/Qt6Qml/QmlPlugins/Qt6qtquickcontrols2nativestylepluginConfig.cmake -lib/cmake/Qt6Qml/QmlPlugins/Qt6qtquickcontrols2nativestylepluginConfigVersion.cmake -lib/cmake/Qt6Qml/QmlPlugins/Qt6qtquickcontrols2nativestylepluginConfigVersionImpl.cmake -lib/cmake/Qt6Qml/QmlPlugins/Qt6qtquickcontrols2nativestylepluginTargets-%%CMAKE_BUILD_TYPE%%.cmake -lib/cmake/Qt6Qml/QmlPlugins/Qt6qtquickcontrols2nativestylepluginTargets.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6qtquickcontrols2pluginAdditionalTargetInfo.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6qtquickcontrols2pluginConfig.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6qtquickcontrols2pluginConfigVersion.cmake @@ -1857,6 +1931,14 @@ lib/cmake/Qt6QmlAssetDownloader/Qt6QmlAssetDownloaderTargets-%%CMAKE_BUILD_TYPE% lib/cmake/Qt6QmlAssetDownloader/Qt6QmlAssetDownloaderTargets.cmake lib/cmake/Qt6QmlAssetDownloader/Qt6QmlAssetDownloaderVersionlessAliasTargets.cmake lib/cmake/Qt6QmlAssetDownloader/Qt6QmlAssetDownloaderVersionlessTargets.cmake +lib/cmake/Qt6QmlAssetDownloaderPrivate/Qt6QmlAssetDownloaderPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6QmlAssetDownloaderPrivate/Qt6QmlAssetDownloaderPrivateConfig.cmake +lib/cmake/Qt6QmlAssetDownloaderPrivate/Qt6QmlAssetDownloaderPrivateConfigVersion.cmake +lib/cmake/Qt6QmlAssetDownloaderPrivate/Qt6QmlAssetDownloaderPrivateConfigVersionImpl.cmake +lib/cmake/Qt6QmlAssetDownloaderPrivate/Qt6QmlAssetDownloaderPrivateDependencies.cmake +lib/cmake/Qt6QmlAssetDownloaderPrivate/Qt6QmlAssetDownloaderPrivateTargets.cmake +lib/cmake/Qt6QmlAssetDownloaderPrivate/Qt6QmlAssetDownloaderPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6QmlAssetDownloaderPrivate/Qt6QmlAssetDownloaderPrivateVersionlessTargets.cmake lib/cmake/Qt6QmlCompiler/Qt6QmlCompilerAdditionalTargetInfo.cmake lib/cmake/Qt6QmlCompiler/Qt6QmlCompilerConfig.cmake lib/cmake/Qt6QmlCompiler/Qt6QmlCompilerConfigVersion.cmake @@ -1873,6 +1955,14 @@ lib/cmake/Qt6QmlCompiler/Qt6QmlLintQuickPluginConfigVersion.cmake lib/cmake/Qt6QmlCompiler/Qt6QmlLintQuickPluginConfigVersionImpl.cmake lib/cmake/Qt6QmlCompiler/Qt6QmlLintQuickPluginTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6QmlCompiler/Qt6QmlLintQuickPluginTargets.cmake +lib/cmake/Qt6QmlCompilerPrivate/Qt6QmlCompilerPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6QmlCompilerPrivate/Qt6QmlCompilerPrivateConfig.cmake +lib/cmake/Qt6QmlCompilerPrivate/Qt6QmlCompilerPrivateConfigVersion.cmake +lib/cmake/Qt6QmlCompilerPrivate/Qt6QmlCompilerPrivateConfigVersionImpl.cmake +lib/cmake/Qt6QmlCompilerPrivate/Qt6QmlCompilerPrivateDependencies.cmake +lib/cmake/Qt6QmlCompilerPrivate/Qt6QmlCompilerPrivateTargets.cmake +lib/cmake/Qt6QmlCompilerPrivate/Qt6QmlCompilerPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6QmlCompilerPrivate/Qt6QmlCompilerPrivateVersionlessTargets.cmake lib/cmake/Qt6QmlCore/Qt6QmlCoreAdditionalTargetInfo.cmake lib/cmake/Qt6QmlCore/Qt6QmlCoreConfig.cmake lib/cmake/Qt6QmlCore/Qt6QmlCoreConfigVersion.cmake @@ -1882,6 +1972,14 @@ lib/cmake/Qt6QmlCore/Qt6QmlCoreTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6QmlCore/Qt6QmlCoreTargets.cmake lib/cmake/Qt6QmlCore/Qt6QmlCoreVersionlessAliasTargets.cmake lib/cmake/Qt6QmlCore/Qt6QmlCoreVersionlessTargets.cmake +lib/cmake/Qt6QmlCorePrivate/Qt6QmlCorePrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6QmlCorePrivate/Qt6QmlCorePrivateConfig.cmake +lib/cmake/Qt6QmlCorePrivate/Qt6QmlCorePrivateConfigVersion.cmake +lib/cmake/Qt6QmlCorePrivate/Qt6QmlCorePrivateConfigVersionImpl.cmake +lib/cmake/Qt6QmlCorePrivate/Qt6QmlCorePrivateDependencies.cmake +lib/cmake/Qt6QmlCorePrivate/Qt6QmlCorePrivateTargets.cmake +lib/cmake/Qt6QmlCorePrivate/Qt6QmlCorePrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6QmlCorePrivate/Qt6QmlCorePrivateVersionlessTargets.cmake lib/cmake/Qt6QmlDebugPrivate/Qt6QmlDebugPrivateAdditionalTargetInfo.cmake lib/cmake/Qt6QmlDebugPrivate/Qt6QmlDebugPrivateConfig.cmake lib/cmake/Qt6QmlDebugPrivate/Qt6QmlDebugPrivateConfigVersion.cmake @@ -1900,6 +1998,15 @@ lib/cmake/Qt6QmlDomPrivate/Qt6QmlDomPrivateTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6QmlDomPrivate/Qt6QmlDomPrivateTargets.cmake lib/cmake/Qt6QmlDomPrivate/Qt6QmlDomPrivateVersionlessAliasTargets.cmake lib/cmake/Qt6QmlDomPrivate/Qt6QmlDomPrivateVersionlessTargets.cmake +lib/cmake/Qt6QmlFormatPrivate/Qt6QmlFormatPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6QmlFormatPrivate/Qt6QmlFormatPrivateConfig.cmake +lib/cmake/Qt6QmlFormatPrivate/Qt6QmlFormatPrivateConfigVersion.cmake +lib/cmake/Qt6QmlFormatPrivate/Qt6QmlFormatPrivateConfigVersionImpl.cmake +lib/cmake/Qt6QmlFormatPrivate/Qt6QmlFormatPrivateDependencies.cmake +lib/cmake/Qt6QmlFormatPrivate/Qt6QmlFormatPrivateTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/Qt6QmlFormatPrivate/Qt6QmlFormatPrivateTargets.cmake +lib/cmake/Qt6QmlFormatPrivate/Qt6QmlFormatPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6QmlFormatPrivate/Qt6QmlFormatPrivateVersionlessTargets.cmake lib/cmake/Qt6QmlImportScanner/Qt6QmlImportScannerConfig.cmake lib/cmake/Qt6QmlImportScanner/Qt6QmlImportScannerConfigVersion.cmake lib/cmake/Qt6QmlImportScanner/Qt6QmlImportScannerConfigVersionImpl.cmake @@ -1911,6 +2018,14 @@ lib/cmake/Qt6QmlIntegration/Qt6QmlIntegrationConfigVersionImpl.cmake lib/cmake/Qt6QmlIntegration/Qt6QmlIntegrationTargets.cmake lib/cmake/Qt6QmlIntegration/Qt6QmlIntegrationVersionlessAliasTargets.cmake lib/cmake/Qt6QmlIntegration/Qt6QmlIntegrationVersionlessTargets.cmake +lib/cmake/Qt6QmlIntegrationPrivate/Qt6QmlIntegrationPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6QmlIntegrationPrivate/Qt6QmlIntegrationPrivateConfig.cmake +lib/cmake/Qt6QmlIntegrationPrivate/Qt6QmlIntegrationPrivateConfigVersion.cmake +lib/cmake/Qt6QmlIntegrationPrivate/Qt6QmlIntegrationPrivateConfigVersionImpl.cmake +lib/cmake/Qt6QmlIntegrationPrivate/Qt6QmlIntegrationPrivateDependencies.cmake +lib/cmake/Qt6QmlIntegrationPrivate/Qt6QmlIntegrationPrivateTargets.cmake +lib/cmake/Qt6QmlIntegrationPrivate/Qt6QmlIntegrationPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6QmlIntegrationPrivate/Qt6QmlIntegrationPrivateVersionlessTargets.cmake lib/cmake/Qt6QmlLSPrivate/Qt6QmlLSPrivateAdditionalTargetInfo.cmake lib/cmake/Qt6QmlLSPrivate/Qt6QmlLSPrivateConfig.cmake lib/cmake/Qt6QmlLSPrivate/Qt6QmlLSPrivateConfigVersion.cmake @@ -1936,6 +2051,14 @@ lib/cmake/Qt6QmlLocalStorage/Qt6QmlLocalStorageTargets-%%CMAKE_BUILD_TYPE%%.cmak lib/cmake/Qt6QmlLocalStorage/Qt6QmlLocalStorageTargets.cmake lib/cmake/Qt6QmlLocalStorage/Qt6QmlLocalStorageVersionlessAliasTargets.cmake lib/cmake/Qt6QmlLocalStorage/Qt6QmlLocalStorageVersionlessTargets.cmake +lib/cmake/Qt6QmlLocalStoragePrivate/Qt6QmlLocalStoragePrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6QmlLocalStoragePrivate/Qt6QmlLocalStoragePrivateConfig.cmake +lib/cmake/Qt6QmlLocalStoragePrivate/Qt6QmlLocalStoragePrivateConfigVersion.cmake +lib/cmake/Qt6QmlLocalStoragePrivate/Qt6QmlLocalStoragePrivateConfigVersionImpl.cmake +lib/cmake/Qt6QmlLocalStoragePrivate/Qt6QmlLocalStoragePrivateDependencies.cmake +lib/cmake/Qt6QmlLocalStoragePrivate/Qt6QmlLocalStoragePrivateTargets.cmake +lib/cmake/Qt6QmlLocalStoragePrivate/Qt6QmlLocalStoragePrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6QmlLocalStoragePrivate/Qt6QmlLocalStoragePrivateVersionlessTargets.cmake lib/cmake/Qt6QmlMeta/Qt6QmlMetaAdditionalTargetInfo.cmake lib/cmake/Qt6QmlMeta/Qt6QmlMetaConfig.cmake lib/cmake/Qt6QmlMeta/Qt6QmlMetaConfigVersion.cmake @@ -1945,6 +2068,14 @@ lib/cmake/Qt6QmlMeta/Qt6QmlMetaTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6QmlMeta/Qt6QmlMetaTargets.cmake lib/cmake/Qt6QmlMeta/Qt6QmlMetaVersionlessAliasTargets.cmake lib/cmake/Qt6QmlMeta/Qt6QmlMetaVersionlessTargets.cmake +lib/cmake/Qt6QmlMetaPrivate/Qt6QmlMetaPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6QmlMetaPrivate/Qt6QmlMetaPrivateConfig.cmake +lib/cmake/Qt6QmlMetaPrivate/Qt6QmlMetaPrivateConfigVersion.cmake +lib/cmake/Qt6QmlMetaPrivate/Qt6QmlMetaPrivateConfigVersionImpl.cmake +lib/cmake/Qt6QmlMetaPrivate/Qt6QmlMetaPrivateDependencies.cmake +lib/cmake/Qt6QmlMetaPrivate/Qt6QmlMetaPrivateTargets.cmake +lib/cmake/Qt6QmlMetaPrivate/Qt6QmlMetaPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6QmlMetaPrivate/Qt6QmlMetaPrivateVersionlessTargets.cmake lib/cmake/Qt6QmlModels/Qt6QmlModelsAdditionalTargetInfo.cmake lib/cmake/Qt6QmlModels/Qt6QmlModelsConfig.cmake lib/cmake/Qt6QmlModels/Qt6QmlModelsConfigVersion.cmake @@ -1954,6 +2085,14 @@ lib/cmake/Qt6QmlModels/Qt6QmlModelsTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6QmlModels/Qt6QmlModelsTargets.cmake lib/cmake/Qt6QmlModels/Qt6QmlModelsVersionlessAliasTargets.cmake lib/cmake/Qt6QmlModels/Qt6QmlModelsVersionlessTargets.cmake +lib/cmake/Qt6QmlModelsPrivate/Qt6QmlModelsPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6QmlModelsPrivate/Qt6QmlModelsPrivateConfig.cmake +lib/cmake/Qt6QmlModelsPrivate/Qt6QmlModelsPrivateConfigVersion.cmake +lib/cmake/Qt6QmlModelsPrivate/Qt6QmlModelsPrivateConfigVersionImpl.cmake +lib/cmake/Qt6QmlModelsPrivate/Qt6QmlModelsPrivateDependencies.cmake +lib/cmake/Qt6QmlModelsPrivate/Qt6QmlModelsPrivateTargets.cmake +lib/cmake/Qt6QmlModelsPrivate/Qt6QmlModelsPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6QmlModelsPrivate/Qt6QmlModelsPrivateVersionlessTargets.cmake lib/cmake/Qt6QmlNetwork/Qt6QmlNetworkAdditionalTargetInfo.cmake lib/cmake/Qt6QmlNetwork/Qt6QmlNetworkConfig.cmake lib/cmake/Qt6QmlNetwork/Qt6QmlNetworkConfigVersion.cmake @@ -1963,6 +2102,22 @@ lib/cmake/Qt6QmlNetwork/Qt6QmlNetworkTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6QmlNetwork/Qt6QmlNetworkTargets.cmake lib/cmake/Qt6QmlNetwork/Qt6QmlNetworkVersionlessAliasTargets.cmake lib/cmake/Qt6QmlNetwork/Qt6QmlNetworkVersionlessTargets.cmake +lib/cmake/Qt6QmlNetworkPrivate/Qt6QmlNetworkPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6QmlNetworkPrivate/Qt6QmlNetworkPrivateConfig.cmake +lib/cmake/Qt6QmlNetworkPrivate/Qt6QmlNetworkPrivateConfigVersion.cmake +lib/cmake/Qt6QmlNetworkPrivate/Qt6QmlNetworkPrivateConfigVersionImpl.cmake +lib/cmake/Qt6QmlNetworkPrivate/Qt6QmlNetworkPrivateDependencies.cmake +lib/cmake/Qt6QmlNetworkPrivate/Qt6QmlNetworkPrivateTargets.cmake +lib/cmake/Qt6QmlNetworkPrivate/Qt6QmlNetworkPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6QmlNetworkPrivate/Qt6QmlNetworkPrivateVersionlessTargets.cmake +lib/cmake/Qt6QmlPrivate/Qt6QmlPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6QmlPrivate/Qt6QmlPrivateConfig.cmake +lib/cmake/Qt6QmlPrivate/Qt6QmlPrivateConfigVersion.cmake +lib/cmake/Qt6QmlPrivate/Qt6QmlPrivateConfigVersionImpl.cmake +lib/cmake/Qt6QmlPrivate/Qt6QmlPrivateDependencies.cmake +lib/cmake/Qt6QmlPrivate/Qt6QmlPrivateTargets.cmake +lib/cmake/Qt6QmlPrivate/Qt6QmlPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6QmlPrivate/Qt6QmlPrivateVersionlessTargets.cmake lib/cmake/Qt6QmlToolingSettingsPrivate/Qt6QmlToolingSettingsPrivateAdditionalTargetInfo.cmake lib/cmake/Qt6QmlToolingSettingsPrivate/Qt6QmlToolingSettingsPrivateConfig.cmake lib/cmake/Qt6QmlToolingSettingsPrivate/Qt6QmlToolingSettingsPrivateConfigVersion.cmake @@ -1998,6 +2153,14 @@ lib/cmake/Qt6QmlWorkerScript/Qt6QmlWorkerScriptTargets-%%CMAKE_BUILD_TYPE%%.cmak lib/cmake/Qt6QmlWorkerScript/Qt6QmlWorkerScriptTargets.cmake lib/cmake/Qt6QmlWorkerScript/Qt6QmlWorkerScriptVersionlessAliasTargets.cmake lib/cmake/Qt6QmlWorkerScript/Qt6QmlWorkerScriptVersionlessTargets.cmake +lib/cmake/Qt6QmlWorkerScriptPrivate/Qt6QmlWorkerScriptPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6QmlWorkerScriptPrivate/Qt6QmlWorkerScriptPrivateConfig.cmake +lib/cmake/Qt6QmlWorkerScriptPrivate/Qt6QmlWorkerScriptPrivateConfigVersion.cmake +lib/cmake/Qt6QmlWorkerScriptPrivate/Qt6QmlWorkerScriptPrivateConfigVersionImpl.cmake +lib/cmake/Qt6QmlWorkerScriptPrivate/Qt6QmlWorkerScriptPrivateDependencies.cmake +lib/cmake/Qt6QmlWorkerScriptPrivate/Qt6QmlWorkerScriptPrivateTargets.cmake +lib/cmake/Qt6QmlWorkerScriptPrivate/Qt6QmlWorkerScriptPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6QmlWorkerScriptPrivate/Qt6QmlWorkerScriptPrivateVersionlessTargets.cmake lib/cmake/Qt6QmlXmlListModel/Qt6QmlXmlListModelAdditionalTargetInfo.cmake lib/cmake/Qt6QmlXmlListModel/Qt6QmlXmlListModelConfig.cmake lib/cmake/Qt6QmlXmlListModel/Qt6QmlXmlListModelConfigVersion.cmake @@ -2007,6 +2170,14 @@ lib/cmake/Qt6QmlXmlListModel/Qt6QmlXmlListModelTargets-%%CMAKE_BUILD_TYPE%%.cmak lib/cmake/Qt6QmlXmlListModel/Qt6QmlXmlListModelTargets.cmake lib/cmake/Qt6QmlXmlListModel/Qt6QmlXmlListModelVersionlessAliasTargets.cmake lib/cmake/Qt6QmlXmlListModel/Qt6QmlXmlListModelVersionlessTargets.cmake +lib/cmake/Qt6QmlXmlListModelPrivate/Qt6QmlXmlListModelPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6QmlXmlListModelPrivate/Qt6QmlXmlListModelPrivateConfig.cmake +lib/cmake/Qt6QmlXmlListModelPrivate/Qt6QmlXmlListModelPrivateConfigVersion.cmake +lib/cmake/Qt6QmlXmlListModelPrivate/Qt6QmlXmlListModelPrivateConfigVersionImpl.cmake +lib/cmake/Qt6QmlXmlListModelPrivate/Qt6QmlXmlListModelPrivateDependencies.cmake +lib/cmake/Qt6QmlXmlListModelPrivate/Qt6QmlXmlListModelPrivateTargets.cmake +lib/cmake/Qt6QmlXmlListModelPrivate/Qt6QmlXmlListModelPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6QmlXmlListModelPrivate/Qt6QmlXmlListModelPrivateVersionlessTargets.cmake lib/cmake/Qt6Quick/Qt6QuickAdditionalTargetInfo.cmake lib/cmake/Qt6Quick/Qt6QuickConfig.cmake lib/cmake/Qt6Quick/Qt6QuickConfigVersion.cmake @@ -2035,6 +2206,14 @@ lib/cmake/Qt6QuickControls2Basic/Qt6QuickControls2BasicTargets-%%CMAKE_BUILD_TYP lib/cmake/Qt6QuickControls2Basic/Qt6QuickControls2BasicTargets.cmake lib/cmake/Qt6QuickControls2Basic/Qt6QuickControls2BasicVersionlessAliasTargets.cmake lib/cmake/Qt6QuickControls2Basic/Qt6QuickControls2BasicVersionlessTargets.cmake +lib/cmake/Qt6QuickControls2BasicPrivate/Qt6QuickControls2BasicPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6QuickControls2BasicPrivate/Qt6QuickControls2BasicPrivateConfig.cmake +lib/cmake/Qt6QuickControls2BasicPrivate/Qt6QuickControls2BasicPrivateConfigVersion.cmake +lib/cmake/Qt6QuickControls2BasicPrivate/Qt6QuickControls2BasicPrivateConfigVersionImpl.cmake +lib/cmake/Qt6QuickControls2BasicPrivate/Qt6QuickControls2BasicPrivateDependencies.cmake +lib/cmake/Qt6QuickControls2BasicPrivate/Qt6QuickControls2BasicPrivateTargets.cmake +lib/cmake/Qt6QuickControls2BasicPrivate/Qt6QuickControls2BasicPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6QuickControls2BasicPrivate/Qt6QuickControls2BasicPrivateVersionlessTargets.cmake lib/cmake/Qt6QuickControls2BasicStyleImpl/Qt6QuickControls2BasicStyleImplAdditionalTargetInfo.cmake lib/cmake/Qt6QuickControls2BasicStyleImpl/Qt6QuickControls2BasicStyleImplConfig.cmake lib/cmake/Qt6QuickControls2BasicStyleImpl/Qt6QuickControls2BasicStyleImplConfigVersion.cmake @@ -2044,6 +2223,14 @@ lib/cmake/Qt6QuickControls2BasicStyleImpl/Qt6QuickControls2BasicStyleImplTargets lib/cmake/Qt6QuickControls2BasicStyleImpl/Qt6QuickControls2BasicStyleImplTargets.cmake lib/cmake/Qt6QuickControls2BasicStyleImpl/Qt6QuickControls2BasicStyleImplVersionlessAliasTargets.cmake lib/cmake/Qt6QuickControls2BasicStyleImpl/Qt6QuickControls2BasicStyleImplVersionlessTargets.cmake +lib/cmake/Qt6QuickControls2BasicStyleImplPrivate/Qt6QuickControls2BasicStyleImplPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6QuickControls2BasicStyleImplPrivate/Qt6QuickControls2BasicStyleImplPrivateConfig.cmake +lib/cmake/Qt6QuickControls2BasicStyleImplPrivate/Qt6QuickControls2BasicStyleImplPrivateConfigVersion.cmake +lib/cmake/Qt6QuickControls2BasicStyleImplPrivate/Qt6QuickControls2BasicStyleImplPrivateConfigVersionImpl.cmake +lib/cmake/Qt6QuickControls2BasicStyleImplPrivate/Qt6QuickControls2BasicStyleImplPrivateDependencies.cmake +lib/cmake/Qt6QuickControls2BasicStyleImplPrivate/Qt6QuickControls2BasicStyleImplPrivateTargets.cmake +lib/cmake/Qt6QuickControls2BasicStyleImplPrivate/Qt6QuickControls2BasicStyleImplPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6QuickControls2BasicStyleImplPrivate/Qt6QuickControls2BasicStyleImplPrivateVersionlessTargets.cmake lib/cmake/Qt6QuickControls2FluentWinUI3StyleImpl/Qt6QuickControls2FluentWinUI3StyleImplAdditionalTargetInfo.cmake lib/cmake/Qt6QuickControls2FluentWinUI3StyleImpl/Qt6QuickControls2FluentWinUI3StyleImplConfig.cmake lib/cmake/Qt6QuickControls2FluentWinUI3StyleImpl/Qt6QuickControls2FluentWinUI3StyleImplConfigVersion.cmake @@ -2053,6 +2240,14 @@ lib/cmake/Qt6QuickControls2FluentWinUI3StyleImpl/Qt6QuickControls2FluentWinUI3St lib/cmake/Qt6QuickControls2FluentWinUI3StyleImpl/Qt6QuickControls2FluentWinUI3StyleImplTargets.cmake lib/cmake/Qt6QuickControls2FluentWinUI3StyleImpl/Qt6QuickControls2FluentWinUI3StyleImplVersionlessAliasTargets.cmake lib/cmake/Qt6QuickControls2FluentWinUI3StyleImpl/Qt6QuickControls2FluentWinUI3StyleImplVersionlessTargets.cmake +lib/cmake/Qt6QuickControls2FluentWinUI3StyleImplPrivate/Qt6QuickControls2FluentWinUI3StyleImplPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6QuickControls2FluentWinUI3StyleImplPrivate/Qt6QuickControls2FluentWinUI3StyleImplPrivateConfig.cmake +lib/cmake/Qt6QuickControls2FluentWinUI3StyleImplPrivate/Qt6QuickControls2FluentWinUI3StyleImplPrivateConfigVersion.cmake +lib/cmake/Qt6QuickControls2FluentWinUI3StyleImplPrivate/Qt6QuickControls2FluentWinUI3StyleImplPrivateConfigVersionImpl.cmake +lib/cmake/Qt6QuickControls2FluentWinUI3StyleImplPrivate/Qt6QuickControls2FluentWinUI3StyleImplPrivateDependencies.cmake +lib/cmake/Qt6QuickControls2FluentWinUI3StyleImplPrivate/Qt6QuickControls2FluentWinUI3StyleImplPrivateTargets.cmake +lib/cmake/Qt6QuickControls2FluentWinUI3StyleImplPrivate/Qt6QuickControls2FluentWinUI3StyleImplPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6QuickControls2FluentWinUI3StyleImplPrivate/Qt6QuickControls2FluentWinUI3StyleImplPrivateVersionlessTargets.cmake lib/cmake/Qt6QuickControls2Fusion/Qt6QuickControls2FusionAdditionalTargetInfo.cmake lib/cmake/Qt6QuickControls2Fusion/Qt6QuickControls2FusionConfig.cmake lib/cmake/Qt6QuickControls2Fusion/Qt6QuickControls2FusionConfigVersion.cmake @@ -2062,6 +2257,14 @@ lib/cmake/Qt6QuickControls2Fusion/Qt6QuickControls2FusionTargets-%%CMAKE_BUILD_T lib/cmake/Qt6QuickControls2Fusion/Qt6QuickControls2FusionTargets.cmake lib/cmake/Qt6QuickControls2Fusion/Qt6QuickControls2FusionVersionlessAliasTargets.cmake lib/cmake/Qt6QuickControls2Fusion/Qt6QuickControls2FusionVersionlessTargets.cmake +lib/cmake/Qt6QuickControls2FusionPrivate/Qt6QuickControls2FusionPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6QuickControls2FusionPrivate/Qt6QuickControls2FusionPrivateConfig.cmake +lib/cmake/Qt6QuickControls2FusionPrivate/Qt6QuickControls2FusionPrivateConfigVersion.cmake +lib/cmake/Qt6QuickControls2FusionPrivate/Qt6QuickControls2FusionPrivateConfigVersionImpl.cmake +lib/cmake/Qt6QuickControls2FusionPrivate/Qt6QuickControls2FusionPrivateDependencies.cmake +lib/cmake/Qt6QuickControls2FusionPrivate/Qt6QuickControls2FusionPrivateTargets.cmake +lib/cmake/Qt6QuickControls2FusionPrivate/Qt6QuickControls2FusionPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6QuickControls2FusionPrivate/Qt6QuickControls2FusionPrivateVersionlessTargets.cmake lib/cmake/Qt6QuickControls2FusionStyleImpl/Qt6QuickControls2FusionStyleImplAdditionalTargetInfo.cmake lib/cmake/Qt6QuickControls2FusionStyleImpl/Qt6QuickControls2FusionStyleImplConfig.cmake lib/cmake/Qt6QuickControls2FusionStyleImpl/Qt6QuickControls2FusionStyleImplConfigVersion.cmake @@ -2071,6 +2274,14 @@ lib/cmake/Qt6QuickControls2FusionStyleImpl/Qt6QuickControls2FusionStyleImplTarge lib/cmake/Qt6QuickControls2FusionStyleImpl/Qt6QuickControls2FusionStyleImplTargets.cmake lib/cmake/Qt6QuickControls2FusionStyleImpl/Qt6QuickControls2FusionStyleImplVersionlessAliasTargets.cmake lib/cmake/Qt6QuickControls2FusionStyleImpl/Qt6QuickControls2FusionStyleImplVersionlessTargets.cmake +lib/cmake/Qt6QuickControls2FusionStyleImplPrivate/Qt6QuickControls2FusionStyleImplPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6QuickControls2FusionStyleImplPrivate/Qt6QuickControls2FusionStyleImplPrivateConfig.cmake +lib/cmake/Qt6QuickControls2FusionStyleImplPrivate/Qt6QuickControls2FusionStyleImplPrivateConfigVersion.cmake +lib/cmake/Qt6QuickControls2FusionStyleImplPrivate/Qt6QuickControls2FusionStyleImplPrivateConfigVersionImpl.cmake +lib/cmake/Qt6QuickControls2FusionStyleImplPrivate/Qt6QuickControls2FusionStyleImplPrivateDependencies.cmake +lib/cmake/Qt6QuickControls2FusionStyleImplPrivate/Qt6QuickControls2FusionStyleImplPrivateTargets.cmake +lib/cmake/Qt6QuickControls2FusionStyleImplPrivate/Qt6QuickControls2FusionStyleImplPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6QuickControls2FusionStyleImplPrivate/Qt6QuickControls2FusionStyleImplPrivateVersionlessTargets.cmake lib/cmake/Qt6QuickControls2Imagine/Qt6QuickControls2ImagineAdditionalTargetInfo.cmake lib/cmake/Qt6QuickControls2Imagine/Qt6QuickControls2ImagineConfig.cmake lib/cmake/Qt6QuickControls2Imagine/Qt6QuickControls2ImagineConfigVersion.cmake @@ -2080,6 +2291,14 @@ lib/cmake/Qt6QuickControls2Imagine/Qt6QuickControls2ImagineTargets-%%CMAKE_BUILD lib/cmake/Qt6QuickControls2Imagine/Qt6QuickControls2ImagineTargets.cmake lib/cmake/Qt6QuickControls2Imagine/Qt6QuickControls2ImagineVersionlessAliasTargets.cmake lib/cmake/Qt6QuickControls2Imagine/Qt6QuickControls2ImagineVersionlessTargets.cmake +lib/cmake/Qt6QuickControls2ImaginePrivate/Qt6QuickControls2ImaginePrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6QuickControls2ImaginePrivate/Qt6QuickControls2ImaginePrivateConfig.cmake +lib/cmake/Qt6QuickControls2ImaginePrivate/Qt6QuickControls2ImaginePrivateConfigVersion.cmake +lib/cmake/Qt6QuickControls2ImaginePrivate/Qt6QuickControls2ImaginePrivateConfigVersionImpl.cmake +lib/cmake/Qt6QuickControls2ImaginePrivate/Qt6QuickControls2ImaginePrivateDependencies.cmake +lib/cmake/Qt6QuickControls2ImaginePrivate/Qt6QuickControls2ImaginePrivateTargets.cmake +lib/cmake/Qt6QuickControls2ImaginePrivate/Qt6QuickControls2ImaginePrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6QuickControls2ImaginePrivate/Qt6QuickControls2ImaginePrivateVersionlessTargets.cmake lib/cmake/Qt6QuickControls2ImagineStyleImpl/Qt6QuickControls2ImagineStyleImplAdditionalTargetInfo.cmake lib/cmake/Qt6QuickControls2ImagineStyleImpl/Qt6QuickControls2ImagineStyleImplConfig.cmake lib/cmake/Qt6QuickControls2ImagineStyleImpl/Qt6QuickControls2ImagineStyleImplConfigVersion.cmake @@ -2089,6 +2308,14 @@ lib/cmake/Qt6QuickControls2ImagineStyleImpl/Qt6QuickControls2ImagineStyleImplTar lib/cmake/Qt6QuickControls2ImagineStyleImpl/Qt6QuickControls2ImagineStyleImplTargets.cmake lib/cmake/Qt6QuickControls2ImagineStyleImpl/Qt6QuickControls2ImagineStyleImplVersionlessAliasTargets.cmake lib/cmake/Qt6QuickControls2ImagineStyleImpl/Qt6QuickControls2ImagineStyleImplVersionlessTargets.cmake +lib/cmake/Qt6QuickControls2ImagineStyleImplPrivate/Qt6QuickControls2ImagineStyleImplPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6QuickControls2ImagineStyleImplPrivate/Qt6QuickControls2ImagineStyleImplPrivateConfig.cmake +lib/cmake/Qt6QuickControls2ImagineStyleImplPrivate/Qt6QuickControls2ImagineStyleImplPrivateConfigVersion.cmake +lib/cmake/Qt6QuickControls2ImagineStyleImplPrivate/Qt6QuickControls2ImagineStyleImplPrivateConfigVersionImpl.cmake +lib/cmake/Qt6QuickControls2ImagineStyleImplPrivate/Qt6QuickControls2ImagineStyleImplPrivateDependencies.cmake +lib/cmake/Qt6QuickControls2ImagineStyleImplPrivate/Qt6QuickControls2ImagineStyleImplPrivateTargets.cmake +lib/cmake/Qt6QuickControls2ImagineStyleImplPrivate/Qt6QuickControls2ImagineStyleImplPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6QuickControls2ImagineStyleImplPrivate/Qt6QuickControls2ImagineStyleImplPrivateVersionlessTargets.cmake lib/cmake/Qt6QuickControls2Impl/Qt6QuickControls2ImplAdditionalTargetInfo.cmake lib/cmake/Qt6QuickControls2Impl/Qt6QuickControls2ImplConfig.cmake lib/cmake/Qt6QuickControls2Impl/Qt6QuickControls2ImplConfigVersion.cmake @@ -2098,6 +2325,14 @@ lib/cmake/Qt6QuickControls2Impl/Qt6QuickControls2ImplTargets-%%CMAKE_BUILD_TYPE% lib/cmake/Qt6QuickControls2Impl/Qt6QuickControls2ImplTargets.cmake lib/cmake/Qt6QuickControls2Impl/Qt6QuickControls2ImplVersionlessAliasTargets.cmake lib/cmake/Qt6QuickControls2Impl/Qt6QuickControls2ImplVersionlessTargets.cmake +lib/cmake/Qt6QuickControls2ImplPrivate/Qt6QuickControls2ImplPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6QuickControls2ImplPrivate/Qt6QuickControls2ImplPrivateConfig.cmake +lib/cmake/Qt6QuickControls2ImplPrivate/Qt6QuickControls2ImplPrivateConfigVersion.cmake +lib/cmake/Qt6QuickControls2ImplPrivate/Qt6QuickControls2ImplPrivateConfigVersionImpl.cmake +lib/cmake/Qt6QuickControls2ImplPrivate/Qt6QuickControls2ImplPrivateDependencies.cmake +lib/cmake/Qt6QuickControls2ImplPrivate/Qt6QuickControls2ImplPrivateTargets.cmake +lib/cmake/Qt6QuickControls2ImplPrivate/Qt6QuickControls2ImplPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6QuickControls2ImplPrivate/Qt6QuickControls2ImplPrivateVersionlessTargets.cmake lib/cmake/Qt6QuickControls2Material/Qt6QuickControls2MaterialAdditionalTargetInfo.cmake lib/cmake/Qt6QuickControls2Material/Qt6QuickControls2MaterialConfig.cmake lib/cmake/Qt6QuickControls2Material/Qt6QuickControls2MaterialConfigVersion.cmake @@ -2107,6 +2342,14 @@ lib/cmake/Qt6QuickControls2Material/Qt6QuickControls2MaterialTargets-%%CMAKE_BUI lib/cmake/Qt6QuickControls2Material/Qt6QuickControls2MaterialTargets.cmake lib/cmake/Qt6QuickControls2Material/Qt6QuickControls2MaterialVersionlessAliasTargets.cmake lib/cmake/Qt6QuickControls2Material/Qt6QuickControls2MaterialVersionlessTargets.cmake +lib/cmake/Qt6QuickControls2MaterialPrivate/Qt6QuickControls2MaterialPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6QuickControls2MaterialPrivate/Qt6QuickControls2MaterialPrivateConfig.cmake +lib/cmake/Qt6QuickControls2MaterialPrivate/Qt6QuickControls2MaterialPrivateConfigVersion.cmake +lib/cmake/Qt6QuickControls2MaterialPrivate/Qt6QuickControls2MaterialPrivateConfigVersionImpl.cmake +lib/cmake/Qt6QuickControls2MaterialPrivate/Qt6QuickControls2MaterialPrivateDependencies.cmake +lib/cmake/Qt6QuickControls2MaterialPrivate/Qt6QuickControls2MaterialPrivateTargets.cmake +lib/cmake/Qt6QuickControls2MaterialPrivate/Qt6QuickControls2MaterialPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6QuickControls2MaterialPrivate/Qt6QuickControls2MaterialPrivateVersionlessTargets.cmake lib/cmake/Qt6QuickControls2MaterialStyleImpl/Qt6QuickControls2MaterialStyleImplAdditionalTargetInfo.cmake lib/cmake/Qt6QuickControls2MaterialStyleImpl/Qt6QuickControls2MaterialStyleImplConfig.cmake lib/cmake/Qt6QuickControls2MaterialStyleImpl/Qt6QuickControls2MaterialStyleImplConfigVersion.cmake @@ -2116,6 +2359,22 @@ lib/cmake/Qt6QuickControls2MaterialStyleImpl/Qt6QuickControls2MaterialStyleImplT lib/cmake/Qt6QuickControls2MaterialStyleImpl/Qt6QuickControls2MaterialStyleImplTargets.cmake lib/cmake/Qt6QuickControls2MaterialStyleImpl/Qt6QuickControls2MaterialStyleImplVersionlessAliasTargets.cmake lib/cmake/Qt6QuickControls2MaterialStyleImpl/Qt6QuickControls2MaterialStyleImplVersionlessTargets.cmake +lib/cmake/Qt6QuickControls2MaterialStyleImplPrivate/Qt6QuickControls2MaterialStyleImplPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6QuickControls2MaterialStyleImplPrivate/Qt6QuickControls2MaterialStyleImplPrivateConfig.cmake +lib/cmake/Qt6QuickControls2MaterialStyleImplPrivate/Qt6QuickControls2MaterialStyleImplPrivateConfigVersion.cmake +lib/cmake/Qt6QuickControls2MaterialStyleImplPrivate/Qt6QuickControls2MaterialStyleImplPrivateConfigVersionImpl.cmake +lib/cmake/Qt6QuickControls2MaterialStyleImplPrivate/Qt6QuickControls2MaterialStyleImplPrivateDependencies.cmake +lib/cmake/Qt6QuickControls2MaterialStyleImplPrivate/Qt6QuickControls2MaterialStyleImplPrivateTargets.cmake +lib/cmake/Qt6QuickControls2MaterialStyleImplPrivate/Qt6QuickControls2MaterialStyleImplPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6QuickControls2MaterialStyleImplPrivate/Qt6QuickControls2MaterialStyleImplPrivateVersionlessTargets.cmake +lib/cmake/Qt6QuickControls2Private/Qt6QuickControls2PrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6QuickControls2Private/Qt6QuickControls2PrivateConfig.cmake +lib/cmake/Qt6QuickControls2Private/Qt6QuickControls2PrivateConfigVersion.cmake +lib/cmake/Qt6QuickControls2Private/Qt6QuickControls2PrivateConfigVersionImpl.cmake +lib/cmake/Qt6QuickControls2Private/Qt6QuickControls2PrivateDependencies.cmake +lib/cmake/Qt6QuickControls2Private/Qt6QuickControls2PrivateTargets.cmake +lib/cmake/Qt6QuickControls2Private/Qt6QuickControls2PrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6QuickControls2Private/Qt6QuickControls2PrivateVersionlessTargets.cmake lib/cmake/Qt6QuickControls2Universal/Qt6QuickControls2UniversalAdditionalTargetInfo.cmake lib/cmake/Qt6QuickControls2Universal/Qt6QuickControls2UniversalConfig.cmake lib/cmake/Qt6QuickControls2Universal/Qt6QuickControls2UniversalConfigVersion.cmake @@ -2125,6 +2384,14 @@ lib/cmake/Qt6QuickControls2Universal/Qt6QuickControls2UniversalTargets-%%CMAKE_B lib/cmake/Qt6QuickControls2Universal/Qt6QuickControls2UniversalTargets.cmake lib/cmake/Qt6QuickControls2Universal/Qt6QuickControls2UniversalVersionlessAliasTargets.cmake lib/cmake/Qt6QuickControls2Universal/Qt6QuickControls2UniversalVersionlessTargets.cmake +lib/cmake/Qt6QuickControls2UniversalPrivate/Qt6QuickControls2UniversalPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6QuickControls2UniversalPrivate/Qt6QuickControls2UniversalPrivateConfig.cmake +lib/cmake/Qt6QuickControls2UniversalPrivate/Qt6QuickControls2UniversalPrivateConfigVersion.cmake +lib/cmake/Qt6QuickControls2UniversalPrivate/Qt6QuickControls2UniversalPrivateConfigVersionImpl.cmake +lib/cmake/Qt6QuickControls2UniversalPrivate/Qt6QuickControls2UniversalPrivateDependencies.cmake +lib/cmake/Qt6QuickControls2UniversalPrivate/Qt6QuickControls2UniversalPrivateTargets.cmake +lib/cmake/Qt6QuickControls2UniversalPrivate/Qt6QuickControls2UniversalPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6QuickControls2UniversalPrivate/Qt6QuickControls2UniversalPrivateVersionlessTargets.cmake lib/cmake/Qt6QuickControls2UniversalStyleImpl/Qt6QuickControls2UniversalStyleImplAdditionalTargetInfo.cmake lib/cmake/Qt6QuickControls2UniversalStyleImpl/Qt6QuickControls2UniversalStyleImplConfig.cmake lib/cmake/Qt6QuickControls2UniversalStyleImpl/Qt6QuickControls2UniversalStyleImplConfigVersion.cmake @@ -2134,6 +2401,14 @@ lib/cmake/Qt6QuickControls2UniversalStyleImpl/Qt6QuickControls2UniversalStyleImp lib/cmake/Qt6QuickControls2UniversalStyleImpl/Qt6QuickControls2UniversalStyleImplTargets.cmake lib/cmake/Qt6QuickControls2UniversalStyleImpl/Qt6QuickControls2UniversalStyleImplVersionlessAliasTargets.cmake lib/cmake/Qt6QuickControls2UniversalStyleImpl/Qt6QuickControls2UniversalStyleImplVersionlessTargets.cmake +lib/cmake/Qt6QuickControls2UniversalStyleImplPrivate/Qt6QuickControls2UniversalStyleImplPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6QuickControls2UniversalStyleImplPrivate/Qt6QuickControls2UniversalStyleImplPrivateConfig.cmake +lib/cmake/Qt6QuickControls2UniversalStyleImplPrivate/Qt6QuickControls2UniversalStyleImplPrivateConfigVersion.cmake +lib/cmake/Qt6QuickControls2UniversalStyleImplPrivate/Qt6QuickControls2UniversalStyleImplPrivateConfigVersionImpl.cmake +lib/cmake/Qt6QuickControls2UniversalStyleImplPrivate/Qt6QuickControls2UniversalStyleImplPrivateDependencies.cmake +lib/cmake/Qt6QuickControls2UniversalStyleImplPrivate/Qt6QuickControls2UniversalStyleImplPrivateTargets.cmake +lib/cmake/Qt6QuickControls2UniversalStyleImplPrivate/Qt6QuickControls2UniversalStyleImplPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6QuickControls2UniversalStyleImplPrivate/Qt6QuickControls2UniversalStyleImplPrivateVersionlessTargets.cmake lib/cmake/Qt6QuickControlsTestUtilsPrivate/Qt6QuickControlsTestUtilsPrivateAdditionalTargetInfo.cmake lib/cmake/Qt6QuickControlsTestUtilsPrivate/Qt6QuickControlsTestUtilsPrivateConfig.cmake lib/cmake/Qt6QuickControlsTestUtilsPrivate/Qt6QuickControlsTestUtilsPrivateConfigVersion.cmake @@ -2152,6 +2427,14 @@ lib/cmake/Qt6QuickDialogs2/Qt6QuickDialogs2Targets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6QuickDialogs2/Qt6QuickDialogs2Targets.cmake lib/cmake/Qt6QuickDialogs2/Qt6QuickDialogs2VersionlessAliasTargets.cmake lib/cmake/Qt6QuickDialogs2/Qt6QuickDialogs2VersionlessTargets.cmake +lib/cmake/Qt6QuickDialogs2Private/Qt6QuickDialogs2PrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6QuickDialogs2Private/Qt6QuickDialogs2PrivateConfig.cmake +lib/cmake/Qt6QuickDialogs2Private/Qt6QuickDialogs2PrivateConfigVersion.cmake +lib/cmake/Qt6QuickDialogs2Private/Qt6QuickDialogs2PrivateConfigVersionImpl.cmake +lib/cmake/Qt6QuickDialogs2Private/Qt6QuickDialogs2PrivateDependencies.cmake +lib/cmake/Qt6QuickDialogs2Private/Qt6QuickDialogs2PrivateTargets.cmake +lib/cmake/Qt6QuickDialogs2Private/Qt6QuickDialogs2PrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6QuickDialogs2Private/Qt6QuickDialogs2PrivateVersionlessTargets.cmake lib/cmake/Qt6QuickDialogs2QuickImpl/Qt6QuickDialogs2QuickImplAdditionalTargetInfo.cmake lib/cmake/Qt6QuickDialogs2QuickImpl/Qt6QuickDialogs2QuickImplConfig.cmake lib/cmake/Qt6QuickDialogs2QuickImpl/Qt6QuickDialogs2QuickImplConfigVersion.cmake @@ -2161,6 +2444,14 @@ lib/cmake/Qt6QuickDialogs2QuickImpl/Qt6QuickDialogs2QuickImplTargets-%%CMAKE_BUI lib/cmake/Qt6QuickDialogs2QuickImpl/Qt6QuickDialogs2QuickImplTargets.cmake lib/cmake/Qt6QuickDialogs2QuickImpl/Qt6QuickDialogs2QuickImplVersionlessAliasTargets.cmake lib/cmake/Qt6QuickDialogs2QuickImpl/Qt6QuickDialogs2QuickImplVersionlessTargets.cmake +lib/cmake/Qt6QuickDialogs2QuickImplPrivate/Qt6QuickDialogs2QuickImplPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6QuickDialogs2QuickImplPrivate/Qt6QuickDialogs2QuickImplPrivateConfig.cmake +lib/cmake/Qt6QuickDialogs2QuickImplPrivate/Qt6QuickDialogs2QuickImplPrivateConfigVersion.cmake +lib/cmake/Qt6QuickDialogs2QuickImplPrivate/Qt6QuickDialogs2QuickImplPrivateConfigVersionImpl.cmake +lib/cmake/Qt6QuickDialogs2QuickImplPrivate/Qt6QuickDialogs2QuickImplPrivateDependencies.cmake +lib/cmake/Qt6QuickDialogs2QuickImplPrivate/Qt6QuickDialogs2QuickImplPrivateTargets.cmake +lib/cmake/Qt6QuickDialogs2QuickImplPrivate/Qt6QuickDialogs2QuickImplPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6QuickDialogs2QuickImplPrivate/Qt6QuickDialogs2QuickImplPrivateVersionlessTargets.cmake lib/cmake/Qt6QuickDialogs2Utils/Qt6QuickDialogs2UtilsAdditionalTargetInfo.cmake lib/cmake/Qt6QuickDialogs2Utils/Qt6QuickDialogs2UtilsConfig.cmake lib/cmake/Qt6QuickDialogs2Utils/Qt6QuickDialogs2UtilsConfigVersion.cmake @@ -2170,12 +2461,28 @@ lib/cmake/Qt6QuickDialogs2Utils/Qt6QuickDialogs2UtilsTargets-%%CMAKE_BUILD_TYPE% lib/cmake/Qt6QuickDialogs2Utils/Qt6QuickDialogs2UtilsTargets.cmake lib/cmake/Qt6QuickDialogs2Utils/Qt6QuickDialogs2UtilsVersionlessAliasTargets.cmake lib/cmake/Qt6QuickDialogs2Utils/Qt6QuickDialogs2UtilsVersionlessTargets.cmake +lib/cmake/Qt6QuickDialogs2UtilsPrivate/Qt6QuickDialogs2UtilsPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6QuickDialogs2UtilsPrivate/Qt6QuickDialogs2UtilsPrivateConfig.cmake +lib/cmake/Qt6QuickDialogs2UtilsPrivate/Qt6QuickDialogs2UtilsPrivateConfigVersion.cmake +lib/cmake/Qt6QuickDialogs2UtilsPrivate/Qt6QuickDialogs2UtilsPrivateConfigVersionImpl.cmake +lib/cmake/Qt6QuickDialogs2UtilsPrivate/Qt6QuickDialogs2UtilsPrivateDependencies.cmake +lib/cmake/Qt6QuickDialogs2UtilsPrivate/Qt6QuickDialogs2UtilsPrivateTargets.cmake +lib/cmake/Qt6QuickDialogs2UtilsPrivate/Qt6QuickDialogs2UtilsPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6QuickDialogs2UtilsPrivate/Qt6QuickDialogs2UtilsPrivateVersionlessTargets.cmake +lib/cmake/Qt6QuickEffects/Qt6QuickEffectsAdditionalTargetInfo.cmake +lib/cmake/Qt6QuickEffects/Qt6QuickEffectsConfig.cmake +lib/cmake/Qt6QuickEffects/Qt6QuickEffectsConfigVersion.cmake +lib/cmake/Qt6QuickEffects/Qt6QuickEffectsConfigVersionImpl.cmake +lib/cmake/Qt6QuickEffects/Qt6QuickEffectsDependencies.cmake +lib/cmake/Qt6QuickEffects/Qt6QuickEffectsTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/Qt6QuickEffects/Qt6QuickEffectsTargets.cmake +lib/cmake/Qt6QuickEffects/Qt6QuickEffectsVersionlessAliasTargets.cmake +lib/cmake/Qt6QuickEffects/Qt6QuickEffectsVersionlessTargets.cmake lib/cmake/Qt6QuickEffectsPrivate/Qt6QuickEffectsPrivateAdditionalTargetInfo.cmake lib/cmake/Qt6QuickEffectsPrivate/Qt6QuickEffectsPrivateConfig.cmake lib/cmake/Qt6QuickEffectsPrivate/Qt6QuickEffectsPrivateConfigVersion.cmake lib/cmake/Qt6QuickEffectsPrivate/Qt6QuickEffectsPrivateConfigVersionImpl.cmake lib/cmake/Qt6QuickEffectsPrivate/Qt6QuickEffectsPrivateDependencies.cmake -lib/cmake/Qt6QuickEffectsPrivate/Qt6QuickEffectsPrivateTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6QuickEffectsPrivate/Qt6QuickEffectsPrivateTargets.cmake lib/cmake/Qt6QuickEffectsPrivate/Qt6QuickEffectsPrivateVersionlessAliasTargets.cmake lib/cmake/Qt6QuickEffectsPrivate/Qt6QuickEffectsPrivateVersionlessTargets.cmake @@ -2188,6 +2495,14 @@ lib/cmake/Qt6QuickLayouts/Qt6QuickLayoutsTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6QuickLayouts/Qt6QuickLayoutsTargets.cmake lib/cmake/Qt6QuickLayouts/Qt6QuickLayoutsVersionlessAliasTargets.cmake lib/cmake/Qt6QuickLayouts/Qt6QuickLayoutsVersionlessTargets.cmake +lib/cmake/Qt6QuickLayoutsPrivate/Qt6QuickLayoutsPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6QuickLayoutsPrivate/Qt6QuickLayoutsPrivateConfig.cmake +lib/cmake/Qt6QuickLayoutsPrivate/Qt6QuickLayoutsPrivateConfigVersion.cmake +lib/cmake/Qt6QuickLayoutsPrivate/Qt6QuickLayoutsPrivateConfigVersionImpl.cmake +lib/cmake/Qt6QuickLayoutsPrivate/Qt6QuickLayoutsPrivateDependencies.cmake +lib/cmake/Qt6QuickLayoutsPrivate/Qt6QuickLayoutsPrivateTargets.cmake +lib/cmake/Qt6QuickLayoutsPrivate/Qt6QuickLayoutsPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6QuickLayoutsPrivate/Qt6QuickLayoutsPrivateVersionlessTargets.cmake lib/cmake/Qt6QuickParticlesPrivate/Qt6QuickParticlesPrivateAdditionalTargetInfo.cmake lib/cmake/Qt6QuickParticlesPrivate/Qt6QuickParticlesPrivateConfig.cmake lib/cmake/Qt6QuickParticlesPrivate/Qt6QuickParticlesPrivateConfigVersion.cmake @@ -2197,6 +2512,14 @@ lib/cmake/Qt6QuickParticlesPrivate/Qt6QuickParticlesPrivateTargets-%%CMAKE_BUILD lib/cmake/Qt6QuickParticlesPrivate/Qt6QuickParticlesPrivateTargets.cmake lib/cmake/Qt6QuickParticlesPrivate/Qt6QuickParticlesPrivateVersionlessAliasTargets.cmake lib/cmake/Qt6QuickParticlesPrivate/Qt6QuickParticlesPrivateVersionlessTargets.cmake +lib/cmake/Qt6QuickPrivate/Qt6QuickPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6QuickPrivate/Qt6QuickPrivateConfig.cmake +lib/cmake/Qt6QuickPrivate/Qt6QuickPrivateConfigVersion.cmake +lib/cmake/Qt6QuickPrivate/Qt6QuickPrivateConfigVersionImpl.cmake +lib/cmake/Qt6QuickPrivate/Qt6QuickPrivateDependencies.cmake +lib/cmake/Qt6QuickPrivate/Qt6QuickPrivateTargets.cmake +lib/cmake/Qt6QuickPrivate/Qt6QuickPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6QuickPrivate/Qt6QuickPrivateVersionlessTargets.cmake lib/cmake/Qt6QuickShapesPrivate/Qt6QuickShapesPrivateAdditionalTargetInfo.cmake lib/cmake/Qt6QuickShapesPrivate/Qt6QuickShapesPrivateConfig.cmake lib/cmake/Qt6QuickShapesPrivate/Qt6QuickShapesPrivateConfigVersion.cmake @@ -2215,6 +2538,14 @@ lib/cmake/Qt6QuickTemplates2/Qt6QuickTemplates2Targets-%%CMAKE_BUILD_TYPE%%.cmak lib/cmake/Qt6QuickTemplates2/Qt6QuickTemplates2Targets.cmake lib/cmake/Qt6QuickTemplates2/Qt6QuickTemplates2VersionlessAliasTargets.cmake lib/cmake/Qt6QuickTemplates2/Qt6QuickTemplates2VersionlessTargets.cmake +lib/cmake/Qt6QuickTemplates2Private/Qt6QuickTemplates2PrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6QuickTemplates2Private/Qt6QuickTemplates2PrivateConfig.cmake +lib/cmake/Qt6QuickTemplates2Private/Qt6QuickTemplates2PrivateConfigVersion.cmake +lib/cmake/Qt6QuickTemplates2Private/Qt6QuickTemplates2PrivateConfigVersionImpl.cmake +lib/cmake/Qt6QuickTemplates2Private/Qt6QuickTemplates2PrivateDependencies.cmake +lib/cmake/Qt6QuickTemplates2Private/Qt6QuickTemplates2PrivateTargets.cmake +lib/cmake/Qt6QuickTemplates2Private/Qt6QuickTemplates2PrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6QuickTemplates2Private/Qt6QuickTemplates2PrivateVersionlessTargets.cmake lib/cmake/Qt6QuickTest/Qt6QuickTestAdditionalTargetInfo.cmake lib/cmake/Qt6QuickTest/Qt6QuickTestConfig.cmake lib/cmake/Qt6QuickTest/Qt6QuickTestConfigVersion.cmake @@ -2224,6 +2555,14 @@ lib/cmake/Qt6QuickTest/Qt6QuickTestTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6QuickTest/Qt6QuickTestTargets.cmake lib/cmake/Qt6QuickTest/Qt6QuickTestVersionlessAliasTargets.cmake lib/cmake/Qt6QuickTest/Qt6QuickTestVersionlessTargets.cmake +lib/cmake/Qt6QuickTestPrivate/Qt6QuickTestPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6QuickTestPrivate/Qt6QuickTestPrivateConfig.cmake +lib/cmake/Qt6QuickTestPrivate/Qt6QuickTestPrivateConfigVersion.cmake +lib/cmake/Qt6QuickTestPrivate/Qt6QuickTestPrivateConfigVersionImpl.cmake +lib/cmake/Qt6QuickTestPrivate/Qt6QuickTestPrivateDependencies.cmake +lib/cmake/Qt6QuickTestPrivate/Qt6QuickTestPrivateTargets.cmake +lib/cmake/Qt6QuickTestPrivate/Qt6QuickTestPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6QuickTestPrivate/Qt6QuickTestPrivateVersionlessTargets.cmake lib/cmake/Qt6QuickTestUtilsPrivate/Qt6QuickTestUtilsPrivateAdditionalTargetInfo.cmake lib/cmake/Qt6QuickTestUtilsPrivate/Qt6QuickTestUtilsPrivateConfig.cmake lib/cmake/Qt6QuickTestUtilsPrivate/Qt6QuickTestUtilsPrivateConfigVersion.cmake @@ -2259,6 +2598,14 @@ lib/cmake/Qt6QuickVectorImageGeneratorPrivate/Qt6QuickVectorImageGeneratorPrivat lib/cmake/Qt6QuickVectorImageGeneratorPrivate/Qt6QuickVectorImageGeneratorPrivateTargets.cmake lib/cmake/Qt6QuickVectorImageGeneratorPrivate/Qt6QuickVectorImageGeneratorPrivateVersionlessAliasTargets.cmake lib/cmake/Qt6QuickVectorImageGeneratorPrivate/Qt6QuickVectorImageGeneratorPrivateVersionlessTargets.cmake +lib/cmake/Qt6QuickVectorImagePrivate/Qt6QuickVectorImagePrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6QuickVectorImagePrivate/Qt6QuickVectorImagePrivateConfig.cmake +lib/cmake/Qt6QuickVectorImagePrivate/Qt6QuickVectorImagePrivateConfigVersion.cmake +lib/cmake/Qt6QuickVectorImagePrivate/Qt6QuickVectorImagePrivateConfigVersionImpl.cmake +lib/cmake/Qt6QuickVectorImagePrivate/Qt6QuickVectorImagePrivateDependencies.cmake +lib/cmake/Qt6QuickVectorImagePrivate/Qt6QuickVectorImagePrivateTargets.cmake +lib/cmake/Qt6QuickVectorImagePrivate/Qt6QuickVectorImagePrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6QuickVectorImagePrivate/Qt6QuickVectorImagePrivateVersionlessTargets.cmake lib/cmake/Qt6QuickWidgets/Qt6QuickWidgetsAdditionalTargetInfo.cmake lib/cmake/Qt6QuickWidgets/Qt6QuickWidgetsConfig.cmake lib/cmake/Qt6QuickWidgets/Qt6QuickWidgetsConfigVersion.cmake @@ -2268,6 +2615,14 @@ lib/cmake/Qt6QuickWidgets/Qt6QuickWidgetsTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6QuickWidgets/Qt6QuickWidgetsTargets.cmake lib/cmake/Qt6QuickWidgets/Qt6QuickWidgetsVersionlessAliasTargets.cmake lib/cmake/Qt6QuickWidgets/Qt6QuickWidgetsVersionlessTargets.cmake +lib/cmake/Qt6QuickWidgetsPrivate/Qt6QuickWidgetsPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6QuickWidgetsPrivate/Qt6QuickWidgetsPrivateConfig.cmake +lib/cmake/Qt6QuickWidgetsPrivate/Qt6QuickWidgetsPrivateConfigVersion.cmake +lib/cmake/Qt6QuickWidgetsPrivate/Qt6QuickWidgetsPrivateConfigVersionImpl.cmake +lib/cmake/Qt6QuickWidgetsPrivate/Qt6QuickWidgetsPrivateDependencies.cmake +lib/cmake/Qt6QuickWidgetsPrivate/Qt6QuickWidgetsPrivateTargets.cmake +lib/cmake/Qt6QuickWidgetsPrivate/Qt6QuickWidgetsPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6QuickWidgetsPrivate/Qt6QuickWidgetsPrivateVersionlessTargets.cmake %%QT_BINDIR%%/qml %%QT_BINDIR%%/qmldom %%QT_BINDIR%%/qmleasing @@ -2330,6 +2685,8 @@ lib/cmake/Qt6QuickWidgets/Qt6QuickWidgetsVersionlessTargets.cmake %%QT_LIBDIR%%/libQt6QmlDebug.prl %%QT_LIBDIR%%/libQt6QmlDom.a %%QT_LIBDIR%%/libQt6QmlDom.prl +%%QT_LIBDIR%%/libQt6QmlFormat.a +%%QT_LIBDIR%%/libQt6QmlFormat.prl %%QT_LIBDIR%%/libQt6QmlLS.a %%QT_LIBDIR%%/libQt6QmlLS.prl %%QT_LIBDIR%%/libQt6QmlLocalStorage.prl @@ -2482,6 +2839,7 @@ lib/cmake/Qt6QuickWidgets/Qt6QuickWidgetsVersionlessTargets.cmake %%QT_LIBDIR%%/metatypes/qt6qmlcore_%%CMAKE_BUILD_TYPE%%_metatypes.json %%QT_LIBDIR%%/metatypes/qt6qmldebugprivate_%%CMAKE_BUILD_TYPE%%_metatypes.json %%QT_LIBDIR%%/metatypes/qt6qmldomprivate_%%CMAKE_BUILD_TYPE%%_metatypes.json +%%QT_LIBDIR%%/metatypes/qt6qmlformatprivate_%%CMAKE_BUILD_TYPE%%_metatypes.json %%QT_LIBDIR%%/metatypes/qt6qmllocalstorage_%%CMAKE_BUILD_TYPE%%_metatypes.json %%QT_LIBDIR%%/metatypes/qt6qmllsprivate_%%CMAKE_BUILD_TYPE%%_metatypes.json %%QT_LIBDIR%%/metatypes/qt6qmlmeta_%%CMAKE_BUILD_TYPE%%_metatypes.json @@ -2509,7 +2867,7 @@ lib/cmake/Qt6QuickWidgets/Qt6QuickWidgetsVersionlessTargets.cmake %%QT_LIBDIR%%/metatypes/qt6quickdialogs2_%%CMAKE_BUILD_TYPE%%_metatypes.json %%QT_LIBDIR%%/metatypes/qt6quickdialogs2quickimpl_%%CMAKE_BUILD_TYPE%%_metatypes.json %%QT_LIBDIR%%/metatypes/qt6quickdialogs2utils_%%CMAKE_BUILD_TYPE%%_metatypes.json -%%QT_LIBDIR%%/metatypes/qt6quickeffectsprivate_%%CMAKE_BUILD_TYPE%%_metatypes.json +%%QT_LIBDIR%%/metatypes/qt6quickeffects_%%CMAKE_BUILD_TYPE%%_metatypes.json %%QT_LIBDIR%%/metatypes/qt6quicklayouts_%%CMAKE_BUILD_TYPE%%_metatypes.json %%QT_LIBDIR%%/metatypes/qt6quickparticlesprivate_%%CMAKE_BUILD_TYPE%%_metatypes.json %%QT_LIBDIR%%/metatypes/qt6quickshapesprivate_%%CMAKE_BUILD_TYPE%%_metatypes.json @@ -2547,6 +2905,7 @@ lib/cmake/Qt6QuickWidgets/Qt6QuickWidgetsVersionlessTargets.cmake %%QT_MKSPECDIR%%/modules/qt_lib_qmlcore_private.pri %%QT_MKSPECDIR%%/modules/qt_lib_qmldebug_private.pri %%QT_MKSPECDIR%%/modules/qt_lib_qmldom_private.pri +%%QT_MKSPECDIR%%/modules/qt_lib_qmlformat_private.pri %%QT_MKSPECDIR%%/modules/qt_lib_qmlintegration.pri %%QT_MKSPECDIR%%/modules/qt_lib_qmlintegration_private.pri %%QT_MKSPECDIR%%/modules/qt_lib_qmllocalstorage.pri @@ -2601,6 +2960,7 @@ lib/cmake/Qt6QuickWidgets/Qt6QuickWidgetsVersionlessTargets.cmake %%QT_MKSPECDIR%%/modules/qt_lib_quickdialogs2quickimpl_private.pri %%QT_MKSPECDIR%%/modules/qt_lib_quickdialogs2utils.pri %%QT_MKSPECDIR%%/modules/qt_lib_quickdialogs2utils_private.pri +%%QT_MKSPECDIR%%/modules/qt_lib_quickeffects.pri %%QT_MKSPECDIR%%/modules/qt_lib_quickeffects_private.pri %%QT_MKSPECDIR%%/modules/qt_lib_quicklayouts.pri %%QT_MKSPECDIR%%/modules/qt_lib_quicklayouts_private.pri @@ -2739,6 +3099,7 @@ lib/cmake/Qt6QuickWidgets/Qt6QuickWidgetsVersionlessTargets.cmake %%QT_QMLDIR%%/QtQuick/Controls/Basic/SwitchDelegate.qml %%QT_QMLDIR%%/QtQuick/Controls/Basic/TabBar.qml %%QT_QMLDIR%%/QtQuick/Controls/Basic/TabButton.qml +%%QT_QMLDIR%%/QtQuick/Controls/Basic/TableViewDelegate.qml %%QT_QMLDIR%%/QtQuick/Controls/Basic/TextArea.qml %%QT_QMLDIR%%/QtQuick/Controls/Basic/TextField.qml %%QT_QMLDIR%%/QtQuick/Controls/Basic/ToolBar.qml @@ -2749,6 +3110,7 @@ lib/cmake/Qt6QuickWidgets/Qt6QuickWidgetsVersionlessTargets.cmake %%QT_QMLDIR%%/QtQuick/Controls/Basic/Tumbler.qml %%QT_QMLDIR%%/QtQuick/Controls/Basic/VerticalHeaderView.qml %%QT_QMLDIR%%/QtQuick/Controls/Basic/WeekNumberColumn.qml +%%QT_QMLDIR%%/QtQuick/Controls/Basic/impl/TextEditingContextMenu.qml %%QT_QMLDIR%%/QtQuick/Controls/Basic/impl/libqtquickcontrols2basicstyleimplplugin.so %%QT_QMLDIR%%/QtQuick/Controls/Basic/impl/plugins.qmltypes %%QT_QMLDIR%%/QtQuick/Controls/Basic/impl/qmldir @@ -3193,8 +3555,16 @@ lib/cmake/Qt6QuickWidgets/Qt6QuickWidgetsVersionlessTargets.cmake %%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/icons/menuarrow@3x.png %%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/impl/ButtonBackground.qml %%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/impl/CheckIndicator.qml +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/impl/CopyAction.qml +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/impl/CutAction.qml +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/impl/DeleteAction.qml +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/impl/FocusFrame.qml +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/impl/PasteAction.qml %%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/impl/RadioIndicator.qml +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/impl/SelectAllAction.qml +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/impl/StyleImage.qml %%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/impl/SwitchIndicator.qml +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/impl/TextEditingContextMenu.qml %%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/impl/libqtquickcontrols2fluentwinui3styleimplplugin.so %%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/impl/plugins.qmltypes %%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/impl/qmldir @@ -3644,10 +4014,16 @@ lib/cmake/Qt6QuickWidgets/Qt6QuickWidgetsVersionlessTargets.cmake %%QT_QMLDIR%%/QtQuick/Controls/Fusion/VerticalHeaderView.qml %%QT_QMLDIR%%/QtQuick/Controls/Fusion/impl/ButtonPanel.qml %%QT_QMLDIR%%/QtQuick/Controls/Fusion/impl/CheckIndicator.qml +%%QT_QMLDIR%%/QtQuick/Controls/Fusion/impl/CopyAction.qml +%%QT_QMLDIR%%/QtQuick/Controls/Fusion/impl/CutAction.qml +%%QT_QMLDIR%%/QtQuick/Controls/Fusion/impl/DeleteAction.qml +%%QT_QMLDIR%%/QtQuick/Controls/Fusion/impl/PasteAction.qml %%QT_QMLDIR%%/QtQuick/Controls/Fusion/impl/RadioIndicator.qml +%%QT_QMLDIR%%/QtQuick/Controls/Fusion/impl/SelectAllAction.qml %%QT_QMLDIR%%/QtQuick/Controls/Fusion/impl/SliderGroove.qml %%QT_QMLDIR%%/QtQuick/Controls/Fusion/impl/SliderHandle.qml %%QT_QMLDIR%%/QtQuick/Controls/Fusion/impl/SwitchIndicator.qml +%%QT_QMLDIR%%/QtQuick/Controls/Fusion/impl/TextEditingContextMenu.qml %%QT_QMLDIR%%/QtQuick/Controls/Fusion/impl/libqtquickcontrols2fusionstyleimplplugin.so %%QT_QMLDIR%%/QtQuick/Controls/Fusion/impl/plugins.qmltypes %%QT_QMLDIR%%/QtQuick/Controls/Fusion/impl/qmldir @@ -3706,6 +4082,7 @@ lib/cmake/Qt6QuickWidgets/Qt6QuickWidgetsVersionlessTargets.cmake %%QT_QMLDIR%%/QtQuick/Controls/Imagine/VerticalHeaderView.qml %%QT_QMLDIR%%/QtQuick/Controls/Imagine/impl/OpacityMask.qml %%QT_QMLDIR%%/QtQuick/Controls/Imagine/impl/QuickControls2ImagineStyleImpl.qmltypes +%%QT_QMLDIR%%/QtQuick/Controls/Imagine/impl/TextEditingContextMenu.qml %%QT_QMLDIR%%/QtQuick/Controls/Imagine/impl/libqtquickcontrols2imaginestyleimplplugin.so %%QT_QMLDIR%%/QtQuick/Controls/Imagine/impl/qmldir %%QT_QMLDIR%%/QtQuick/Controls/Imagine/libqtquickcontrols2imaginestyleplugin.so @@ -3773,6 +4150,7 @@ lib/cmake/Qt6QuickWidgets/Qt6QuickWidgetsVersionlessTargets.cmake %%QT_QMLDIR%%/QtQuick/Controls/Material/impl/RoundedElevationEffect.qml %%QT_QMLDIR%%/QtQuick/Controls/Material/impl/SliderHandle.qml %%QT_QMLDIR%%/QtQuick/Controls/Material/impl/SwitchIndicator.qml +%%QT_QMLDIR%%/QtQuick/Controls/Material/impl/TextEditingContextMenu.qml %%QT_QMLDIR%%/QtQuick/Controls/Material/impl/libqtquickcontrols2materialstyleimplplugin.so %%QT_QMLDIR%%/QtQuick/Controls/Material/impl/plugins.qmltypes %%QT_QMLDIR%%/QtQuick/Controls/Material/impl/qmldir @@ -3831,8 +4209,14 @@ lib/cmake/Qt6QuickWidgets/Qt6QuickWidgetsVersionlessTargets.cmake %%QT_QMLDIR%%/QtQuick/Controls/Universal/Tumbler.qml %%QT_QMLDIR%%/QtQuick/Controls/Universal/VerticalHeaderView.qml %%QT_QMLDIR%%/QtQuick/Controls/Universal/impl/CheckIndicator.qml +%%QT_QMLDIR%%/QtQuick/Controls/Universal/impl/CopyAction.qml +%%QT_QMLDIR%%/QtQuick/Controls/Universal/impl/CutAction.qml +%%QT_QMLDIR%%/QtQuick/Controls/Universal/impl/DeleteAction.qml +%%QT_QMLDIR%%/QtQuick/Controls/Universal/impl/PasteAction.qml %%QT_QMLDIR%%/QtQuick/Controls/Universal/impl/RadioIndicator.qml +%%QT_QMLDIR%%/QtQuick/Controls/Universal/impl/SelectAllAction.qml %%QT_QMLDIR%%/QtQuick/Controls/Universal/impl/SwitchIndicator.qml +%%QT_QMLDIR%%/QtQuick/Controls/Universal/impl/TextEditingContextMenu.qml %%QT_QMLDIR%%/QtQuick/Controls/Universal/impl/libqtquickcontrols2universalstyleimplplugin.so %%QT_QMLDIR%%/QtQuick/Controls/Universal/impl/plugins.qmltypes %%QT_QMLDIR%%/QtQuick/Controls/Universal/impl/qmldir @@ -3975,6 +4359,11 @@ lib/cmake/Qt6QuickWidgets/Qt6QuickWidgetsVersionlessTargets.cmake %%QT_QMLDIR%%/QtQuick/Controls/designer/images/tumbler-icon16.png %%QT_QMLDIR%%/QtQuick/Controls/designer/images/tumbler-icon@2x.png %%QT_QMLDIR%%/QtQuick/Controls/designer/qtquickcontrols2.metainfo +%%QT_QMLDIR%%/QtQuick/Controls/impl/CopyAction.qml +%%QT_QMLDIR%%/QtQuick/Controls/impl/CutAction.qml +%%QT_QMLDIR%%/QtQuick/Controls/impl/DeleteAction.qml +%%QT_QMLDIR%%/QtQuick/Controls/impl/PasteAction.qml +%%QT_QMLDIR%%/QtQuick/Controls/impl/SelectAllAction.qml %%QT_QMLDIR%%/QtQuick/Controls/impl/libqtquickcontrols2implplugin.so %%QT_QMLDIR%%/QtQuick/Controls/impl/plugins.qmltypes %%QT_QMLDIR%%/QtQuick/Controls/impl/qmldir @@ -3987,6 +4376,7 @@ lib/cmake/Qt6QuickWidgets/Qt6QuickWidgetsVersionlessTargets.cmake %%QT_QMLDIR%%/QtQuick/Dialogs/quickimpl/libqtquickdialogs2quickimplplugin.so %%QT_QMLDIR%%/QtQuick/Dialogs/quickimpl/plugins.qmltypes %%QT_QMLDIR%%/QtQuick/Dialogs/quickimpl/qml/+Fusion/ColorDialog.qml +%%QT_QMLDIR%%/QtQuick/Dialogs/quickimpl/qml/+Fusion/ColorInputs.qml %%QT_QMLDIR%%/QtQuick/Dialogs/quickimpl/qml/+Fusion/FileDialog.qml %%QT_QMLDIR%%/QtQuick/Dialogs/quickimpl/qml/+Fusion/FileDialogDelegate.qml %%QT_QMLDIR%%/QtQuick/Dialogs/quickimpl/qml/+Fusion/FolderBreadcrumbBar.qml @@ -3994,7 +4384,9 @@ lib/cmake/Qt6QuickWidgets/Qt6QuickWidgetsVersionlessTargets.cmake %%QT_QMLDIR%%/QtQuick/Dialogs/quickimpl/qml/+Fusion/FolderDialogDelegate.qml %%QT_QMLDIR%%/QtQuick/Dialogs/quickimpl/qml/+Fusion/FontDialog.qml %%QT_QMLDIR%%/QtQuick/Dialogs/quickimpl/qml/+Fusion/MessageDialog.qml +%%QT_QMLDIR%%/QtQuick/Dialogs/quickimpl/qml/+Fusion/SideBar.qml %%QT_QMLDIR%%/QtQuick/Dialogs/quickimpl/qml/+Imagine/ColorDialog.qml +%%QT_QMLDIR%%/QtQuick/Dialogs/quickimpl/qml/+Imagine/ColorInputs.qml %%QT_QMLDIR%%/QtQuick/Dialogs/quickimpl/qml/+Imagine/FileDialog.qml %%QT_QMLDIR%%/QtQuick/Dialogs/quickimpl/qml/+Imagine/FileDialogDelegate.qml %%QT_QMLDIR%%/QtQuick/Dialogs/quickimpl/qml/+Imagine/FolderBreadcrumbBar.qml @@ -4002,7 +4394,9 @@ lib/cmake/Qt6QuickWidgets/Qt6QuickWidgetsVersionlessTargets.cmake %%QT_QMLDIR%%/QtQuick/Dialogs/quickimpl/qml/+Imagine/FolderDialogDelegate.qml %%QT_QMLDIR%%/QtQuick/Dialogs/quickimpl/qml/+Imagine/FontDialog.qml %%QT_QMLDIR%%/QtQuick/Dialogs/quickimpl/qml/+Imagine/MessageDialog.qml +%%QT_QMLDIR%%/QtQuick/Dialogs/quickimpl/qml/+Imagine/SideBar.qml %%QT_QMLDIR%%/QtQuick/Dialogs/quickimpl/qml/+Material/ColorDialog.qml +%%QT_QMLDIR%%/QtQuick/Dialogs/quickimpl/qml/+Material/ColorInputs.qml %%QT_QMLDIR%%/QtQuick/Dialogs/quickimpl/qml/+Material/FileDialog.qml %%QT_QMLDIR%%/QtQuick/Dialogs/quickimpl/qml/+Material/FileDialogDelegate.qml %%QT_QMLDIR%%/QtQuick/Dialogs/quickimpl/qml/+Material/FolderBreadcrumbBar.qml @@ -4010,7 +4404,9 @@ lib/cmake/Qt6QuickWidgets/Qt6QuickWidgetsVersionlessTargets.cmake %%QT_QMLDIR%%/QtQuick/Dialogs/quickimpl/qml/+Material/FolderDialogDelegate.qml %%QT_QMLDIR%%/QtQuick/Dialogs/quickimpl/qml/+Material/FontDialog.qml %%QT_QMLDIR%%/QtQuick/Dialogs/quickimpl/qml/+Material/MessageDialog.qml +%%QT_QMLDIR%%/QtQuick/Dialogs/quickimpl/qml/+Material/SideBar.qml %%QT_QMLDIR%%/QtQuick/Dialogs/quickimpl/qml/+Universal/ColorDialog.qml +%%QT_QMLDIR%%/QtQuick/Dialogs/quickimpl/qml/+Universal/ColorInputs.qml %%QT_QMLDIR%%/QtQuick/Dialogs/quickimpl/qml/+Universal/FileDialog.qml %%QT_QMLDIR%%/QtQuick/Dialogs/quickimpl/qml/+Universal/FileDialogDelegate.qml %%QT_QMLDIR%%/QtQuick/Dialogs/quickimpl/qml/+Universal/FolderBreadcrumbBar.qml @@ -4018,6 +4414,7 @@ lib/cmake/Qt6QuickWidgets/Qt6QuickWidgetsVersionlessTargets.cmake %%QT_QMLDIR%%/QtQuick/Dialogs/quickimpl/qml/+Universal/FolderDialogDelegate.qml %%QT_QMLDIR%%/QtQuick/Dialogs/quickimpl/qml/+Universal/FontDialog.qml %%QT_QMLDIR%%/QtQuick/Dialogs/quickimpl/qml/+Universal/MessageDialog.qml +%%QT_QMLDIR%%/QtQuick/Dialogs/quickimpl/qml/+Universal/SideBar.qml %%QT_QMLDIR%%/QtQuick/Dialogs/quickimpl/qml/ColorDialog.qml %%QT_QMLDIR%%/QtQuick/Dialogs/quickimpl/qml/ColorInputs.qml %%QT_QMLDIR%%/QtQuick/Dialogs/quickimpl/qml/FileDialog.qml @@ -4033,6 +4430,7 @@ lib/cmake/Qt6QuickWidgets/Qt6QuickWidgetsVersionlessTargets.cmake %%QT_QMLDIR%%/QtQuick/Dialogs/quickimpl/qml/MessageDialog.qml %%QT_QMLDIR%%/QtQuick/Dialogs/quickimpl/qml/PickerHandle.qml %%QT_QMLDIR%%/QtQuick/Dialogs/quickimpl/qml/SaturationLightnessPicker.qml +%%QT_QMLDIR%%/QtQuick/Dialogs/quickimpl/qml/SideBar.qml %%QT_QMLDIR%%/QtQuick/Dialogs/quickimpl/qmldir %%QT_QMLDIR%%/QtQuick/Effects/libeffectsplugin.so %%QT_QMLDIR%%/QtQuick/Effects/plugins.qmltypes @@ -4043,27 +4441,6 @@ lib/cmake/Qt6QuickWidgets/Qt6QuickWidgetsVersionlessTargets.cmake %%QT_QMLDIR%%/QtQuick/LocalStorage/libqmllocalstorageplugin.so %%QT_QMLDIR%%/QtQuick/LocalStorage/plugins.qmltypes %%QT_QMLDIR%%/QtQuick/LocalStorage/qmldir -%%QT_QMLDIR%%/QtQuick/NativeStyle/controls/DefaultButton.qml -%%QT_QMLDIR%%/QtQuick/NativeStyle/controls/DefaultCheckBox.qml -%%QT_QMLDIR%%/QtQuick/NativeStyle/controls/DefaultComboBox.qml -%%QT_QMLDIR%%/QtQuick/NativeStyle/controls/DefaultDial.qml -%%QT_QMLDIR%%/QtQuick/NativeStyle/controls/DefaultFrame.qml -%%QT_QMLDIR%%/QtQuick/NativeStyle/controls/DefaultGroupBox.qml -%%QT_QMLDIR%%/QtQuick/NativeStyle/controls/DefaultItemDelegate.qml -%%QT_QMLDIR%%/QtQuick/NativeStyle/controls/DefaultItemDelegateIconLabel.qml -%%QT_QMLDIR%%/QtQuick/NativeStyle/controls/DefaultProgressBar.qml -%%QT_QMLDIR%%/QtQuick/NativeStyle/controls/DefaultRadioButton.qml -%%QT_QMLDIR%%/QtQuick/NativeStyle/controls/DefaultRadioDelegate.qml -%%QT_QMLDIR%%/QtQuick/NativeStyle/controls/DefaultScrollBar.qml -%%QT_QMLDIR%%/QtQuick/NativeStyle/controls/DefaultSlider.qml -%%QT_QMLDIR%%/QtQuick/NativeStyle/controls/DefaultSpinBox.qml -%%QT_QMLDIR%%/QtQuick/NativeStyle/controls/DefaultTextArea.qml -%%QT_QMLDIR%%/QtQuick/NativeStyle/controls/DefaultTextField.qml -%%QT_QMLDIR%%/QtQuick/NativeStyle/controls/DefaultTreeViewDelegate.qml -%%QT_QMLDIR%%/QtQuick/NativeStyle/controls/qmldir -%%QT_QMLDIR%%/QtQuick/NativeStyle/libqtquickcontrols2nativestyleplugin.so -%%QT_QMLDIR%%/QtQuick/NativeStyle/plugins.qmltypes -%%QT_QMLDIR%%/QtQuick/NativeStyle/qmldir %%QT_QMLDIR%%/QtQuick/Particles/libparticlesplugin.so %%QT_QMLDIR%%/QtQuick/Particles/plugins.qmltypes %%QT_QMLDIR%%/QtQuick/Particles/qmldir @@ -4138,6 +4515,7 @@ libdata/pkgconfig/Qt6QuickControls2UniversalStyleImpl.pc libdata/pkgconfig/Qt6QuickDialogs2.pc libdata/pkgconfig/Qt6QuickDialogs2QuickImpl.pc libdata/pkgconfig/Qt6QuickDialogs2Utils.pc +libdata/pkgconfig/Qt6QuickEffects.pc libdata/pkgconfig/Qt6QuickLayouts.pc libdata/pkgconfig/Qt6QuickTemplates2.pc libdata/pkgconfig/Qt6QuickTest.pc @@ -4162,6 +4540,7 @@ libdata/pkgconfig/Qt6QuickWidgets.pc %%QT_DATADIR%%/modules/QmlCore.json %%QT_DATADIR%%/modules/QmlDebugPrivate.json %%QT_DATADIR%%/modules/QmlDomPrivate.json +%%QT_DATADIR%%/modules/QmlFormatPrivate.json %%QT_DATADIR%%/modules/QmlIntegration.json %%QT_DATADIR%%/modules/QmlLSPrivate.json %%QT_DATADIR%%/modules/QmlLocalStorage.json @@ -4190,7 +4569,7 @@ libdata/pkgconfig/Qt6QuickWidgets.pc %%QT_DATADIR%%/modules/QuickDialogs2.json %%QT_DATADIR%%/modules/QuickDialogs2QuickImpl.json %%QT_DATADIR%%/modules/QuickDialogs2Utils.json -%%QT_DATADIR%%/modules/QuickEffectsPrivate.json +%%QT_DATADIR%%/modules/QuickEffects.json %%QT_DATADIR%%/modules/QuickLayouts.json %%QT_DATADIR%%/modules/QuickParticlesPrivate.json %%QT_DATADIR%%/modules/QuickShapesPrivate.json diff --git a/x11-toolkits/qt6-graphs/distinfo b/x11-toolkits/qt6-graphs/distinfo index 0dfe35fee67c..b976d80aa4e6 100644 --- a/x11-toolkits/qt6-graphs/distinfo +++ b/x11-toolkits/qt6-graphs/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1743027871 -SHA256 (KDE/Qt/6.8.3/qtgraphs-everywhere-src-6.8.3.tar.xz) = a40bb22211cc8f78292557e18718b3a721e8ab5809b1ac25f3adf36dc5965c74 -SIZE (KDE/Qt/6.8.3/qtgraphs-everywhere-src-6.8.3.tar.xz) = 4870904 +TIMESTAMP = 1743709311 +SHA256 (KDE/Qt/6.9.0/qtgraphs-everywhere-src-6.9.0.tar.xz) = 9e5b08cdc1934b2525b5586a458861c180ee9f3aaccf6c36bac37b502afaa0c6 +SIZE (KDE/Qt/6.9.0/qtgraphs-everywhere-src-6.9.0.tar.xz) = 5229900 diff --git a/x11-toolkits/qt6-graphs/pkg-plist b/x11-toolkits/qt6-graphs/pkg-plist index d26c6ccad7e9..2f56d61016c2 100644 --- a/x11-toolkits/qt6-graphs/pkg-plist +++ b/x11-toolkits/qt6-graphs/pkg-plist @@ -9,10 +9,6 @@ %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/barsrenderer_p.h %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/charthelpers_p.h %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/commonutils_p.h -%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/foreigntypes_p.h -%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/foreigntypesbars_p.h -%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/foreigntypesscatter_p.h -%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/foreigntypessurface_p.h %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/gradientholder_p.h %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/pierenderer_p.h %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/pointrenderer_p.h @@ -56,12 +52,14 @@ %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qquickgraphsitem_p.h %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qquickgraphsscatter_p.h %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qquickgraphsscatterseries_p.h +%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qquickgraphssplineseries_p.h %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qquickgraphssurface_p.h %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qquickgraphssurfaceseries_p.h %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qquickgraphstexturedata_p.h %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qscatter3dseries_p.h %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qscatterdataproxy_p.h %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qscatterseries_p.h +%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qspline3dseries_p.h %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qsplinecontrolanimation_p.h %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qsplineseries_p.h %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qsurface3dseries_p.h @@ -114,6 +112,7 @@ %%QT_INCDIR%%/QtGraphs/QScatterDataItem %%QT_INCDIR%%/QtGraphs/QScatterDataProxy %%QT_INCDIR%%/QtGraphs/QScatterSeries +%%QT_INCDIR%%/QtGraphs/QSpline3DSeries %%QT_INCDIR%%/QtGraphs/QSplineSeries %%QT_INCDIR%%/QtGraphs/QSurface3DSeries %%QT_INCDIR%%/QtGraphs/QSurfaceDataItem @@ -161,6 +160,7 @@ %%QT_INCDIR%%/QtGraphs/qscatterdataitem.h %%QT_INCDIR%%/QtGraphs/qscatterdataproxy.h %%QT_INCDIR%%/QtGraphs/qscatterseries.h +%%QT_INCDIR%%/QtGraphs/qspline3dseries.h %%QT_INCDIR%%/QtGraphs/qsplineseries.h %%QT_INCDIR%%/QtGraphs/qsurface3dseries.h %%QT_INCDIR%%/QtGraphs/qsurfacedataitem.h @@ -202,6 +202,14 @@ lib/cmake/Qt6Graphs/Qt6GraphsTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6Graphs/Qt6GraphsTargets.cmake lib/cmake/Qt6Graphs/Qt6GraphsVersionlessAliasTargets.cmake lib/cmake/Qt6Graphs/Qt6GraphsVersionlessTargets.cmake +lib/cmake/Qt6GraphsPrivate/Qt6GraphsPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6GraphsPrivate/Qt6GraphsPrivateConfig.cmake +lib/cmake/Qt6GraphsPrivate/Qt6GraphsPrivateConfigVersion.cmake +lib/cmake/Qt6GraphsPrivate/Qt6GraphsPrivateConfigVersionImpl.cmake +lib/cmake/Qt6GraphsPrivate/Qt6GraphsPrivateDependencies.cmake +lib/cmake/Qt6GraphsPrivate/Qt6GraphsPrivateTargets.cmake +lib/cmake/Qt6GraphsPrivate/Qt6GraphsPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6GraphsPrivate/Qt6GraphsPrivateVersionlessTargets.cmake lib/cmake/Qt6GraphsWidgets/Qt6GraphsWidgetsAdditionalTargetInfo.cmake lib/cmake/Qt6GraphsWidgets/Qt6GraphsWidgetsConfig.cmake lib/cmake/Qt6GraphsWidgets/Qt6GraphsWidgetsConfigVersion.cmake @@ -211,6 +219,14 @@ lib/cmake/Qt6GraphsWidgets/Qt6GraphsWidgetsTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6GraphsWidgets/Qt6GraphsWidgetsTargets.cmake lib/cmake/Qt6GraphsWidgets/Qt6GraphsWidgetsVersionlessAliasTargets.cmake lib/cmake/Qt6GraphsWidgets/Qt6GraphsWidgetsVersionlessTargets.cmake +lib/cmake/Qt6GraphsWidgetsPrivate/Qt6GraphsWidgetsPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6GraphsWidgetsPrivate/Qt6GraphsWidgetsPrivateConfig.cmake +lib/cmake/Qt6GraphsWidgetsPrivate/Qt6GraphsWidgetsPrivateConfigVersion.cmake +lib/cmake/Qt6GraphsWidgetsPrivate/Qt6GraphsWidgetsPrivateConfigVersionImpl.cmake +lib/cmake/Qt6GraphsWidgetsPrivate/Qt6GraphsWidgetsPrivateDependencies.cmake +lib/cmake/Qt6GraphsWidgetsPrivate/Qt6GraphsWidgetsPrivateTargets.cmake +lib/cmake/Qt6GraphsWidgetsPrivate/Qt6GraphsWidgetsPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6GraphsWidgetsPrivate/Qt6GraphsWidgetsPrivateVersionlessTargets.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6GraphspluginAdditionalTargetInfo.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6GraphspluginConfig.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6GraphspluginConfigVersion.cmake diff --git a/x11-toolkits/qt6-quick3d/distinfo b/x11-toolkits/qt6-quick3d/distinfo index d6f2ac60d246..9d241f65d42d 100644 --- a/x11-toolkits/qt6-quick3d/distinfo +++ b/x11-toolkits/qt6-quick3d/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1743027873 -SHA256 (KDE/Qt/6.8.3/qtquick3d-everywhere-src-6.8.3.tar.xz) = 30483c700e521b9bc53a5f68cbaed089416c991fc29f5fb4179cde53fd3652df -SIZE (KDE/Qt/6.8.3/qtquick3d-everywhere-src-6.8.3.tar.xz) = 75305840 +TIMESTAMP = 1743709376 +SHA256 (KDE/Qt/6.9.0/qtquick3d-everywhere-src-6.9.0.tar.xz) = a295268fdca5aeaab6bb4bb1a0a4d2720b19679ab5145c5185dac7ac3399e488 +SIZE (KDE/Qt/6.9.0/qtquick3d-everywhere-src-6.9.0.tar.xz) = 75649196 diff --git a/x11-toolkits/qt6-quick3d/pkg-plist b/x11-toolkits/qt6-quick3d/pkg-plist index 06feadd29ac5..7ace667fa65a 100644 --- a/x11-toolkits/qt6-quick3d/pkg-plist +++ b/x11-toolkits/qt6-quick3d/pkg-plist @@ -108,16 +108,23 @@ %%QT_INCDIR%%/QtQuick3DGlslParser/QtQuick3DGlslParserVersion %%QT_INCDIR%%/QtQuick3DGlslParser/qtquick3dglslparserexports.h %%QT_INCDIR%%/QtQuick3DGlslParser/qtquick3dglslparserversion.h +%%QT_INCDIR%%/QtQuick3DHelpers/%%FULLVER%%/QtQuick3DHelpers/private/conegeometry_p.h +%%QT_INCDIR%%/QtQuick3DHelpers/%%FULLVER%%/QtQuick3DHelpers/private/cuboidgeometry_p.h +%%QT_INCDIR%%/QtQuick3DHelpers/%%FULLVER%%/QtQuick3DHelpers/private/cylindergeometry_p.h +%%QT_INCDIR%%/QtQuick3DHelpers/%%FULLVER%%/QtQuick3DHelpers/private/extrudedtextgeometry_p.h %%QT_INCDIR%%/QtQuick3DHelpers/%%FULLVER%%/QtQuick3DHelpers/private/gridgeometry_p.h %%QT_INCDIR%%/QtQuick3DHelpers/%%FULLVER%%/QtQuick3DHelpers/private/heightfieldgeometry_p.h %%QT_INCDIR%%/QtQuick3DHelpers/%%FULLVER%%/QtQuick3DHelpers/private/infinitegrid_p.h %%QT_INCDIR%%/QtQuick3DHelpers/%%FULLVER%%/QtQuick3DHelpers/private/instancerepeater_p.h %%QT_INCDIR%%/QtQuick3DHelpers/%%FULLVER%%/QtQuick3DHelpers/private/lookatnode_p.h +%%QT_INCDIR%%/QtQuick3DHelpers/%%FULLVER%%/QtQuick3DHelpers/private/planegeometry_p.h %%QT_INCDIR%%/QtQuick3DHelpers/%%FULLVER%%/QtQuick3DHelpers/private/proceduralmesh_p.h %%QT_INCDIR%%/QtQuick3DHelpers/%%FULLVER%%/QtQuick3DHelpers/private/proceduralskytexturedata_p.h %%QT_INCDIR%%/QtQuick3DHelpers/%%FULLVER%%/QtQuick3DHelpers/private/qquick3dtexturedatafrontend_p.h %%QT_INCDIR%%/QtQuick3DHelpers/%%FULLVER%%/QtQuick3DHelpers/private/qtquick3dhelpersglobal_p.h %%QT_INCDIR%%/QtQuick3DHelpers/%%FULLVER%%/QtQuick3DHelpers/private/randominstancing_p.h +%%QT_INCDIR%%/QtQuick3DHelpers/%%FULLVER%%/QtQuick3DHelpers/private/spheregeometry_p.h +%%QT_INCDIR%%/QtQuick3DHelpers/%%FULLVER%%/QtQuick3DHelpers/private/torusgeometry_p.h %%QT_INCDIR%%/QtQuick3DHelpers/QtQuick3DHelpers %%QT_INCDIR%%/QtQuick3DHelpers/QtQuick3DHelpersDepends %%QT_INCDIR%%/QtQuick3DHelpers/QtQuick3DHelpersVersion @@ -349,6 +356,14 @@ lib/cmake/Qt6Quick3DAssetImport/Qt6Quick3DAssetImportTargets-%%CMAKE_BUILD_TYPE% lib/cmake/Qt6Quick3DAssetImport/Qt6Quick3DAssetImportTargets.cmake lib/cmake/Qt6Quick3DAssetImport/Qt6Quick3DAssetImportVersionlessAliasTargets.cmake lib/cmake/Qt6Quick3DAssetImport/Qt6Quick3DAssetImportVersionlessTargets.cmake +lib/cmake/Qt6Quick3DAssetImportPrivate/Qt6Quick3DAssetImportPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6Quick3DAssetImportPrivate/Qt6Quick3DAssetImportPrivateConfig.cmake +lib/cmake/Qt6Quick3DAssetImportPrivate/Qt6Quick3DAssetImportPrivateConfigVersion.cmake +lib/cmake/Qt6Quick3DAssetImportPrivate/Qt6Quick3DAssetImportPrivateConfigVersionImpl.cmake +lib/cmake/Qt6Quick3DAssetImportPrivate/Qt6Quick3DAssetImportPrivateDependencies.cmake +lib/cmake/Qt6Quick3DAssetImportPrivate/Qt6Quick3DAssetImportPrivateTargets.cmake +lib/cmake/Qt6Quick3DAssetImportPrivate/Qt6Quick3DAssetImportPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6Quick3DAssetImportPrivate/Qt6Quick3DAssetImportPrivateVersionlessTargets.cmake lib/cmake/Qt6Quick3DAssetUtils/Qt6Quick3DAssetUtilsAdditionalTargetInfo.cmake lib/cmake/Qt6Quick3DAssetUtils/Qt6Quick3DAssetUtilsConfig.cmake lib/cmake/Qt6Quick3DAssetUtils/Qt6Quick3DAssetUtilsConfigVersion.cmake @@ -358,6 +373,14 @@ lib/cmake/Qt6Quick3DAssetUtils/Qt6Quick3DAssetUtilsTargets-%%CMAKE_BUILD_TYPE%%. lib/cmake/Qt6Quick3DAssetUtils/Qt6Quick3DAssetUtilsTargets.cmake lib/cmake/Qt6Quick3DAssetUtils/Qt6Quick3DAssetUtilsVersionlessAliasTargets.cmake lib/cmake/Qt6Quick3DAssetUtils/Qt6Quick3DAssetUtilsVersionlessTargets.cmake +lib/cmake/Qt6Quick3DAssetUtilsPrivate/Qt6Quick3DAssetUtilsPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6Quick3DAssetUtilsPrivate/Qt6Quick3DAssetUtilsPrivateConfig.cmake +lib/cmake/Qt6Quick3DAssetUtilsPrivate/Qt6Quick3DAssetUtilsPrivateConfigVersion.cmake +lib/cmake/Qt6Quick3DAssetUtilsPrivate/Qt6Quick3DAssetUtilsPrivateConfigVersionImpl.cmake +lib/cmake/Qt6Quick3DAssetUtilsPrivate/Qt6Quick3DAssetUtilsPrivateDependencies.cmake +lib/cmake/Qt6Quick3DAssetUtilsPrivate/Qt6Quick3DAssetUtilsPrivateTargets.cmake +lib/cmake/Qt6Quick3DAssetUtilsPrivate/Qt6Quick3DAssetUtilsPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6Quick3DAssetUtilsPrivate/Qt6Quick3DAssetUtilsPrivateVersionlessTargets.cmake lib/cmake/Qt6Quick3DEffects/Qt6Quick3DEffectsAdditionalTargetInfo.cmake lib/cmake/Qt6Quick3DEffects/Qt6Quick3DEffectsConfig.cmake lib/cmake/Qt6Quick3DEffects/Qt6Quick3DEffectsConfigVersion.cmake @@ -367,6 +390,14 @@ lib/cmake/Qt6Quick3DEffects/Qt6Quick3DEffectsTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6Quick3DEffects/Qt6Quick3DEffectsTargets.cmake lib/cmake/Qt6Quick3DEffects/Qt6Quick3DEffectsVersionlessAliasTargets.cmake lib/cmake/Qt6Quick3DEffects/Qt6Quick3DEffectsVersionlessTargets.cmake +lib/cmake/Qt6Quick3DEffectsPrivate/Qt6Quick3DEffectsPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6Quick3DEffectsPrivate/Qt6Quick3DEffectsPrivateConfig.cmake +lib/cmake/Qt6Quick3DEffectsPrivate/Qt6Quick3DEffectsPrivateConfigVersion.cmake +lib/cmake/Qt6Quick3DEffectsPrivate/Qt6Quick3DEffectsPrivateConfigVersionImpl.cmake +lib/cmake/Qt6Quick3DEffectsPrivate/Qt6Quick3DEffectsPrivateDependencies.cmake +lib/cmake/Qt6Quick3DEffectsPrivate/Qt6Quick3DEffectsPrivateTargets.cmake +lib/cmake/Qt6Quick3DEffectsPrivate/Qt6Quick3DEffectsPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6Quick3DEffectsPrivate/Qt6Quick3DEffectsPrivateVersionlessTargets.cmake lib/cmake/Qt6Quick3DGlslParserPrivate/Qt6Quick3DGlslParserPrivateAdditionalTargetInfo.cmake lib/cmake/Qt6Quick3DGlslParserPrivate/Qt6Quick3DGlslParserPrivateConfig.cmake lib/cmake/Qt6Quick3DGlslParserPrivate/Qt6Quick3DGlslParserPrivateConfigVersion.cmake @@ -394,6 +425,22 @@ lib/cmake/Qt6Quick3DHelpersImpl/Qt6Quick3DHelpersImplTargets-%%CMAKE_BUILD_TYPE% lib/cmake/Qt6Quick3DHelpersImpl/Qt6Quick3DHelpersImplTargets.cmake lib/cmake/Qt6Quick3DHelpersImpl/Qt6Quick3DHelpersImplVersionlessAliasTargets.cmake lib/cmake/Qt6Quick3DHelpersImpl/Qt6Quick3DHelpersImplVersionlessTargets.cmake +lib/cmake/Qt6Quick3DHelpersImplPrivate/Qt6Quick3DHelpersImplPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6Quick3DHelpersImplPrivate/Qt6Quick3DHelpersImplPrivateConfig.cmake +lib/cmake/Qt6Quick3DHelpersImplPrivate/Qt6Quick3DHelpersImplPrivateConfigVersion.cmake +lib/cmake/Qt6Quick3DHelpersImplPrivate/Qt6Quick3DHelpersImplPrivateConfigVersionImpl.cmake +lib/cmake/Qt6Quick3DHelpersImplPrivate/Qt6Quick3DHelpersImplPrivateDependencies.cmake +lib/cmake/Qt6Quick3DHelpersImplPrivate/Qt6Quick3DHelpersImplPrivateTargets.cmake +lib/cmake/Qt6Quick3DHelpersImplPrivate/Qt6Quick3DHelpersImplPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6Quick3DHelpersImplPrivate/Qt6Quick3DHelpersImplPrivateVersionlessTargets.cmake +lib/cmake/Qt6Quick3DHelpersPrivate/Qt6Quick3DHelpersPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6Quick3DHelpersPrivate/Qt6Quick3DHelpersPrivateConfig.cmake +lib/cmake/Qt6Quick3DHelpersPrivate/Qt6Quick3DHelpersPrivateConfigVersion.cmake +lib/cmake/Qt6Quick3DHelpersPrivate/Qt6Quick3DHelpersPrivateConfigVersionImpl.cmake +lib/cmake/Qt6Quick3DHelpersPrivate/Qt6Quick3DHelpersPrivateDependencies.cmake +lib/cmake/Qt6Quick3DHelpersPrivate/Qt6Quick3DHelpersPrivateTargets.cmake +lib/cmake/Qt6Quick3DHelpersPrivate/Qt6Quick3DHelpersPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6Quick3DHelpersPrivate/Qt6Quick3DHelpersPrivateVersionlessTargets.cmake lib/cmake/Qt6Quick3DIblBaker/Qt6Quick3DIblBakerAdditionalTargetInfo.cmake lib/cmake/Qt6Quick3DIblBaker/Qt6Quick3DIblBakerConfig.cmake lib/cmake/Qt6Quick3DIblBaker/Qt6Quick3DIblBakerConfigVersion.cmake @@ -403,6 +450,14 @@ lib/cmake/Qt6Quick3DIblBaker/Qt6Quick3DIblBakerTargets-%%CMAKE_BUILD_TYPE%%.cmak lib/cmake/Qt6Quick3DIblBaker/Qt6Quick3DIblBakerTargets.cmake lib/cmake/Qt6Quick3DIblBaker/Qt6Quick3DIblBakerVersionlessAliasTargets.cmake lib/cmake/Qt6Quick3DIblBaker/Qt6Quick3DIblBakerVersionlessTargets.cmake +lib/cmake/Qt6Quick3DIblBakerPrivate/Qt6Quick3DIblBakerPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6Quick3DIblBakerPrivate/Qt6Quick3DIblBakerPrivateConfig.cmake +lib/cmake/Qt6Quick3DIblBakerPrivate/Qt6Quick3DIblBakerPrivateConfigVersion.cmake +lib/cmake/Qt6Quick3DIblBakerPrivate/Qt6Quick3DIblBakerPrivateConfigVersionImpl.cmake +lib/cmake/Qt6Quick3DIblBakerPrivate/Qt6Quick3DIblBakerPrivateDependencies.cmake +lib/cmake/Qt6Quick3DIblBakerPrivate/Qt6Quick3DIblBakerPrivateTargets.cmake +lib/cmake/Qt6Quick3DIblBakerPrivate/Qt6Quick3DIblBakerPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6Quick3DIblBakerPrivate/Qt6Quick3DIblBakerPrivateVersionlessTargets.cmake lib/cmake/Qt6Quick3DParticleEffects/Qt6Quick3DParticleEffectsAdditionalTargetInfo.cmake lib/cmake/Qt6Quick3DParticleEffects/Qt6Quick3DParticleEffectsConfig.cmake lib/cmake/Qt6Quick3DParticleEffects/Qt6Quick3DParticleEffectsConfigVersion.cmake @@ -412,6 +467,14 @@ lib/cmake/Qt6Quick3DParticleEffects/Qt6Quick3DParticleEffectsTargets-%%CMAKE_BUI lib/cmake/Qt6Quick3DParticleEffects/Qt6Quick3DParticleEffectsTargets.cmake lib/cmake/Qt6Quick3DParticleEffects/Qt6Quick3DParticleEffectsVersionlessAliasTargets.cmake lib/cmake/Qt6Quick3DParticleEffects/Qt6Quick3DParticleEffectsVersionlessTargets.cmake +lib/cmake/Qt6Quick3DParticleEffectsPrivate/Qt6Quick3DParticleEffectsPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6Quick3DParticleEffectsPrivate/Qt6Quick3DParticleEffectsPrivateConfig.cmake +lib/cmake/Qt6Quick3DParticleEffectsPrivate/Qt6Quick3DParticleEffectsPrivateConfigVersion.cmake +lib/cmake/Qt6Quick3DParticleEffectsPrivate/Qt6Quick3DParticleEffectsPrivateConfigVersionImpl.cmake +lib/cmake/Qt6Quick3DParticleEffectsPrivate/Qt6Quick3DParticleEffectsPrivateDependencies.cmake +lib/cmake/Qt6Quick3DParticleEffectsPrivate/Qt6Quick3DParticleEffectsPrivateTargets.cmake +lib/cmake/Qt6Quick3DParticleEffectsPrivate/Qt6Quick3DParticleEffectsPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6Quick3DParticleEffectsPrivate/Qt6Quick3DParticleEffectsPrivateVersionlessTargets.cmake lib/cmake/Qt6Quick3DParticles/Qt6Quick3DParticlesAdditionalTargetInfo.cmake lib/cmake/Qt6Quick3DParticles/Qt6Quick3DParticlesConfig.cmake lib/cmake/Qt6Quick3DParticles/Qt6Quick3DParticlesConfigVersion.cmake @@ -421,6 +484,22 @@ lib/cmake/Qt6Quick3DParticles/Qt6Quick3DParticlesTargets-%%CMAKE_BUILD_TYPE%%.cm lib/cmake/Qt6Quick3DParticles/Qt6Quick3DParticlesTargets.cmake lib/cmake/Qt6Quick3DParticles/Qt6Quick3DParticlesVersionlessAliasTargets.cmake lib/cmake/Qt6Quick3DParticles/Qt6Quick3DParticlesVersionlessTargets.cmake +lib/cmake/Qt6Quick3DParticlesPrivate/Qt6Quick3DParticlesPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6Quick3DParticlesPrivate/Qt6Quick3DParticlesPrivateConfig.cmake +lib/cmake/Qt6Quick3DParticlesPrivate/Qt6Quick3DParticlesPrivateConfigVersion.cmake +lib/cmake/Qt6Quick3DParticlesPrivate/Qt6Quick3DParticlesPrivateConfigVersionImpl.cmake +lib/cmake/Qt6Quick3DParticlesPrivate/Qt6Quick3DParticlesPrivateDependencies.cmake +lib/cmake/Qt6Quick3DParticlesPrivate/Qt6Quick3DParticlesPrivateTargets.cmake +lib/cmake/Qt6Quick3DParticlesPrivate/Qt6Quick3DParticlesPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6Quick3DParticlesPrivate/Qt6Quick3DParticlesPrivateVersionlessTargets.cmake +lib/cmake/Qt6Quick3DPrivate/Qt6Quick3DPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6Quick3DPrivate/Qt6Quick3DPrivateConfig.cmake +lib/cmake/Qt6Quick3DPrivate/Qt6Quick3DPrivateConfigVersion.cmake +lib/cmake/Qt6Quick3DPrivate/Qt6Quick3DPrivateConfigVersionImpl.cmake +lib/cmake/Qt6Quick3DPrivate/Qt6Quick3DPrivateDependencies.cmake +lib/cmake/Qt6Quick3DPrivate/Qt6Quick3DPrivateTargets.cmake +lib/cmake/Qt6Quick3DPrivate/Qt6Quick3DPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6Quick3DPrivate/Qt6Quick3DPrivateVersionlessTargets.cmake lib/cmake/Qt6Quick3DRuntimeRender/Qt6Quick3DRuntimeRenderAdditionalTargetInfo.cmake lib/cmake/Qt6Quick3DRuntimeRender/Qt6Quick3DRuntimeRenderConfig.cmake lib/cmake/Qt6Quick3DRuntimeRender/Qt6Quick3DRuntimeRenderConfigVersion.cmake @@ -430,6 +509,14 @@ lib/cmake/Qt6Quick3DRuntimeRender/Qt6Quick3DRuntimeRenderTargets-%%CMAKE_BUILD_T lib/cmake/Qt6Quick3DRuntimeRender/Qt6Quick3DRuntimeRenderTargets.cmake lib/cmake/Qt6Quick3DRuntimeRender/Qt6Quick3DRuntimeRenderVersionlessAliasTargets.cmake lib/cmake/Qt6Quick3DRuntimeRender/Qt6Quick3DRuntimeRenderVersionlessTargets.cmake +lib/cmake/Qt6Quick3DRuntimeRenderPrivate/Qt6Quick3DRuntimeRenderPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6Quick3DRuntimeRenderPrivate/Qt6Quick3DRuntimeRenderPrivateConfig.cmake +lib/cmake/Qt6Quick3DRuntimeRenderPrivate/Qt6Quick3DRuntimeRenderPrivateConfigVersion.cmake +lib/cmake/Qt6Quick3DRuntimeRenderPrivate/Qt6Quick3DRuntimeRenderPrivateConfigVersionImpl.cmake +lib/cmake/Qt6Quick3DRuntimeRenderPrivate/Qt6Quick3DRuntimeRenderPrivateDependencies.cmake +lib/cmake/Qt6Quick3DRuntimeRenderPrivate/Qt6Quick3DRuntimeRenderPrivateTargets.cmake +lib/cmake/Qt6Quick3DRuntimeRenderPrivate/Qt6Quick3DRuntimeRenderPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6Quick3DRuntimeRenderPrivate/Qt6Quick3DRuntimeRenderPrivateVersionlessTargets.cmake lib/cmake/Qt6Quick3DTools/Qt6Quick3DToolsAdditionalTargetInfo.cmake lib/cmake/Qt6Quick3DTools/Qt6Quick3DToolsConfig.cmake lib/cmake/Qt6Quick3DTools/Qt6Quick3DToolsConfigVersion.cmake @@ -447,6 +534,14 @@ lib/cmake/Qt6Quick3DUtils/Qt6Quick3DUtilsTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6Quick3DUtils/Qt6Quick3DUtilsTargets.cmake lib/cmake/Qt6Quick3DUtils/Qt6Quick3DUtilsVersionlessAliasTargets.cmake lib/cmake/Qt6Quick3DUtils/Qt6Quick3DUtilsVersionlessTargets.cmake +lib/cmake/Qt6Quick3DUtilsPrivate/Qt6Quick3DUtilsPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6Quick3DUtilsPrivate/Qt6Quick3DUtilsPrivateConfig.cmake +lib/cmake/Qt6Quick3DUtilsPrivate/Qt6Quick3DUtilsPrivateConfigVersion.cmake +lib/cmake/Qt6Quick3DUtilsPrivate/Qt6Quick3DUtilsPrivateConfigVersionImpl.cmake +lib/cmake/Qt6Quick3DUtilsPrivate/Qt6Quick3DUtilsPrivateDependencies.cmake +lib/cmake/Qt6Quick3DUtilsPrivate/Qt6Quick3DUtilsPrivateTargets.cmake +lib/cmake/Qt6Quick3DUtilsPrivate/Qt6Quick3DUtilsPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6Quick3DUtilsPrivate/Qt6Quick3DUtilsPrivateVersionlessTargets.cmake %%QT_BINDIR%%/balsam %%QT_BINDIR%%/balsamui %%QT_BINDIR%%/instancer @@ -712,6 +807,7 @@ lib/cmake/Qt6Quick3DUtils/Qt6Quick3DUtilsVersionlessTargets.cmake %%QT_QMLDIR%%/QtQuick3D/MaterialEditor/AboutDialog.qml %%QT_QMLDIR%%/QtQuick3D/MaterialEditor/EditorView.qml %%QT_QMLDIR%%/QtQuick3D/MaterialEditor/FrostedGlass.qml +%%QT_QMLDIR%%/QtQuick3D/MaterialEditor/InstancingPropertiesPane.qml %%QT_QMLDIR%%/QtQuick3D/MaterialEditor/MaterialPropertiesPane.qml %%QT_QMLDIR%%/QtQuick3D/MaterialEditor/Preview.qml %%QT_QMLDIR%%/QtQuick3D/MaterialEditor/PreviewControls.qml diff --git a/x11-toolkits/qt6-quicktimeline/distinfo b/x11-toolkits/qt6-quicktimeline/distinfo index f09ccdb62121..7cf4ce3c42c3 100644 --- a/x11-toolkits/qt6-quicktimeline/distinfo +++ b/x11-toolkits/qt6-quicktimeline/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1743027874 -SHA256 (KDE/Qt/6.8.3/qtquicktimeline-everywhere-src-6.8.3.tar.xz) = b2ba57fa4fb929d3cd103dff65dd7a62dc2e3852f9a4fddd081e4a759b684fdd -SIZE (KDE/Qt/6.8.3/qtquicktimeline-everywhere-src-6.8.3.tar.xz) = 112572 +TIMESTAMP = 1743709388 +SHA256 (KDE/Qt/6.9.0/qtquicktimeline-everywhere-src-6.9.0.tar.xz) = 339f2cdd0b731615a215534799ed865e222fc797f431ad4a6677a6d5c862e648 +SIZE (KDE/Qt/6.9.0/qtquicktimeline-everywhere-src-6.9.0.tar.xz) = 112804 diff --git a/x11-toolkits/qt6-quicktimeline/pkg-plist b/x11-toolkits/qt6-quicktimeline/pkg-plist index 0e09546570f8..052fb9c24363 100644 --- a/x11-toolkits/qt6-quicktimeline/pkg-plist +++ b/x11-toolkits/qt6-quicktimeline/pkg-plist @@ -50,6 +50,22 @@ lib/cmake/Qt6QuickTimelineBlendTrees/Qt6QuickTimelineBlendTreesTargets-%%CMAKE_B lib/cmake/Qt6QuickTimelineBlendTrees/Qt6QuickTimelineBlendTreesTargets.cmake lib/cmake/Qt6QuickTimelineBlendTrees/Qt6QuickTimelineBlendTreesVersionlessAliasTargets.cmake lib/cmake/Qt6QuickTimelineBlendTrees/Qt6QuickTimelineBlendTreesVersionlessTargets.cmake +lib/cmake/Qt6QuickTimelineBlendTreesPrivate/Qt6QuickTimelineBlendTreesPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6QuickTimelineBlendTreesPrivate/Qt6QuickTimelineBlendTreesPrivateConfig.cmake +lib/cmake/Qt6QuickTimelineBlendTreesPrivate/Qt6QuickTimelineBlendTreesPrivateConfigVersion.cmake +lib/cmake/Qt6QuickTimelineBlendTreesPrivate/Qt6QuickTimelineBlendTreesPrivateConfigVersionImpl.cmake +lib/cmake/Qt6QuickTimelineBlendTreesPrivate/Qt6QuickTimelineBlendTreesPrivateDependencies.cmake +lib/cmake/Qt6QuickTimelineBlendTreesPrivate/Qt6QuickTimelineBlendTreesPrivateTargets.cmake +lib/cmake/Qt6QuickTimelineBlendTreesPrivate/Qt6QuickTimelineBlendTreesPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6QuickTimelineBlendTreesPrivate/Qt6QuickTimelineBlendTreesPrivateVersionlessTargets.cmake +lib/cmake/Qt6QuickTimelinePrivate/Qt6QuickTimelinePrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6QuickTimelinePrivate/Qt6QuickTimelinePrivateConfig.cmake +lib/cmake/Qt6QuickTimelinePrivate/Qt6QuickTimelinePrivateConfigVersion.cmake +lib/cmake/Qt6QuickTimelinePrivate/Qt6QuickTimelinePrivateConfigVersionImpl.cmake +lib/cmake/Qt6QuickTimelinePrivate/Qt6QuickTimelinePrivateDependencies.cmake +lib/cmake/Qt6QuickTimelinePrivate/Qt6QuickTimelinePrivateTargets.cmake +lib/cmake/Qt6QuickTimelinePrivate/Qt6QuickTimelinePrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6QuickTimelinePrivate/Qt6QuickTimelinePrivateVersionlessTargets.cmake %%QT_LIBDIR%%/libQt6QuickTimeline.prl %%QT_LIBDIR%%/libQt6QuickTimeline.so %%QT_LIBDIR%%/libQt6QuickTimeline.so.6 diff --git a/x11-toolkits/qt6-shadertools/distinfo b/x11-toolkits/qt6-shadertools/distinfo index 3ff3f1005c4c..5b77c27ac047 100644 --- a/x11-toolkits/qt6-shadertools/distinfo +++ b/x11-toolkits/qt6-shadertools/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1743027875 -SHA256 (KDE/Qt/6.8.3/qtshadertools-everywhere-src-6.8.3.tar.xz) = f6ec88bf42deba84d8f6b5d0914636ceed4749ccb51d1945b2f79b322b7ecf47 -SIZE (KDE/Qt/6.8.3/qtshadertools-everywhere-src-6.8.3.tar.xz) = 1140608 +TIMESTAMP = 1743709396 +SHA256 (KDE/Qt/6.9.0/qtshadertools-everywhere-src-6.9.0.tar.xz) = 916c40281ac3dee23b163f6ca73fb5bdeee344838b9a922b6f36269642d6f4bb +SIZE (KDE/Qt/6.9.0/qtshadertools-everywhere-src-6.9.0.tar.xz) = 1166308 diff --git a/x11-toolkits/qt6-shadertools/pkg-plist b/x11-toolkits/qt6-shadertools/pkg-plist index 38ca0e6aca4b..c67752253820 100644 --- a/x11-toolkits/qt6-shadertools/pkg-plist +++ b/x11-toolkits/qt6-shadertools/pkg-plist @@ -20,6 +20,14 @@ lib/cmake/Qt6ShaderTools/Qt6ShaderToolsTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6ShaderTools/Qt6ShaderToolsTargets.cmake lib/cmake/Qt6ShaderTools/Qt6ShaderToolsVersionlessAliasTargets.cmake lib/cmake/Qt6ShaderTools/Qt6ShaderToolsVersionlessTargets.cmake +lib/cmake/Qt6ShaderToolsPrivate/Qt6ShaderToolsPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6ShaderToolsPrivate/Qt6ShaderToolsPrivateConfig.cmake +lib/cmake/Qt6ShaderToolsPrivate/Qt6ShaderToolsPrivateConfigVersion.cmake +lib/cmake/Qt6ShaderToolsPrivate/Qt6ShaderToolsPrivateConfigVersionImpl.cmake +lib/cmake/Qt6ShaderToolsPrivate/Qt6ShaderToolsPrivateDependencies.cmake +lib/cmake/Qt6ShaderToolsPrivate/Qt6ShaderToolsPrivateTargets.cmake +lib/cmake/Qt6ShaderToolsPrivate/Qt6ShaderToolsPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6ShaderToolsPrivate/Qt6ShaderToolsPrivateVersionlessTargets.cmake lib/cmake/Qt6ShaderToolsTools/Qt6ShaderToolsMacros.cmake lib/cmake/Qt6ShaderToolsTools/Qt6ShaderToolsToolsAdditionalTargetInfo.cmake lib/cmake/Qt6ShaderToolsTools/Qt6ShaderToolsToolsConfig.cmake diff --git a/x11-toolkits/qt6-virtualkeyboard/distinfo b/x11-toolkits/qt6-virtualkeyboard/distinfo index bba9e7402b97..74416208b892 100644 --- a/x11-toolkits/qt6-virtualkeyboard/distinfo +++ b/x11-toolkits/qt6-virtualkeyboard/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1743027876 -SHA256 (KDE/Qt/6.8.3/qtvirtualkeyboard-everywhere-src-6.8.3.tar.xz) = 8111061261ed8d88ec40b79083f8ed025650eb1807a05528615265d36213bb1d -SIZE (KDE/Qt/6.8.3/qtvirtualkeyboard-everywhere-src-6.8.3.tar.xz) = 3288724 +TIMESTAMP = 1743709407 +SHA256 (KDE/Qt/6.9.0/qtvirtualkeyboard-everywhere-src-6.9.0.tar.xz) = b85489ffbdd50cc42ea6a74f266215782045668a99cafc73007f6b4b28d69127 +SIZE (KDE/Qt/6.9.0/qtvirtualkeyboard-everywhere-src-6.9.0.tar.xz) = 3269196 diff --git a/x11-toolkits/qt6-virtualkeyboard/pkg-plist b/x11-toolkits/qt6-virtualkeyboard/pkg-plist index 3a63fc9b2aa1..6a1af4550ad4 100644 --- a/x11-toolkits/qt6-virtualkeyboard/pkg-plist +++ b/x11-toolkits/qt6-virtualkeyboard/pkg-plist @@ -59,6 +59,13 @@ %%QT_INCDIR%%/QtVirtualKeyboard/qvirtualkeyboardobserver.h %%QT_INCDIR%%/QtVirtualKeyboard/qvirtualkeyboardselectionlistmodel.h %%QT_INCDIR%%/QtVirtualKeyboard/qvirtualkeyboardtrace.h +%%QT_INCDIR%%/QtVirtualKeyboardQml/%%FULLVER%%/QtVirtualKeyboardQml/private/qtvirtualkeyboardqml-config_p.h +%%QT_INCDIR%%/QtVirtualKeyboardQml/QtVirtualKeyboardQml +%%QT_INCDIR%%/QtVirtualKeyboardQml/QtVirtualKeyboardQmlDepends +%%QT_INCDIR%%/QtVirtualKeyboardQml/QtVirtualKeyboardQmlVersion +%%QT_INCDIR%%/QtVirtualKeyboardQml/qtvirtualkeyboardqml-config.h +%%QT_INCDIR%%/QtVirtualKeyboardQml/qtvirtualkeyboardqmlexports.h +%%QT_INCDIR%%/QtVirtualKeyboardQml/qtvirtualkeyboardqmlversion.h %%QT_INCDIR%%/QtVirtualKeyboardSettings/%%FULLVER%%/QtVirtualKeyboardSettings/private/qquickvirtualkeyboardsettings_p.h %%QT_INCDIR%%/QtVirtualKeyboardSettings/QtVirtualKeyboardSettings %%QT_INCDIR%%/QtVirtualKeyboardSettings/QtVirtualKeyboardSettingsDepends @@ -88,6 +95,20 @@ lib/cmake/Qt6HunspellInputMethod/Qt6HunspellInputMethodTargets-%%CMAKE_BUILD_TYP lib/cmake/Qt6HunspellInputMethod/Qt6HunspellInputMethodTargets.cmake lib/cmake/Qt6HunspellInputMethod/Qt6HunspellInputMethodVersionlessAliasTargets.cmake lib/cmake/Qt6HunspellInputMethod/Qt6HunspellInputMethodVersionlessTargets.cmake +lib/cmake/Qt6HunspellInputMethodPrivate/Qt6HunspellInputMethodPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6HunspellInputMethodPrivate/Qt6HunspellInputMethodPrivateConfig.cmake +lib/cmake/Qt6HunspellInputMethodPrivate/Qt6HunspellInputMethodPrivateConfigVersion.cmake +lib/cmake/Qt6HunspellInputMethodPrivate/Qt6HunspellInputMethodPrivateConfigVersionImpl.cmake +lib/cmake/Qt6HunspellInputMethodPrivate/Qt6HunspellInputMethodPrivateDependencies.cmake +lib/cmake/Qt6HunspellInputMethodPrivate/Qt6HunspellInputMethodPrivateTargets.cmake +lib/cmake/Qt6HunspellInputMethodPrivate/Qt6HunspellInputMethodPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6HunspellInputMethodPrivate/Qt6HunspellInputMethodPrivateVersionlessTargets.cmake +lib/cmake/Qt6Qml/QmlPlugins/Qt6VirtualKeyboardpluginAdditionalTargetInfo.cmake +lib/cmake/Qt6Qml/QmlPlugins/Qt6VirtualKeyboardpluginConfig.cmake +lib/cmake/Qt6Qml/QmlPlugins/Qt6VirtualKeyboardpluginConfigVersion.cmake +lib/cmake/Qt6Qml/QmlPlugins/Qt6VirtualKeyboardpluginConfigVersionImpl.cmake +lib/cmake/Qt6Qml/QmlPlugins/Qt6VirtualKeyboardpluginTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/Qt6Qml/QmlPlugins/Qt6VirtualKeyboardpluginTargets.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6qtvkbbuiltinstylespluginAdditionalTargetInfo.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6qtvkbbuiltinstylespluginConfig.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6qtvkbbuiltinstylespluginConfigVersion.cmake @@ -175,6 +196,31 @@ lib/cmake/Qt6VirtualKeyboard/Qt6VirtualKeyboardTargets-%%CMAKE_BUILD_TYPE%%.cmak lib/cmake/Qt6VirtualKeyboard/Qt6VirtualKeyboardTargets.cmake lib/cmake/Qt6VirtualKeyboard/Qt6VirtualKeyboardVersionlessAliasTargets.cmake lib/cmake/Qt6VirtualKeyboard/Qt6VirtualKeyboardVersionlessTargets.cmake +lib/cmake/Qt6VirtualKeyboardPrivate/Qt6VirtualKeyboardPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6VirtualKeyboardPrivate/Qt6VirtualKeyboardPrivateConfig.cmake +lib/cmake/Qt6VirtualKeyboardPrivate/Qt6VirtualKeyboardPrivateConfigVersion.cmake +lib/cmake/Qt6VirtualKeyboardPrivate/Qt6VirtualKeyboardPrivateConfigVersionImpl.cmake +lib/cmake/Qt6VirtualKeyboardPrivate/Qt6VirtualKeyboardPrivateDependencies.cmake +lib/cmake/Qt6VirtualKeyboardPrivate/Qt6VirtualKeyboardPrivateTargets.cmake +lib/cmake/Qt6VirtualKeyboardPrivate/Qt6VirtualKeyboardPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6VirtualKeyboardPrivate/Qt6VirtualKeyboardPrivateVersionlessTargets.cmake +lib/cmake/Qt6VirtualKeyboardQml/Qt6VirtualKeyboardQmlAdditionalTargetInfo.cmake +lib/cmake/Qt6VirtualKeyboardQml/Qt6VirtualKeyboardQmlConfig.cmake +lib/cmake/Qt6VirtualKeyboardQml/Qt6VirtualKeyboardQmlConfigVersion.cmake +lib/cmake/Qt6VirtualKeyboardQml/Qt6VirtualKeyboardQmlConfigVersionImpl.cmake +lib/cmake/Qt6VirtualKeyboardQml/Qt6VirtualKeyboardQmlDependencies.cmake +lib/cmake/Qt6VirtualKeyboardQml/Qt6VirtualKeyboardQmlTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/Qt6VirtualKeyboardQml/Qt6VirtualKeyboardQmlTargets.cmake +lib/cmake/Qt6VirtualKeyboardQml/Qt6VirtualKeyboardQmlVersionlessAliasTargets.cmake +lib/cmake/Qt6VirtualKeyboardQml/Qt6VirtualKeyboardQmlVersionlessTargets.cmake +lib/cmake/Qt6VirtualKeyboardQmlPrivate/Qt6VirtualKeyboardQmlPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6VirtualKeyboardQmlPrivate/Qt6VirtualKeyboardQmlPrivateConfig.cmake +lib/cmake/Qt6VirtualKeyboardQmlPrivate/Qt6VirtualKeyboardQmlPrivateConfigVersion.cmake +lib/cmake/Qt6VirtualKeyboardQmlPrivate/Qt6VirtualKeyboardQmlPrivateConfigVersionImpl.cmake +lib/cmake/Qt6VirtualKeyboardQmlPrivate/Qt6VirtualKeyboardQmlPrivateDependencies.cmake +lib/cmake/Qt6VirtualKeyboardQmlPrivate/Qt6VirtualKeyboardQmlPrivateTargets.cmake +lib/cmake/Qt6VirtualKeyboardQmlPrivate/Qt6VirtualKeyboardQmlPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6VirtualKeyboardQmlPrivate/Qt6VirtualKeyboardQmlPrivateVersionlessTargets.cmake lib/cmake/Qt6VirtualKeyboardSettings/Qt6VirtualKeyboardSettingsAdditionalTargetInfo.cmake lib/cmake/Qt6VirtualKeyboardSettings/Qt6VirtualKeyboardSettingsConfig.cmake lib/cmake/Qt6VirtualKeyboardSettings/Qt6VirtualKeyboardSettingsConfigVersion.cmake @@ -184,6 +230,14 @@ lib/cmake/Qt6VirtualKeyboardSettings/Qt6VirtualKeyboardSettingsTargets-%%CMAKE_B lib/cmake/Qt6VirtualKeyboardSettings/Qt6VirtualKeyboardSettingsTargets.cmake lib/cmake/Qt6VirtualKeyboardSettings/Qt6VirtualKeyboardSettingsVersionlessAliasTargets.cmake lib/cmake/Qt6VirtualKeyboardSettings/Qt6VirtualKeyboardSettingsVersionlessTargets.cmake +lib/cmake/Qt6VirtualKeyboardSettingsPrivate/Qt6VirtualKeyboardSettingsPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6VirtualKeyboardSettingsPrivate/Qt6VirtualKeyboardSettingsPrivateConfig.cmake +lib/cmake/Qt6VirtualKeyboardSettingsPrivate/Qt6VirtualKeyboardSettingsPrivateConfigVersion.cmake +lib/cmake/Qt6VirtualKeyboardSettingsPrivate/Qt6VirtualKeyboardSettingsPrivateConfigVersionImpl.cmake +lib/cmake/Qt6VirtualKeyboardSettingsPrivate/Qt6VirtualKeyboardSettingsPrivateDependencies.cmake +lib/cmake/Qt6VirtualKeyboardSettingsPrivate/Qt6VirtualKeyboardSettingsPrivateTargets.cmake +lib/cmake/Qt6VirtualKeyboardSettingsPrivate/Qt6VirtualKeyboardSettingsPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6VirtualKeyboardSettingsPrivate/Qt6VirtualKeyboardSettingsPrivateVersionlessTargets.cmake %%QT_LIBDIR%%/libQt6HunspellInputMethod.prl %%QT_LIBDIR%%/libQt6HunspellInputMethod.so %%QT_LIBDIR%%/libQt6HunspellInputMethod.so.6 @@ -192,17 +246,24 @@ lib/cmake/Qt6VirtualKeyboardSettings/Qt6VirtualKeyboardSettingsVersionlessTarget %%QT_LIBDIR%%/libQt6VirtualKeyboard.so %%QT_LIBDIR%%/libQt6VirtualKeyboard.so.6 %%QT_LIBDIR%%/libQt6VirtualKeyboard.so.%%FULLVER%% +%%QT_LIBDIR%%/libQt6VirtualKeyboardQml.prl +%%QT_LIBDIR%%/libQt6VirtualKeyboardQml.so +%%QT_LIBDIR%%/libQt6VirtualKeyboardQml.so.6 +%%QT_LIBDIR%%/libQt6VirtualKeyboardQml.so.%%FULLVER%% %%QT_LIBDIR%%/libQt6VirtualKeyboardSettings.prl %%QT_LIBDIR%%/libQt6VirtualKeyboardSettings.so %%QT_LIBDIR%%/libQt6VirtualKeyboardSettings.so.6 %%QT_LIBDIR%%/libQt6VirtualKeyboardSettings.so.%%FULLVER%% %%QT_LIBDIR%%/metatypes/qt6hunspellinputmethod_%%CMAKE_BUILD_TYPE%%_metatypes.json %%QT_LIBDIR%%/metatypes/qt6virtualkeyboard_%%CMAKE_BUILD_TYPE%%_metatypes.json +%%QT_LIBDIR%%/metatypes/qt6virtualkeyboardqml_%%CMAKE_BUILD_TYPE%%_metatypes.json %%QT_LIBDIR%%/metatypes/qt6virtualkeyboardsettings_%%CMAKE_BUILD_TYPE%%_metatypes.json %%QT_MKSPECDIR%%/modules/qt_lib_hunspellinputmethod.pri %%QT_MKSPECDIR%%/modules/qt_lib_hunspellinputmethod_private.pri %%QT_MKSPECDIR%%/modules/qt_lib_virtualkeyboard.pri %%QT_MKSPECDIR%%/modules/qt_lib_virtualkeyboard_private.pri +%%QT_MKSPECDIR%%/modules/qt_lib_virtualkeyboardqml.pri +%%QT_MKSPECDIR%%/modules/qt_lib_virtualkeyboardqml_private.pri %%QT_MKSPECDIR%%/modules/qt_lib_virtualkeyboardsettings.pri %%QT_MKSPECDIR%%/modules/qt_lib_virtualkeyboardsettings_private.pri %%QT_PLUGINDIR%%/platforminputcontexts/libqtvirtualkeyboardplugin.so @@ -240,6 +301,9 @@ lib/cmake/Qt6VirtualKeyboardSettings/Qt6VirtualKeyboardSettingsVersionlessTarget %%QT_QMLDIR%%/QtQuick/VirtualKeyboard/Components/libqtvkbcomponentsplugin.so %%QT_QMLDIR%%/QtQuick/VirtualKeyboard/Components/qmldir %%QT_QMLDIR%%/QtQuick/VirtualKeyboard/Components/qtvkbcomponentsplugin.qmltypes +%%QT_QMLDIR%%/QtQuick/VirtualKeyboard/Core/libvirtualkeyboardplugin.so +%%QT_QMLDIR%%/QtQuick/VirtualKeyboard/Core/plugins.qmltypes +%%QT_QMLDIR%%/QtQuick/VirtualKeyboard/Core/qmldir %%QT_QMLDIR%%/QtQuick/VirtualKeyboard/EnterKey.qml %%QT_QMLDIR%%/QtQuick/VirtualKeyboard/HandwritingInputPanel.qml %%QT_QMLDIR%%/QtQuick/VirtualKeyboard/InputPanel.qml @@ -283,13 +347,15 @@ lib/cmake/Qt6VirtualKeyboardSettings/Qt6VirtualKeyboardSettingsVersionlessTarget %%QT_QMLDIR%%/QtQuick/VirtualKeyboard/Styles/libqtvkbstylesplugin.so %%QT_QMLDIR%%/QtQuick/VirtualKeyboard/Styles/plugins.qmltypes %%QT_QMLDIR%%/QtQuick/VirtualKeyboard/Styles/qmldir +%%QT_QMLDIR%%/QtQuick/VirtualKeyboard/VirtualKeyboardQml.qmltypes %%QT_QMLDIR%%/QtQuick/VirtualKeyboard/libqtvkbplugin.so -%%QT_QMLDIR%%/QtQuick/VirtualKeyboard/plugins.qmltypes %%QT_QMLDIR%%/QtQuick/VirtualKeyboard/qmldir %%QT_SBOMDIR%%/qtvirtualkeyboard-%%FULLVER%%.spdx libdata/pkgconfig/Qt6HunspellInputMethod.pc libdata/pkgconfig/Qt6VirtualKeyboard.pc +libdata/pkgconfig/Qt6VirtualKeyboardQml.pc libdata/pkgconfig/Qt6VirtualKeyboardSettings.pc %%QT_DATADIR%%/modules/HunspellInputMethod.json %%QT_DATADIR%%/modules/VirtualKeyboard.json +%%QT_DATADIR%%/modules/VirtualKeyboardQml.json %%QT_DATADIR%%/modules/VirtualKeyboardSettings.json -- 2.49.0