From c6430a7e5fa371432d9ad1a66b7d6ab975e2e336 Mon Sep 17 00:00:00 2001 From: "Jason E. Hale" Date: Thu, 12 Dec 2024 14:54:02 -0500 Subject: [PATCH] Qt6: Update to 6.8.1 December 02, 2024 We have released Qt 6.8.1 today. As a patch release, Qt 6.8.1 does not introduce new features but contains more than 550 bug fixes, security updates, and other improvements to the top of the Qt 6.8.0 release. See more information about the most important changes and bug fixes from the Qt 6.8.1 release note. Announcement: https://www.qt.io/blog/qt-6.8.1-released Release note: https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.8.1/release-note.md We (kde@) skipped shipping Qt 6.8.0 due to waiting for a compatible release of PyQt to be released, but here are the announcements and release notes from Qt 6.8.0. Announcement: https://www.qt.io/blog/qt-6.8-released Release note: https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.8.0/release-note.md PySide6: Update to 6.8.0.2 PySide6 and its related components have been updated alongside the Qt release for compatibility. Older versions will not build with Qt 6.8.x. Announcement: https://www.qt.io/blog/qt-for-python-release-6.8 PyQt6: Update to 6.8.0 This release also introduces x11-toolkits/py-qt6-graphs, python bindings for the Qt Graphs module. As with PySide6, older versions of PyQt6 will not build with Qt 6.8.x. Announcement: https://www.riverbankcomputing.com/news/PyQt_v6.8.0_Released Special thanks to Kenneth Raplee for testing and to SponiX for providing access to build hardware! PR: 283290 Exp-run by: antoine --- Mk/Uses/pyqt.mk | 35 +- Mk/Uses/qt.mk | 9 +- accessibility/qt6-speech/distinfo | 6 +- accessibility/qt6-speech/pkg-plist | 2 + comms/qt6-connectivity/distinfo | 6 +- comms/qt6-connectivity/pkg-plist | 4 +- comms/qt6-sensors/distinfo | 6 +- comms/qt6-sensors/pkg-plist | 4 +- comms/qt6-serialbus/distinfo | 6 +- comms/qt6-serialbus/pkg-plist | 3 +- comms/qt6-serialport/distinfo | 6 +- comms/qt6-serialport/pkg-plist | 2 + databases/qt6-base_sqldriver/Makefile | 3 +- databases/qt6-base_sqldriver/distinfo | 6 +- devel/py-qt5-sip/distinfo | 6 +- devel/py-qt5-sip/files/patch-pyproject.toml | 11 + devel/py-qt5-sip/files/patch-siplib.c | 4 +- devel/py-qt6-pyqt/distinfo | 6 +- devel/py-qt6-pyqt/pkg-plist | 12 + devel/py-qt6-sip/distinfo | 6 +- devel/py-qt6-sip/files/patch-pyproject.toml | 11 + devel/py-qt6-sip/files/patch-sip__core.c | 4 +- devel/py-qt6/Makefile | 1 - devel/py-qtbuilder/distinfo | 6 +- devel/py-sip/distinfo | 6 +- devel/pyside6-tools/Makefile | 11 +- devel/pyside6-tools/distinfo | 6 +- devel/pyside6-tools/pkg-plist | 4 + devel/pyside6/Makefile | 20 +- devel/pyside6/distinfo | 6 +- ...s_pyside6_cmake_Macros_PySideModules.cmake | 4 +- ...-sources_pyside6_cmake_PySideHelpers.cmake | 13 + devel/pyside6/pkg-plist | 139 +- devel/qt6-5compat/distinfo | 6 +- devel/qt6-5compat/pkg-plist | 3 +- devel/qt6-base/Makefile | 33 +- devel/qt6-base/distinfo | 10 +- .../patch-cmake_QtBuildPathsHelpers.cmake | 4 +- .../patch-cmake_QtFlagHandlingHelpers.cmake | 4 +- .../files/patch-src_corelib_CMakeLists.txt | 4 +- .../files/patch-src_corelib_global_qcompare.h | 10 +- ...patch-src_corelib_global_qcomparehelpers.h | 26 +- ...ch-src_corelib_global_qcompilerdetection.h | 4 +- ...vicediscovery_qdevicediscovery__static.cpp | 15 +- ...evkeyboard_qevdevkeyboard__defaultmap__p.h | 11 +- ...ut_evdevkeyboard_qevdevkeyboardhandler.cpp | 13 +- ..._input_evdevtablet_qevdevtablethandler.cpp | 15 +- ...rt_input_evdevtouch_qevdevtouchhandler.cpp | 15 +- devel/qt6-base/pkg-plist | 110 +- devel/qt6-grpc/Makefile | 1 - devel/qt6-grpc/distinfo | 6 +- devel/qt6-grpc/pkg-plist | 84 +- devel/qt6-languageserver/Makefile | 2 +- devel/qt6-languageserver/distinfo | 6 +- devel/qt6-languageserver/pkg-plist | 11 +- devel/qt6-location/distinfo | 6 +- devel/qt6-location/pkg-plist | 3 +- devel/qt6-positioning/distinfo | 6 +- devel/qt6-positioning/pkg-plist | 5 +- devel/qt6-remoteobjects/distinfo | 6 +- devel/qt6-remoteobjects/pkg-plist | 4 + devel/qt6-scxml/distinfo | 6 +- devel/qt6-scxml/pkg-plist | 8 +- devel/qt6-tools/Makefile | 7 +- devel/qt6-tools/distinfo | 12 +- devel/qt6-tools/pkg-plist | 21 +- devel/qt6-translations/distinfo | 6 +- devel/shiboken6/Makefile | 14 +- devel/shiboken6/distinfo | 8 +- devel/shiboken6/pkg-plist | 10 +- graphics/py-qt6-3d/Makefile | 1 - graphics/py-qt6-3d/distinfo | 6 +- graphics/qt6-3d/distinfo | 6 +- graphics/qt6-3d/pkg-plist | 57 +- graphics/qt6-imageformats/distinfo | 6 +- graphics/qt6-imageformats/pkg-plist | 1 + graphics/qt6-lottie/distinfo | 6 +- graphics/qt6-lottie/pkg-plist | 2 + graphics/qt6-quickeffectmaker/distinfo | 6 +- graphics/qt6-quickeffectmaker/pkg-plist | 7 + graphics/qt6-svg/distinfo | 6 +- graphics/qt6-svg/pkg-plist | 4 +- graphics/qt6-wayland/Makefile | 5 +- graphics/qt6-wayland/distinfo | 8 +- graphics/qt6-wayland/pkg-plist | 160 +- misc/qt6-doc/distinfo | 6 +- misc/qt6-doc/pkg-plist | 31 +- misc/qt6-examples/distinfo | 6 +- misc/qt6-examples/pkg-plist | 812 +++-- multimedia/qt6-multimedia/Makefile | 9 +- multimedia/qt6-multimedia/distinfo | 6 +- .../files/patch-cmake_FindFFmpeg.cmake | 18 +- .../files/patch-src_multimedia_CMakeLists.txt | 4 +- .../patch-src_multimedia_configure.cmake | 2 +- ...c_plugins_multimedia_ffmpeg_CMakeLists.txt | 4 +- multimedia/qt6-multimedia/pkg-plist | 72 +- net/py-qt6-networkauth/Makefile | 1 - net/py-qt6-networkauth/distinfo | 6 +- net/py-qt6-networkauth/pkg-plist | 1 + net/qt6-coap/distinfo | 6 +- net/qt6-coap/pkg-plist | 2 + net/qt6-networkauth/Makefile | 3 +- net/qt6-networkauth/distinfo | 6 +- net/qt6-networkauth/pkg-plist | 7 + print/qt6-pdf/pkg-plist | 4 +- science/qt6-quick3dphysics/distinfo | 6 +- science/qt6-quick3dphysics/pkg-plist | 4 + www/py-qt6-webengine/Makefile | 1 - www/py-qt6-webengine/distinfo | 6 +- .../files/patch-pyproject.toml | 4 +- ...ch-sip_QtWebEngineCore_qwebengineframe.sip | 10 + www/py-qt6-webengine/pkg-plist | 3 + www/qt6-httpserver/distinfo | 6 +- www/qt6-httpserver/pkg-plist | 8 +- www/qt6-webchannel/distinfo | 6 +- www/qt6-webchannel/pkg-plist | 3 + www/qt6-webengine/Makefile | 28 +- www/qt6-webengine/distinfo | 6 +- .../files/patch-cmake_Functions.cmake | 18 +- www/qt6-webengine/files/patch-configure.cmake | 18 +- www/qt6-webengine/files/patch-security-rollup | 2884 ----------------- .../patch-src_3rdparty_chromium_BUILD.gn | 20 +- .../patch-src_3rdparty_chromium_base_BUILD.gn | 41 +- ...y_chromium_base_allocator_dispatcher_tls.h | 4 +- ...se_allocator_partition__allocator_BUILD.gn | 11 - ...tor_partition__allocator_page__allocator.h | 11 - ...on__allocator_partition__address__space.cc | 11 - ..._partition__allocator_partition__alloc.gni | 23 +- ...artition__alloc__base_compiler__specific.h | 32 - ...artition__alloc__base_rand__util__posix.cc | 13 - ..._base_threading_platform__thread__posix.cc | 11 - ...tion__allocator_partition__alloc__config.h | 29 - ...n__allocator_partition__alloc__constants.h | 21 - ...n__allocator_src_partition__alloc_BUILD.gn | 11 + ...on__alloc_address__space__randomization.h} | 6 +- ...tor_src_partition__alloc_page__allocator.h | 11 + ...ition__alloc_page__allocator__constants.h} | 24 +- ...alloc_page__allocator__internals__posix.h} | 6 +- ...tition__alloc_partition__address__space.cc | 11 + ..._alloc__base_debug_stack__trace__posix.cc} | 20 +- ...artition__alloc__base_rand__util__posix.cc | 13 + ...__alloc__base_threading_platform__thread.h | 11 + ...ading_platform__thread__internal__posix.h} | 4 +- ..._base_threading_platform__thread__posix.cc | 11 + ...artition__alloc_partition__alloc__config.h | 20 + ...ition__alloc_partition__alloc__constants.h | 20 + ...tition__alloc_partition__alloc__forward.h} | 4 +- ...ition__alloc_partition__page__constants.h} | 8 +- ...r_src_partition__alloc_partition__root.cc} | 18 +- ...r_src_partition__alloc_spinning__mutex.cc} | 14 +- ..._partition__alloc_starscan_stack_stack.cc} | 4 +- ...partition__alloc_thread__isolation_pkey.cc | 11 + ...dparty_chromium_base_base__paths__posix.cc | 16 +- ...c_3rdparty_chromium_base_base__switches.cc | 4 +- ...rc_3rdparty_chromium_base_base__switches.h | 4 +- ...rdparty_chromium_base_compiler__specific.h | 42 +- ...dparty_chromium_base_debug_stack__trace.cc | 6 +- ...chromium_base_debug_stack__trace__posix.cc | 37 +- ..._chromium_base_files_file__path__watcher.h | 4 +- ...y_chromium_base_files_file__util__posix.cc | 7 +- ...omium_base_functional_unretained__traits.h | 18 +- ...c_3rdparty_chromium_base_i18n_icu__util.cc | 2 +- ...-src_3rdparty_chromium_base_linux__util.cc | 11 +- ...-src_3rdparty_chromium_base_process_kill.h | 4 +- ...rty_chromium_base_process_launch__posix.cc | 4 +- ...rty_chromium_base_process_memory__linux.cc | 10 +- ...ty_chromium_base_process_process__handle.h | 4 +- ...m_base_process_process__handle__freebsd.cc | 4 +- ...y_chromium_base_process_process__metrics.h | 20 +- ..._base_process_process__metrics__openbsd.cc | 18 +- ...ty_chromium_base_profiler_module__cache.cc | 4 +- ...ch-src_3rdparty_chromium_base_rand__util.h | 4 +- ...rdparty_chromium_base_rand__util__posix.cc | 34 +- ...chromium_base_synchronization_lock__impl.h | 6 +- ...3rdparty_chromium_base_system_sys__info.cc | 4 +- ..._3rdparty_chromium_base_system_sys__info.h | 6 +- ...chromium_base_system_sys__info__openbsd.cc | 34 +- ...y_chromium_base_system_sys__info__posix.cc | 10 +- ..._base_threading_platform__thread__posix.cc | 10 +- ...ase_trace__event_malloc__dump__provider.cc | 6 +- ...y_chromium_base_trace__event_trace__log.cc | 16 - ...rc_3rdparty_chromium_build_config_BUILD.gn | 2 +- ...party_chromium_build_config_BUILDCONFIG.gn | 2 +- ...ty_chromium_build_config_compiler_BUILD.gn | 46 +- ...hromium_build_config_compiler_pgo_BUILD.gn | 19 - ..._chromium_build_config_linux_pkg-config.py | 6 +- ...c_3rdparty_chromium_build_config_ozone.gni | 2 +- ...ty_chromium_build_linux_unbundle_libusb.gn | 7 +- ...build_linux_unbundle_replace__gn__files.py | 10 - ...hromium_build_toolchain_gcc__toolchain.gni | 8 +- ...rty_chromium_build_toolchain_toolchain.gni | 4 +- .../patch-src_3rdparty_chromium_cc_BUILD.gn | 6 +- ...-src_3rdparty_chromium_cc_base_features.cc | 14 +- ...m_chrome_app_app__management__strings.grdp | 11 - ..._chromium_chrome_app_chromium__strings.grd | 38 - ...romium_chrome_app_generated__resources.grd | 92 - ...ium_chrome_app_google__chrome__strings.grd | 38 - ...chromium_chrome_app_profiles__strings.grdp | 11 - ...chromium_chrome_app_settings__strings.grdp | 35 - ..._app_theme_chrome__unscaled__resources.grd | 29 - ...mium_chrome_app_theme_theme__resources.grd | 59 - ..._3rdparty_chromium_chrome_browser_BUILD.gn | 4 +- ...wser_accessibility_pdf__ocr__controller.cc | 11 + ...__protocol__handler__registry__delegate.cc | 2 +- ...hromium_chrome_browser_extensions_BUILD.gn | 4 +- ...ser__context__keyed__service__factories.cc | 8 +- ...hrome__desktop__report__request__helper.cc | 6 +- ...se__reporting__private_conversion__utils.h | 4 +- ...ate_enterprise__reporting__private__api.cc | 8 +- ...saging_native__process__launcher__posix.cc | 4 +- ...vate_passwords__private__delegate__impl.cc | 4 +- ..._runtime_chrome__runtime__api__delegate.cc | 4 +- ...sions_api_settings__private_prefs__util.cc | 20 +- ...e_browser_extensions_api_tabs_tabs__api.cc | 14 +- ...__private_webrtc__logging__private__api.cc | 4 +- ...ebstore__private_webstore__private__api.cc | 4 +- ...wser_gcm_gcm__profile__service__factory.cc | 2 +- ...me_browser_media_router_discovery_BUILD.gn | 6 +- ...ser_media_webrtc_capture__policy__utils.cc | 6 +- ...media_webrtc_chrome__screen__enumerator.cc | 12 +- ..._media_webrtc_chrome__screen__enumerator.h | 8 +- ...brtc_desktop__media__picker__controller.cc | 11 + ...dia_webrtc_webrtc__event__log__uploader.cc | 11 - ...wser_media_webrtc_webrtc__log__uploader.cc | 20 +- ...edia_webrtc_webrtc__logging__controller.cc | 6 +- ...media_webrtc_webrtc__logging__controller.h | 6 +- ...r_net_system__network__context__manager.cc | 95 +- ...er_net_system__network__context__manager.h | 14 +- ...ium_chrome_browser_prefs_browser__prefs.cc | 32 +- ...inting_print__backend__service__manager.cc | 12 +- ..._chrome_browser_printing_printer__query.cc | 4 +- ...s_sandbox__internals_sandbox__internals.ts | 29 - ..._confirmation_sync__confirmation__app.html | 20 - ...omium_chrome_browser_ui_webui_about__ui.cc | 20 - ...ebui_app__home_app__home__page__handler.cc | 6 +- ...ui_chrome__web__ui__controller__factory.cc | 14 +- ...nectors__internals_device__trust__utils.cc | 6 +- ...wser_ui_webui_management_management__ui.cc | 17 +- ...ebui_management_management__ui__handler.cc | 12 +- ...webui_management_management__ui__handler.h | 6 +- ...ser_ui_webui_ntp_app__launcher__handler.cc | 4 +- ...password__manager_promo__cards__handler.cc | 20 + ...owser_ui_webui_realbox_realbox__handler.cc | 19 +- ...i_settings_accessibility__main__handler.cc | 46 + ...ui_settings_accessibility__main__handler.h | 47 + ..._settings__localized__strings__provider.cc | 48 +- ...chromium_chrome_common_chrome__features.cc | 39 +- ..._chromium_chrome_common_chrome__features.h | 20 +- ...ty_chromium_chrome_common_chrome__paths.cc | 22 +- ...rty_chromium_chrome_common_chrome__paths.h | 14 +- ...chromium_chrome_common_chrome__switches.cc | 4 +- ..._chromium_chrome_common_chrome__switches.h | 4 +- ...ions_chrome__permission__message__rules.cc | 2 +- ...m_chrome_common_media_cdm__registration.cc | 6 +- ...party_chromium_chrome_common_pref__names.h | 22 +- ...y_chromium_chrome_common_url__constants.cc | 11 - ...ty_chromium_chrome_common_url__constants.h | 10 +- ...ium_chrome_common_webui__url__constants.cc | 14 +- ...mium_chrome_common_webui__url__constants.h | 11 +- ...enderer_chrome__render__frame__observer.cc | 4 +- ...src_3rdparty_chromium_chrome_test_BUILD.gn | 4 +- ...rome_test_chromedriver_chrome__launcher.cc | 4 +- ...test_chromedriver_chrome_chrome__finder.cc | 25 +- ...omponents_autofill__payments__strings.grdp | 11 - ..._core_browser_contact__info__sync__util.cc | 18 - ...ll_core_browser_personal__data__manager.cc | 4 +- ...er_webdata_autofill__sync__bridge__util.cc | 22 - ...ore_common_autofill__payments__features.cc | 4 +- ...nts_autofill_core_common_autofill__util.cc | 4 +- ...chromium_components_commerce__strings.grdp | 11 - ...s_commerce_core_commerce__feature__list.cc | 20 + ...mponents_components__chromium__strings.grd | 11 - ...ts_components__google__chrome__strings.grd | 11 - ...ore_browser_website__settings__registry.cc | 4 +- ...ents_cookie__config_cookie__store__util.cc | 4 +- ...hromium_components_crash_core_app_BUILD.gn | 10 +- ..._crash_core_app_crashpad__handler__main.cc | 20 + ...ce_discardable__shared__memory__manager.cc | 4 +- ...ts_embedder__support_user__agent__utils.cc | 4 +- ...gagement_public_feature__configurations.cc | 15 +- ...e__engagement_public_feature__constants.cc | 28 +- ...re__engagement_public_feature__constants.h | 26 +- ...eature__engagement_public_feature__list.cc | 28 +- ...feature__engagement_public_feature__list.h | 56 +- ...m_components_gwp__asan_client_gwp__asan.cc | 13 +- ...romium_components_management__strings.grdp | 11 - ...ents_media__router_common_media__source.cc | 11 + ...viders_cast_channel_cast__message__util.cc | 4 +- ...hromium_components_metrics_metrics__log.cc | 8 +- ..._components_neterror_resources_neterror.js | 4 +- ..._browser_network__session__configurator.cc | 4 +- ...components_new__or__sad__tab__strings.grdp | 20 - ...n__guide_core_optimization__guide__util.cc | 6 +- ...tion__guide_core_tflite__model__executor.h | 62 - ..._preview_browser_paint__preview__client.cc | 18 +- ...iew_player_player__compositor__delegate.cc | 18 +- ...ore_browser_features_password__features.cc | 19 +- ...core_browser_features_password__features.h | 11 + ...er_core_browser_password__form__manager.cc | 29 + ..._manager_core_browser_password__manager.cc | 11 + ..._core_common_password__manager__features.h | 4 +- ...re_common_password__manager__pref__names.h | 11 + ...nts_performance__manager_public_features.h | 6 +- ...ore_browser_policy__pref__mapping__test.cc | 4 +- ...core_common_cloud_cloud__policy__client.cc | 4 +- ...y_core_common_cloud_cloud__policy__util.cc | 6 +- ...licy_core_common_policy__loader__common.cc | 10 +- ...onents_policy_core_common_policy__paths.cc | 10 +- ...onents_policy_core_common_policy__utils.cc | 11 + ...components_qr__code__generator_features.cc | 13 + ..._components_qr__code__generator_features.h | 14 + ...qr__code__generator_qr__code__generator.cc | 47 + ..._browser_db_v4__protocol__manager__util.cc | 4 +- ...nts_safe__browsing_core_common_features.cc | 11 + ..._search__engines_template__url__service.cc | 11 + ...ult__model_cross__device__user__segment.cc | 4 +- ...__preview__compositor__collection__impl.cc | 10 +- ...ervices_screen__ai_public_cpp_utilities.cc | 20 + ...andbox_screen__ai__sandbox__hook__linux.cc | 4 +- ...screen__ai_screen__ai__library__wrapper.cc | 29 - ...nts_signin_public_base_signin__switches.cc | 11 + ...ents_signin_public_base_signin__switches.h | 11 + ...ic__utils_common_startup__metric__utils.cc | 4 +- ...omium_components_storage__monitor_BUILD.gn | 6 +- ...vised__user_core_browser_proto__fetcher.cc | 39 - ...rvised__user_core_browser_proto__fetcher.h | 21 - ..._core_browser_supervised__user__service.cc | 4 +- ...s_supervised__user_core_common_features.cc | 56 + ...ts_supervised__user_core_common_features.h | 11 + ...atter_spoof__checks_idn__spoof__checker.cc | 4 +- ...ser__education_views_help__bubble__view.cc | 4 +- ...ervice_google__groups__updater__service.cc | 11 - ..._variations_service_variations__service.cc | 4 +- ...mponents_viz_host_host__display__client.cc | 12 +- ...omponents_viz_host_host__display__client.h | 14 +- ...y__embedder_skia__output__surface__impl.cc | 14 +- ...er_skia__output__surface__impl__on__gpu.cc | 16 - ...lay__embedder_software__output__surface.cc | 6 +- ...play__embedder_software__output__surface.h | 4 +- ...ents_viz_service_display_skia__renderer.cc | 4 +- ...nks_root__compositor__frame__sink__impl.cc | 22 +- ...inks_root__compositor__frame__sink__impl.h | 14 +- ...arty_chromium_content_app_content__main.cc | 4 +- ...content_app_content__main__runner__impl.cc | 20 +- ...3rdparty_chromium_content_browser_BUILD.gn | 2 +- ...um_content_browser_audio_audio__service.cc | 6 +- ...ser_browser__child__process__host__impl.cc | 13 +- ...wser_browser__child__process__host__impl.h | 20 + ...process__host__impl__receiver__bindings.cc | 11 + ...ium_content_browser_browser__main__loop.cc | 10 +- ...browser_child__process__launcher__helper.h | 11 + ...child__process__launcher__helper__linux.cc | 4 +- ...er_child__thread__type__switcher__linux.cc | 20 + ...ositor_viz__process__transport__factory.cc | 12 +- ...devtools_devtools__frontend__host__impl.cc | 38 + ..._devtools_devtools__frontend__host__impl.h | 11 + ...e__system__access__local__path__watcher.cc | 4 +- ..._access_font__enumeration__data__source.cc | 8 +- ...um_content_browser_gpu_compositor__util.cc | 26 +- ...r_gpu_gpu__data__manager__impl__private.cc | 4 +- ...gpu__memory__buffer__manager__singleton.cc | 8 +- ..._content_browser_gpu_gpu__process__host.cc | 10 +- ...ia_media__keys__listener__manager__impl.cc | 14 +- ...rowser_network__service__instance__impl.cc | 10 +- ...r_renderer__host_delegated__frame__host.cc | 4 +- ...rvice__video__capture__device__launcher.cc | 6 +- ...rer__host_pepper_pepper__file__io__host.cc | 6 +- ...derer__host_render__process__host__impl.cc | 25 +- ...nderer__host_render__process__host__impl.h | 4 +- ...renderer__host_render__view__host__impl.cc | 4 +- ...__host_render__widget__host__view__aura.cc | 14 +- ...r__host_render__widget__host__view__aura.h | 4 +- ...der__widget__host__view__event__handler.cc | 4 +- ...orker_service__worker__context__wrapper.cc | 15 - ..._content_browser_utility__process__host.cc | 37 +- ...m_content_browser_utility__process__host.h | 10 +- ...lity__process__host__receiver__bindings.cc | 10 +- ...tent_browser_utility__sandbox__delegate.cc | 14 +- ...web__contents_web__contents__view__aura.cc | 8 +- ..._zygote__host_zygote__host__impl__linux.cc | 22 +- ...c_3rdparty_chromium_content_child_BUILD.gn | 16 + ...y_chromium_content_child_child__process.cc | 12 +- ..._3rdparty_chromium_content_common_BUILD.gn | 47 +- ...dparty_chromium_content_common_features.cc | 20 + ...rdparty_chromium_content_common_features.h | 20 + ...nt_common_gpu__pre__sandbox__hook__bsd.cc} | 8 +- ...tent_common_gpu__pre__sandbox__hook__bsd.h | 23 + ...ent_common_mojo__core__library__support.cc | 4 +- ...src_3rdparty_chromium_content_gpu_BUILD.gn | 20 - ...chromium_content_gpu_gpu__child__thread.cc | 21 + ...3rdparty_chromium_content_gpu_gpu__main.cc | 40 +- ...mium_content_gpu_gpu__sandbox__hook__bsd.h | 19 - ...pi__plugin_ppapi__blink__platform__impl.cc | 8 +- ...api__plugin_ppapi__blink__platform__impl.h | 4 +- ...public_browser_content__browser__client.cc | 11 + ...content_public_common_content__features.cc | 52 +- ..._content_public_common_content__features.h | 11 - ...content_public_common_content__switches.cc | 6 +- ..._content_public_common_content__switches.h | 6 +- ...rdparty_chromium_content_renderer_BUILD.gn | 16 - ..._content_renderer_render__process__impl.cc | 27 +- ...m_content_renderer_render__thread__impl.cc | 10 +- ...enderer_renderer__blink__platform__impl.cc | 14 +- ...renderer_renderer__blink__platform__impl.h | 4 +- ...c_3rdparty_chromium_content_shell_BUILD.gn | 4 +- ...content_shell_app_shell__main__delegate.cc | 4 +- ...rc_3rdparty_chromium_content_test_BUILD.gn | 6 +- ...party_chromium_content_utility_services.cc | 47 +- ..._chromium_content_utility_utility__main.cc | 39 +- ...m_content_utility_utility__thread__impl.cc | 21 + ...y_chromium_content_zygote_zygote__linux.cc | 4 +- ...mium_content_zygote_zygote__main__linux.cc | 2 +- ..._3rdparty_chromium_device_gamepad_BUILD.gn | 4 +- ...ser__context__keyed__service__factories.cc | 6 +- ..._browser_api_management_management__api.cc | 11 + ..._browser_api_messaging_message__service.cc | 6 +- ...ons_common_api___permission__features.json | 4 +- ...hromium_extensions_common_api_runtime.json | 4 +- ...arty_chromium_extensions_common_command.cc | 4 +- ...ensions_shell_app_shell__main__delegate.cc | 8 +- ..._buffer_service_dawn__context__provider.cc | 8 +- ...and__buffer_service_gles2__cmd__decoder.cc | 4 +- ..._angle__vulkan__image__backing__factory.cc | 4 +- ...red__image_external__vk__image__backing.cc | 14 +- ...e_external__vk__image__backing__factory.cc | 13 +- ...ce_shared__image_shared__image__factory.cc | 4 +- ...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 | 4 +- ...hromium_gpu_config_gpu__finch__features.cc | 26 +- ...hromium_gpu_config_gpu__info__collector.cc | 11 + ...arty_chromium_gpu_ipc_service_gpu__init.cc | 20 +- ...rdparty_chromium_gpu_ipc_service_x__util.h | 17 +- ..._chromium_gpu_vulkan_generate__bindings.py | 4 +- ...y_chromium_gpu_vulkan_semaphore__handle.cc | 10 +- ...romium_gpu_vulkan_vulkan__device__queue.cc | 4 +- ...hromium_gpu_vulkan_vulkan__device__queue.h | 4 +- ...m_gpu_vulkan_vulkan__function__pointers.cc | 8 +- ...um_gpu_vulkan_vulkan__function__pointers.h | 8 +- ...dparty_chromium_gpu_vulkan_vulkan__util.cc | 4 +- ...ser_headless__request__context__manager.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 | 4 +- ...src_3rdparty_chromium_media_audio_BUILD.gn | 6 +- ...romium_media_base_cdm__promise__adapter.cc | 16 - ...rty_chromium_media_base_media__switches.cc | 80 +- ...arty_chromium_media_base_media__switches.h | 23 +- ...rty_chromium_media_base_scopedfd__helper.h | 11 - ...dparty_chromium_media_base_video__frame.cc | 18 +- ...rdparty_chromium_media_base_video__frame.h | 6 +- ...o_fake__video__capture__device__factory.cc | 4 +- ...ia_capture_video_linux_fake__v4l2__impl.cc | 4 +- ...ure_video_linux_v4l2__capture__delegate.cc | 36 +- ...capture__buffer__tracker__factory__impl.cc | 6 +- ...re_video_video__capture__device__client.cc | 4 +- ...y_chromium_media_gpu_buffer__validation.cc | 33 +- ...omeos_libyuv__image__processor__backend.cc | 29 + ...romeos_mailbox__video__frame__converter.cc | 11 + ..._chromeos_platform__video__frame__utils.cc | 20 + ...a_gpu_chromeos_video__decoder__pipeline.cc | 8 +- ...m_media_gpu_vaapi_vaapi__video__decoder.cc | 4 +- ...chromium_media_gpu_vaapi_vaapi__wrapper.cc | 49 +- ...3rdparty_chromium_media_media__options.gni | 6 +- ...m_media_video_fake__gpu__memory__buffer.cc | 4 +- ...gpu__memory__buffer__video__frame__pool.cc | 8 +- ...deo_video__encode__accelerator__adapter.cc | 6 +- ...ty_chromium_mojo_public_c_system_thunks.cc | 8 +- ...omium_mojo_public_tools_bindings_mojom.gni | 4 +- .../patch-src_3rdparty_chromium_net_BUILD.gn | 20 +- ...src_3rdparty_chromium_net_base_features.cc | 24 +- ...mium_net_base_network__change__notifier.cc | 4 +- ...dparty_chromium_net_cert_cert__verifier.cc | 11 - ...ty_chromium_net_cert_cert__verify__proc.cc | 11 - ...rty_chromium_net_cert_cert__verify__proc.h | 4 +- ...rty_chromium_net_cert_pki_general__names.h | 10 - ...tch-src_3rdparty_chromium_net_dns_BUILD.gn | 24 +- ...3rdparty_chromium_net_dns_address__info.cc | 4 +- ..._3rdparty_chromium_net_dns_public_BUILD.gn | 4 +- ...romium_net_dns_public_scoped__res__state.h | 4 +- ...esolution_proxy__config__service__linux.cc | 8 +- ..._chromium_net_socket_udp__socket__posix.cc | 18 +- ..._chromium_net_third__party_quiche_BUILD.gn | 4 +- ...y__tool_cert__verify__comparision__tool.cc | 4 +- ...s_cert__verify__tool_cert__verify__tool.cc | 21 +- ..._net_url__request_url__request__context.cc | 4 +- ...m_net_url__request_url__request__context.h | 4 +- ..._request_url__request__context__builder.cc | 4 +- ...arty_chromium_pdf_pdfium_pdfium__engine.cc | 4 +- ..._mojom_printing__context__mojom__traits.cc | 8 +- ...omium_printing_printing__context__linux.cc | 8 +- ..._3rdparty_chromium_sandbox_policy_BUILD.gn | 12 +- ...dparty_chromium_sandbox_policy_features.cc | 13 +- ...rdparty_chromium_sandbox_policy_features.h | 11 + ..._sandbox_policy_freebsd_sandbox__freebsd.h | 2 +- ...hromium_sandbox_policy_mojom_sandbox.mojom | 4 +- ...rdparty_chromium_sandbox_policy_sandbox.cc | 4 +- ...y_chromium_sandbox_policy_sandbox__type.cc | 24 +- ...dparty_chromium_sandbox_policy_switches.cc | 6 +- ...rdparty_chromium_sandbox_policy_switches.h | 6 +- ...vices_audio_audio__sandbox__hook__linux.cc | 8 +- ...cert__verifier_cert__verifier__creation.cc | 28 - ...3rdparty_chromium_services_device_BUILD.gn | 4 +- ...ces_device_compute__pressure_cpu__probe.cc | 4 +- ...device_geolocation_location__arbitrator.cc | 4 +- ...arty_chromium_services_device_hid_BUILD.gn | 4 +- ...blic_cpp_generic__sensor_sensor__reading.h | 2 +- ...arty_chromium_services_device_usb_BUILD.gn | 8 +- ...rdparty_chromium_services_network_BUILD.gn | 6 +- ...omium_services_network_network__context.cc | 6 +- ...romium_services_network_network__context.h | 4 +- ...omium_services_network_network__service.cc | 6 +- ...romium_services_network_network__service.h | 8 +- ...omium_services_network_public_cpp_BUILD.gn | 4 +- ...um_services_network_public_cpp_features.cc | 20 +- ...ium_services_network_public_mojom_BUILD.gn | 6 +- ...rumentation_queued__request__dispatcher.cc | 16 +- ...ck__sampling_tracing__sampler__profiler.cc | 4 +- ...__capture_video__capture__service__impl.cc | 32 +- ...o__capture_video__capture__service__impl.h | 28 +- ...eil-cpp_absl_base_internal_raw__logging.cc | 16 - ...y_abseil-cpp_absl_base_internal_sysinfo.cc | 27 +- ...party_chromium_third__party_angle_BUILD.gn | 8 +- ...__party_angle_src_common_system__utils.cpp | 11 + ..._angle_src_common_system__utils__linux.cpp | 35 + ...hird__party_angle_src_libANGLE_Display.cpp | 10 +- ...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 +- ..._renderer_controller_blink__initializer.cc | 8 +- ...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 +- ...core_inspector_inspector__memory__agent.cc | 10 +- ...link_renderer_core_layout_layout__view.cc} | 14 +- ..._blink_renderer_core_paint_paint__layer.cc | 4 +- ...erer_core_scroll_scrollbar__theme__aura.cc | 6 +- ...r_modules_canvas_canvas2d_canvas__style.cc | 12 - ...o_audio__renderer__mixer__manager__test.cc | 4 +- ...ink_renderer_modules_ml_webnn_features.gni | 16 +- ...rer_modules_ml_webnn_ml__graph__xnnpack.cc | 4 +- ...onnection_webrtc__audio__renderer__test.cc | 4 +- ...s_webgl_webgl__rendering__context__base.cc | 4 +- ...link_renderer_modules_webgpu_gpu__queue.cc | 8 +- ...rd__party_blink_renderer_platform_BUILD.gn | 4 +- ...ink_renderer_platform_fonts_font__cache.cc | 6 +- ...link_renderer_platform_fonts_font__cache.h | 4 +- ...nderer_platform_fonts_font__description.cc | 8 +- ...k_renderer_platform_fonts_font__metrics.cc | 16 +- ...nk_renderer_platform_fonts_font__palette.h | 28 - ...rer_platform_fonts_font__platform__data.cc | 2 +- ...r_platform_fonts_palette__interpolation.cc | 16 - ...r_platform_fonts_skia_font__cache__skia.cc | 6 +- ...atform_graphics_video__frame__submitter.cc | 4 +- ...connection_rtc__video__encoder__factory.cc | 4 +- ..._platform_runtime__enabled__features.json5 | 23 +- ...orm_video__capture_video__capture__impl.cc | 4 +- ...blink_renderer_platform_wtf_math__extras.h | 12 - ...ringssl_src_util_generate__build__files.py | 6 +- ..._party_crashpad_crashpad_util_misc_uuid.cc | 4 +- ...pad_crashpad_util_posix_close__multiple.cc | 4 +- ...y_dawn_include_dawn_native_VulkanBackend.h | 4 +- ...ird__party_dawn_src_dawn_common_Platform.h | 4 +- ..._dawn_src_dawn_native_vulkan_BackendVk.cpp | 4 +- ...rty_distributed__point__functions_BUILD.gn | 12 - ...arty_chromium_third__party_ffmpeg_BUILD.gn | 2 +- ...y_ffmpeg_chromium_scripts_build__ffmpeg.py | 12 +- ...rty_chromium_third__party_ffmpeg_configure | 4 +- ...third__party_ffmpeg_libavcodec_x86_fft.asm | 108 - ...ird__party_ffmpeg_libavutil_x86_x86inc.asm | 4 +- ...hird__party_leveldatabase_env__chromium.cc | 4 +- ...hromium_third__party_libxml_linux_config.h | 12 - ...ty_chromium_third__party_libxml_src_dict.c | 41 - ...oca_src_maldoca_base_get__runfiles__dir.cc | 8 +- ...color__utilities_src_cpp_palettes_tones.cc | 2 +- ...rdparty_chromium_third__party_node_node.py | 2 +- ...ty_chromium_third__party_pdfium_pdfium.gni | 8 +- ...ium_third__party_base_compiler__specific.h | 11 - ...arty_perfetto_include_perfetto_base_time.h | 8 +- ..._include_perfetto_ext_base_thread__utils.h | 4 +- ...__party_perfetto_src_base_string__utils.cc | 4 +- ...__processor_db_storage_numeric__storage.cc | 16 - ...src_tracing_core_tracing__service__impl.cc | 4 +- ...ty_speech-dispatcher_libspeechd__version.h | 32 + ...d__party_sqlite_src_amalgamation_sqlite3.c | 15 +- ..._chromium_third__party_tflite_features.gni | 15 +- ...rty_vulkan-deps_vulkan-loader_src_BUILD.gn | 4 +- ...n-loader_src_loader_vk__loader__platform.h | 4 +- ...memory__allocator_include_vk__mem__alloc.h | 4 +- ...arty_chromium_third__party_webrtc_BUILD.gn | 4 +- ...arty_webrtc_modules_audio__device_BUILD.gn | 4 +- ...brtc_rtc__base_physical__socket__server.cc | 16 +- ...ebrtc_rtc__base_physical__socket__server.h | 8 +- ...ium_third__party_widevine_cdm_widevine.gni | 4 +- ...dparty_chromium_third__party_zlib_BUILD.gn | 8 +- ...arty_chromium_tools_grit_grit_node_base.py | 12 + ...son__schema__compiler_feature__compiler.py | 4 +- ...dparty_chromium_tools_licenses_licenses.py | 4 +- ...mory_partition__allocator_inspect__utils.h | 4 +- ...ols_perf_chrome__telemetry__build_BUILD.gn | 4 +- ...3rdparty_chromium_ui_aura_screen__ozone.cc | 4 +- ..._3rdparty_chromium_ui_aura_screen__ozone.h | 6 +- ..._ui_base_clipboard_clipboard__constants.cc | 4 +- ...m_ui_base_clipboard_clipboard__constants.h | 4 +- ...i_base_clipboard_clipboard__non__backed.cc | 11 + ...p_os__exchange__data__provider__factory.cc | 2 +- ...__exchange__data__provider__non__backed.cc | 4 +- ...ase_ime_init_input__method__initializer.cc | 29 + ...omium_ui_base_resource_resource__bundle.cc | 2 +- ...rty_chromium_ui_base_ui__base__features.cc | 42 +- ...arty_chromium_ui_base_ui__base__features.h | 20 - ...rdparty_chromium_ui_base_ui__base__types.h | 11 - ...ty_chromium_ui_base_webui_web__ui__util.cc | 14 +- ...chromium_ui_base_x_x11__cursor__factory.cc | 4 +- ..._chromium_ui_base_x_x11__cursor__factory.h | 8 +- ..._chromium_ui_base_x_x11__cursor__loader.cc | 14 +- ...hromium_ui_base_x_x11__display__manager.cc | 20 + ...y_chromium_ui_base_x_x11__display__util.cc | 364 +++ ...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 | 4 +- ...hromium_ui_color_color__provider__utils.cc | 4 +- ...party_chromium_ui_compositor_compositor.cc | 12 +- ...dparty_chromium_ui_compositor_compositor.h | 14 +- ...omium_ui_compositor_compositor__observer.h | 12 +- ...-src_3rdparty_chromium_ui_display_screen.h | 4 +- ..._devices_x11_device__data__manager__x11.cc | 4 +- ...h-src_3rdparty_chromium_ui_events_event.cc | 10 +- ...esture__detection_motion__event__generic.h | 10 - ..._events_keycodes_dom_keycode__converter.cc | 8 +- ...i_events_keycodes_dom_keycode__converter.h | 4 +- ...ayout_xkb_xkb__keyboard__layout__engine.cc | 6 +- ...atch-src_3rdparty_chromium_ui_gfx_BUILD.gn | 4 +- ...c_3rdparty_chromium_ui_gfx_canvas__skia.cc | 4 +- ...y_chromium_ui_gfx_font__fallback__linux.cc | 4 +- ...rty_chromium_ui_gfx_font__render__params.h | 10 +- ...party_chromium_ui_gfx_linux_dmabuf__uapi.h | 2 +- ...arty_chromium_ui_gfx_linux_gbm__wrapper.cc | 11 + ..._chromium_ui_gfx_native__pixmap__handle.cc | 2 +- ...ty_chromium_ui_gfx_native__widget__types.h | 6 +- ...ty_chromium_ui_gfx_platform__font__skia.cc | 6 +- ...hromium_ui_gfx_x_generated__protos_dri3.cc | 6 +- ...chromium_ui_gfx_x_generated__protos_shm.cc | 6 +- ...rdparty_chromium_ui_gfx_x_xlib__support.cc | 6 +- ...patch-src_3rdparty_chromium_ui_gl_BUILD.gn | 10 +- ...src_3rdparty_chromium_ui_gl_gl__context.cc | 4 +- ...party_chromium_ui_gl_gl__implementation.cc | 4 +- ...rc_3rdparty_chromium_ui_gl_gl__switches.cc | 21 +- ...ch-src_3rdparty_chromium_ui_gtk_gtk__ui.cc | 22 - ...mium_ui_gtk_printing_print__dialog__gtk.cc | 4 +- ...sage__center_views_message__popup__view.cc | 4 +- ...um_ui_native__theme_native__theme__base.cc | 4 +- ...i_native__theme_native__theme__features.cc | 20 + ...e_platform_wayland_common_wayland__util.cc | 11 + ...wayland_emulate_wayland__input__emulate.cc | 11 + ..._wayland_emulate_wayland__input__emulate.h | 11 + ..._wayland_host_wayland__toplevel__window.cc | 8 +- ...m_wayland_host_wayland__toplevel__window.h | 12 +- ...e_platform_wayland_host_wayland__window.cc | 14 +- ...ne_platform_wayland_host_wayland__window.h | 12 +- ...yland_host_xdg__toplevel__wrapper__impl.cc | 12 +- ...land_host_zwp__text__input__wrapper__v1.cc | 2 +- ...atform_wayland_ozone__platform__wayland.cc | 8 +- ...ozone_platform_x11_ozone__platform__x11.cc | 11 - ...i_ozone_platform_x11_x11__screen__ozone.cc | 23 +- ...ui_ozone_platform_x11_x11__screen__ozone.h | 14 +- ...omium_ui_ozone_platform_x11_x11__window.cc | 11 + ...chromium_ui_ozone_public_ozone__platform.h | 11 - ...romium_ui_ozone_public_platform__screen.cc | 11 - ...hromium_ui_ozone_public_platform__screen.h | 20 - ...ne_test_mock__platform__window__delegate.h | 6 +- ...form__window_platform__window__delegate.cc | 8 +- ...tform__window_platform__window__delegate.h | 8 +- ...patch-src_3rdparty_chromium_ui_qt_BUILD.gn | 11 + ...omium_ui_strings_app__locale__settings.grd | 11 - ...m_ui_views_controls_textfield_textfield.cc | 16 +- ...um_ui_views_controls_textfield_textfield.h | 6 +- ...controls__factory__desktop__aura__ozone.cc | 11 + ...party_chromium_ui_views_views__delegate.cc | 2 +- ...dparty_chromium_ui_views_views__delegate.h | 4 +- ...aura_desktop__drag__drop__client__ozone.cc | 4 +- ..._aura_desktop__drag__drop__client__ozone.h | 6 +- ...et_desktop__aura_desktop__screen__ozone.cc | 11 - ...a_desktop__window__tree__host__platform.cc | 10 +- ...st__platform__impl__interactive__uitest.cc | 4 +- ...rty_chromium_ui_views_widget_root__view.cc | 11 + ...rdparty_chromium_ui_views_widget_widget.cc | 4 +- ...3rdparty_chromium_ui_views_widget_widget.h | 4 +- ...romium_ui_views_window_dialog__delegate.cc | 4 +- .../patch-src_3rdparty_chromium_v8_BUILD.gn | 10 +- ...3rdparty_chromium_v8_include_v8-internal.h | 8 +- ...rc_3rdparty_chromium_v8_include_v8config.h | 8 +- ...ch-src_3rdparty_chromium_v8_src_api_api.cc | 4 +- ...ium_v8_src_base_platform_platform-posix.cc | 14 +- ..._baseline_x64_baseline-assembler-x64-inl.h | 13 - ...romium_v8_src_builtins_x64_builtins-x64.cc | 46 - ...romium_v8_src_codegen_x64_assembler-x64.cc | 42 - ...hromium_v8_src_codegen_x64_assembler-x64.h | 21 - ..._v8_src_codegen_x64_macro-assembler-x64.cc | 20 - ...m_v8_src_codegen_x64_macro-assembler-x64.h | 20 - ...compiler_backend_x64_code-generator-x64.cc | 16 - ..._v8_src_deoptimizer_x64_deoptimizer-x64.cc | 11 - ...party_chromium_v8_src_execution_isolate.cc | 6 +- ...rc_3rdparty_chromium_v8_src_flags_flags.cc | 10 +- ..._src_maglev_x64_maglev-assembler-x64-inl.h | 14 - ..._v8_src_maglev_x64_maglev-assembler-x64.cc | 16 - ...c_regexp_x64_regexp-macro-assembler-x64.cc | 22 - ...rc_regexp_x64_regexp-macro-assembler-x64.h | 12 - ...dded_platform-embedded-file-writer-base.cc | 4 +- ...8_src_trap-handler_handler-inside-posix.cc | 6 +- ...asm_baseline_ia32_liftoff-assembler-ia32.h | 128 - ...romium_v8_src_wasm_jump-table-assembler.cc | 51 - ...hromium_v8_src_wasm_jump-table-assembler.h | 16 - ...ayer_browser_browser__main__parts__impl.cc | 20 - ..._browser_content__browser__client__impl.cc | 20 - ...r_browser_content__browser__client__impl.h | 11 - ...owser_system__network__context__manager.cc | 11 - ...hromium_weblayer_common_weblayer__paths.cc | 20 - .../files/patch-src_3rdparty_gn_build_gen.py | 10 +- .../files/patch-src_core_CMakeLists.txt | 32 +- .../files/patch-src_core_api_configure.cmake | 18 +- .../files/patch-src_pdf_CMakeLists.txt | 4 +- www/qt6-webengine/pkg-plist | 15 +- www/qt6-websockets/distinfo | 6 +- www/qt6-websockets/pkg-plist | 2 + www/qt6-webview/distinfo | 6 +- www/qt6-webview/pkg-plist | 4 + x11-toolkits/Makefile | 1 + x11-toolkits/py-qt6-charts/distinfo | 6 +- x11-toolkits/py-qt6-datavis3d/Makefile | 1 - x11-toolkits/py-qt6-datavis3d/distinfo | 6 +- x11-toolkits/py-qt6-graphs/Makefile | 26 + x11-toolkits/py-qt6-graphs/distinfo | 3 + x11-toolkits/py-qt6-graphs/pkg-descr | 2 + x11-toolkits/py-qt6-graphs/pkg-plist | 59 + x11-toolkits/qt6-charts/distinfo | 6 +- x11-toolkits/qt6-charts/pkg-plist | 5 +- x11-toolkits/qt6-datavis3d/distinfo | 6 +- x11-toolkits/qt6-datavis3d/pkg-plist | 3 + x11-toolkits/qt6-declarative/Makefile | 3 +- x11-toolkits/qt6-declarative/distinfo | 6 +- x11-toolkits/qt6-declarative/pkg-plist | 1217 ++++++- x11-toolkits/qt6-graphs/distinfo | 6 +- x11-toolkits/qt6-graphs/pkg-plist | 128 +- x11-toolkits/qt6-quick3d/distinfo | 6 +- x11-toolkits/qt6-quick3d/pkg-plist | 28 +- x11-toolkits/qt6-quicktimeline/distinfo | 6 +- x11-toolkits/qt6-quicktimeline/pkg-plist | 5 +- x11-toolkits/qt6-shadertools/distinfo | 6 +- x11-toolkits/qt6-shadertools/pkg-plist | 3 +- x11-toolkits/qt6-virtualkeyboard/distinfo | 6 +- x11-toolkits/qt6-virtualkeyboard/pkg-plist | 6 +- 757 files changed, 6977 insertions(+), 7816 deletions(-) create mode 100644 devel/py-qt5-sip/files/patch-pyproject.toml create mode 100644 devel/py-qt6-sip/files/patch-pyproject.toml create mode 100644 devel/pyside6/files/patch-sources_pyside6_cmake_PySideHelpers.cmake create mode 100644 www/py-qt6-webengine/files/patch-sip_QtWebEngineCore_qwebengineframe.sip delete mode 100644 www/qt6-webengine/files/patch-security-rollup delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_BUILD.gn delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_page__allocator.h delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__address__space.cc delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__base_compiler__specific.h delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__base_rand__util__posix.cc delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__base_threading_platform__thread__posix.cc delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__config.h delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__constants.h create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_BUILD.gn rename www/qt6-webengine/files/{patch-src_3rdparty_chromium_base_allocator_partition__allocator_address__space__randomization.h => patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_address__space__randomization.h} (68%) create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_page__allocator.h rename www/qt6-webengine/files/{patch-src_3rdparty_chromium_base_allocator_partition__allocator_page__allocator__constants.h => patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_page__allocator__constants.h} (57%) rename www/qt6-webengine/files/{patch-src_3rdparty_chromium_base_allocator_partition__allocator_page__allocator__internals__posix.h => patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_page__allocator__internals__posix.h} (59%) create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_partition__address__space.cc rename www/qt6-webengine/files/{patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__base_debug_stack__trace__posix.cc => patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_debug_stack__trace__posix.cc} (50%) create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_rand__util__posix.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread.h rename www/qt6-webengine/files/{patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__base_threading_platform__thread__internal__posix.h => patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread__internal__posix.h} (57%) create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread__posix.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_partition__alloc__config.h create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_partition__alloc__constants.h rename www/qt6-webengine/files/{patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__forward.h => patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_partition__alloc__forward.h} (72%) rename www/qt6-webengine/files/{patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__page__constants.h => patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_partition__page__constants.h} (51%) rename www/qt6-webengine/files/{patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__root.cc => patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_partition__root.cc} (66%) rename www/qt6-webengine/files/{patch-src_3rdparty_chromium_base_allocator_partition__allocator_spinning__mutex.cc => patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_spinning__mutex.cc} (81%) rename www/qt6-webengine/files/{patch-src_3rdparty_chromium_base_allocator_partition__allocator_starscan_stack_stack.cc => patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_starscan_stack_stack.cc} (81%) create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_thread__isolation_pkey.cc delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_base_trace__event_trace__log.cc delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_compiler_pgo_BUILD.gn delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_build_linux_unbundle_replace__gn__files.py delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_app_app__management__strings.grdp delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_app_chromium__strings.grd delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_app_generated__resources.grd delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_app_google__chrome__strings.grd delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_app_profiles__strings.grdp delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_app_settings__strings.grdp delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_app_theme_chrome__unscaled__resources.grd delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_app_theme_theme__resources.grd create 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_media_webrtc_desktop__media__picker__controller.cc delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_webrtc_webrtc__event__log__uploader.cc delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_resources_sandbox__internals_sandbox__internals.ts delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_resources_signin_sync__confirmation_sync__confirmation__app.html delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_about__ui.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_password__manager_promo__cards__handler.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_settings_accessibility__main__handler.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_settings_accessibility__main__handler.h delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_url__constants.cc delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_components_autofill__payments__strings.grdp delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_components_autofill_core_browser_contact__info__sync__util.cc delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_components_autofill_core_browser_webdata_autofill__sync__bridge__util.cc delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_components_commerce__strings.grdp create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_components_commerce_core_commerce__feature__list.cc delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_components_components__chromium__strings.grd delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_components_components__google__chrome__strings.grd create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_components_crash_core_app_crashpad__handler__main.cc delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_components_management__strings.grdp create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_components_media__router_common_media__source.cc delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_components_new__or__sad__tab__strings.grdp delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_components_optimization__guide_core_tflite__model__executor.h create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_browser_features_password__features.h create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_browser_password__form__manager.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_browser_password__manager.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_common_password__manager__pref__names.h create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_components_policy_core_common_policy__utils.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_components_qr__code__generator_features.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_components_qr__code__generator_features.h create 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_safe__browsing_core_common_features.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_components_search__engines_template__url__service.cc create 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_screen__ai__library__wrapper.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_components_signin_public_base_signin__switches.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_components_signin_public_base_signin__switches.h delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_components_supervised__user_core_browser_proto__fetcher.cc delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_components_supervised__user_core_browser_proto__fetcher.h create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_components_supervised__user_core_common_features.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_components_supervised__user_core_common_features.h delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_components_variations_service_google__groups__updater__service.cc delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_components_viz_service_display__embedder_skia__output__surface__impl__on__gpu.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_browser__child__process__host__impl.h create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_browser__child__process__host__impl__receiver__bindings.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_child__process__launcher__helper.h create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_child__thread__type__switcher__linux.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_devtools_devtools__frontend__host__impl.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_devtools_devtools__frontend__host__impl.h delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_service__worker_service__worker__context__wrapper.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_content_child_BUILD.gn create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_content_common_features.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_content_common_features.h rename www/qt6-webengine/files/{patch-src_3rdparty_chromium_content_gpu_gpu__sandbox__hook__bsd.cc => patch-src_3rdparty_chromium_content_common_gpu__pre__sandbox__hook__bsd.cc} (84%) create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_content_common_gpu__pre__sandbox__hook__bsd.h delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_content_gpu_BUILD.gn create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_content_gpu_gpu__child__thread.cc delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_content_gpu_gpu__sandbox__hook__bsd.h create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_browser_content__browser__client.cc delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__features.h delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_content_renderer_BUILD.gn create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_content_utility_utility__thread__impl.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_browser_api_management_management__api.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_config_gpu__info__collector.cc delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_cdm__promise__adapter.cc delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_scopedfd__helper.h create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_chromeos_libyuv__image__processor__backend.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_chromeos_mailbox__video__frame__converter.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_chromeos_platform__video__frame__utils.cc delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_net_cert_cert__verifier.cc delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_net_cert_cert__verify__proc.cc delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_net_cert_pki_general__names.h create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_features.h delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_services_cert__verifier_cert__verifier__creation.cc delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_abseil-cpp_absl_base_internal_raw__logging.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_common_system__utils.cpp create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_common_system__utils__linux.cpp rename www/qt6-webengine/files/{patch-src_3rdparty_chromium_third__party_blink_renderer_core_layout_ng_layout__ng__view.cc => patch-src_3rdparty_chromium_third__party_blink_renderer_core_layout_layout__view.cc} (70%) delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_canvas_canvas2d_canvas__style.cc delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__palette.h delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_palette__interpolation.cc delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_wtf_math__extras.h delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_distributed__point__functions_BUILD.gn delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_ffmpeg_libavcodec_x86_fft.asm delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_libxml_linux_config.h delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_libxml_src_dict.c delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_pdfium_third__party_base_compiler__specific.h delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_src_trace__processor_db_storage_numeric__storage.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_speech-dispatcher_libspeechd__version.h create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_grit_grit_node_base.py create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_clipboard_clipboard__non__backed.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_init_input__method__initializer.cc delete 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_ui__base__types.h create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_x_x11__display__manager.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_x_x11__display__util.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_x_x11__util.cc create 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_events_gesture__detection_motion__event__generic.h create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_linux_gbm__wrapper.cc delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gtk_gtk__ui.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_native__theme_native__theme__features.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_common_wayland__util.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_emulate_wayland__input__emulate.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_emulate_wayland__input__emulate.h delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_x11_ozone__platform__x11.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_x11_x11__window.cc delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_public_ozone__platform.h delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_public_platform__screen.cc delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_public_platform__screen.h create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_qt_BUILD.gn delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_strings_app__locale__settings.grd create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_test_ui__controls__factory__desktop__aura__ozone.cc delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_desktop__aura_desktop__screen__ozone.cc create mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_root__view.cc delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_baseline_x64_baseline-assembler-x64-inl.h delete 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_x64_assembler-x64.cc delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_codegen_x64_assembler-x64.h delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_codegen_x64_macro-assembler-x64.cc delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_codegen_x64_macro-assembler-x64.h delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_compiler_backend_x64_code-generator-x64.cc delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_deoptimizer_x64_deoptimizer-x64.cc delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_maglev_x64_maglev-assembler-x64-inl.h delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_maglev_x64_maglev-assembler-x64.cc delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_regexp_x64_regexp-macro-assembler-x64.cc delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_regexp_x64_regexp-macro-assembler-x64.h delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_wasm_baseline_ia32_liftoff-assembler-ia32.h delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_wasm_jump-table-assembler.cc delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_wasm_jump-table-assembler.h delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_weblayer_browser_browser__main__parts__impl.cc delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_weblayer_browser_content__browser__client__impl.cc delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_weblayer_browser_content__browser__client__impl.h delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_weblayer_browser_system__network__context__manager.cc delete mode 100644 www/qt6-webengine/files/patch-src_3rdparty_chromium_weblayer_common_weblayer__paths.cc create mode 100644 x11-toolkits/py-qt6-graphs/Makefile create mode 100644 x11-toolkits/py-qt6-graphs/distinfo create mode 100644 x11-toolkits/py-qt6-graphs/pkg-descr create mode 100644 x11-toolkits/py-qt6-graphs/pkg-plist diff --git a/Mk/Uses/pyqt.mk b/Mk/Uses/pyqt.mk index 3de466731e13..feac1c8cb656 100644 --- a/Mk/Uses/pyqt.mk +++ b/Mk/Uses/pyqt.mk @@ -82,6 +82,8 @@ MASTER_SITES_PYQT6CHARTS= PYPI/source/P/PyQt6-Charts \ RBDEV/PyQt6-Charts MASTER_SITES_PYQT6DATAVIS3D= PYPI/source/P/PyQt6-DataVisualization \ RBDEV/PyQt6-DataVisualization +MASTER_SITES_PYQT6GRAPHS= PYPI/source/P/PyQt6-Graphs \ + RBDEV/PyQt6-Graphs MASTER_SITES_PYQT6NETWORKAUTH= PYPI/source/P/PyQt6-NetworkAuth \ RBDEV/PyQt6-NetworkAuth MASTER_SITES_PYQT6WEBENGINE= PYPI/source/P/PyQt6-WebEngine \ @@ -91,8 +93,9 @@ MASTER_SITES_PYQT6WEBENGINE= PYPI/source/P/PyQt6-WebEngine \ MASTER_SITES_PYQT= ${MASTER_SITES_PYQT${_PYQT_VERSION}} MASTER_SITES_PYQTSIP= ${MASTER_SITES_PYQT${_PYQT_VERSION}SIP} MASTER_SITES_PYQT3D= ${MASTER_SITES_PYQT${_PYQT_VERSION}3D} -MASTER_SITES_PYQTCHARTS= ${MASTER_SITES_PYQT${_PYQT_VERSION}CHARTS} +MASTER_SITES_PYQTCHARTS= ${MASTER_SITES_PYQT${_PYQT_VERSION}CHARTS} MASTER_SITES_PYQTDATAVIS3D= ${MASTER_SITES_PYQT${_PYQT_VERSION}DATAVIS3D} +MASTER_SITES_PYQTGRAPHS= ${MASTER_SITES_PYQT${_PYQT_VERSION}GRAPHS} MASTER_SITES_PYQTNETWORKAUTH= ${MASTER_SITES_PYQT${_PYQT_VERSION}NETWORKAUTH} MASTER_SITES_PYQTWEBENGINE= ${MASTER_SITES_PYQT${_PYQT_VERSION}WEBENGINE} @@ -106,12 +109,12 @@ 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.16.4 +PYQTBUILDER_VERSION= 1.17.0 QSCI2_VERSION= 2.14.1 -SIP_VERSION= 6.8.6 # ,1 +SIP_VERSION= 6.9.1 # ,1 # Qt 5 components -PYQT5SIP_VERSION= 12.15.0 +PYQT5SIP_VERSION= 12.16.1 PYQT5_VERSION= 5.15.11 PYQT53D_VERSION= 5.15.7 PYQT5CHARTS_VERSION= 5.15.7 @@ -120,20 +123,21 @@ PYQT5NETWORKAUTH_VERSION= 5.15.6 PYQT5WEBENGINE_VERSION= 5.15.7 # Qt 6 components -PYQT6SIP_VERSION= 13.8.0 -PYQT6_VERSION= 6.7.1 -PYQT63D_VERSION= 6.7.0 -PYQT6CHARTS_VERSION= 6.7.0 -PYQT6DATAVIS3D_VERSION= 6.7.0 -PYQT6NETWORKAUTH_VERSION= 6.7.0 -PYQT6WEBENGINE_VERSION= 6.7.0 +PYQT6SIP_VERSION= 13.9.1 +PYQT6_VERSION= 6.8.0 +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 # Qt version-agnostic components PYQTBUILDER_DISTNAME= pyqt_builder-${PYQTBUILDER_VERSION} QSCI2_DISTNAME= QScintilla_src-${QSCI2_VERSION} # Qt 5 components -PYQT5SIP_DISTNAME= PyQt5_sip-${PYQT5SIP_VERSION} +PYQT5SIP_DISTNAME= pyqt5_sip-${PYQT5SIP_VERSION} PYQT5_DISTNAME= PyQt5-${PYQT5_VERSION} PYQT53D_DISTNAME= PyQt3D-${PYQT53D_VERSION} PYQT5CHARTS_DISTNAME= PyQtChart-${PYQT5CHARTS_VERSION} @@ -142,11 +146,12 @@ PYQT5NETWORKAUTH_DISTNAME= PyQtNetworkAuth-${PYQT5NETWORKAUTH_VERSION} PYQT5WEBENGINE_DISTNAME= PyQtWebEngine-${PYQT5WEBENGINE_VERSION} # Qt 6 components -PYQT6SIP_DISTNAME= PyQt6_sip-${PYQT6SIP_VERSION} +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} @@ -167,6 +172,7 @@ PYQT_VERSION= ${PYQT${_PYQT_VERSION}_VERSION} PYQT3D_VERSION= ${PYQT${_PYQT_VERSION}3D_VERSION} PYQTCHARTS_VERSION= ${PYQT${_PYQT_VERSION}CHARTS_VERSION} PYQTDATAVIS3D_VERSION= ${PYQT${_PYQT_VERSION}DATAVIS3D_VERSION} +PYQTGRAPHS_VERSION= ${PYQT${_PYQT_VERSION}GRAPHS_VERSION} PYQTNETWORKAUTH_VERSION= ${PYQT${_PYQT_VERSION}NETWORKAUTH_VERSION} PYQTWEBENGINE_VERSION= ${PYQT${_PYQT_VERSION}WEBENGINE_VERSION} @@ -175,6 +181,7 @@ PYQT_DISTNAME= ${PYQT${_PYQT_VERSION}_DISTNAME} PYQT3D_DISTNAME= ${PYQT${_PYQT_VERSION}3D_DISTNAME} PYQTCHARTS_DISTNAME= ${PYQT${_PYQT_VERSION}CHARTS_DISTNAME} PYQTDATAVIS3D_DISTNAME= ${PYQT${_PYQT_VERSION}DATAVIS3D_DISTNAME} +PYQTGRAPHS_DISTNAME= ${PYQT${_PYQT_VERSION}GRAPHS_DISTNAME} PYQTNETWORKAUTH_DISTNAME= ${PYQT${_PYQT_VERSION}NETWORKAUTH_DISTNAME} PYQTWEBENGINE_DISTNAME= ${PYQT${_PYQT_VERSION}WEBENGINE_DISTNAME} @@ -194,6 +201,7 @@ py-pyqt6_PATH= ${PYQT_PY_RELNAME}-pyqt>=${PYQT_VERSION} py-3d_PATH= ${PYQT_PY_RELNAME}-3d>=${PYQT3D_VERSION} py-charts_PATH= ${PYQT_PY_RELNAME}-charts>=${PYQTCHARTS_VERSION} py-datavis3d_PATH= ${PYQT_PY_RELNAME}-datavis3d>=${PYQTDATAVIS3D_VERSION} +py-graphs_PATH= ${PYQT_PY_RELNAME}-graphs>=${PYQTCHART_VERSION} py-networkauth_PATH= ${PYQT_PY_RELNAME}-networkauth>=${PYQTNETWORKAUTH_VERSION} py-webengine_PATH= ${PYQT_PY_RELNAME}-webengine>=${PYQTWEBENGINE_VERSION} @@ -207,6 +215,7 @@ py-pyqt6_PORT= devel/${PYQT_RELNAME}-pyqt py-3d_PORT= graphics/${PYQT_RELNAME}-3d py-charts_PORT= x11-toolkits/${PYQT_RELNAME}-charts py-datavis3d_PORT= x11-toolkits/${PYQT_RELNAME}-datavis3d +py-graphs_PORT= x11-toolkits/${PYQT_RELNAME}-graphs py-networkauth_PORT= net/${PYQT_RELNAME}-networkauth py-webengine_PORT= www/${PYQT_RELNAME}-webengine diff --git a/Mk/Uses/qt.mk b/Mk/Uses/qt.mk index ef8f11a57041..bc441fe6b651 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.7.3 -PYSIDE6_VERSION?= 6.7.3 +QT6_VERSION?= 6.8.1 +PYSIDE6_VERSION?= 6.8.0.2 # Support for intermediate Qt6 releases. This partially defines # _QT6_MASTER_SITE_SUBDIR and would probably be better in qt-dist.mk, @@ -74,6 +74,7 @@ QT_DESCRIPTIONSDIR_REL?=${QT_DATADIR_REL}/modules QT_LIBEXECDIR_REL?= libexec/${_QT_RELNAME} QT_IMPORTDIR_REL?= ${QT_ARCHDIR_REL}/imports QT_QMLDIR_REL?= ${QT_ARCHDIR_REL}/qml +QT_SBOMDIR_REL?= ${QT_ARCHDIR_REL}/sbom QT_DATADIR_REL?= share/${_QT_RELNAME} QT_DOCDIR_REL?= share/doc/${_QT_RELNAME} QT_L10NDIR_REL?= ${QT_DATADIR_REL}/translations @@ -111,7 +112,7 @@ QMAKESPEC?= ${QT_MKSPECDIR}/${QMAKESPECNAME} QMAKE_COMPILER= $$(ccver="$$(${CXX} --version)"; case "$$ccver" in *clang*) echo clang ;; *) echo g++ ;; esac) . for dir in BIN INC LIB ARCH PLUGIN LIBEXEC IMPORT \ - QML DATA DOC L10N ETC EXAMPLE TEST MKSPEC \ + QML SBOM DATA DOC L10N ETC EXAMPLE TEST MKSPEC \ CMAKE TOOL QT_${dir}DIR= ${PREFIX}/${QT_${dir}DIR_REL} # Export all directories to the plist substituion for QT_DIST ports. @@ -251,7 +252,7 @@ qt-imageformats_PORT= graphics/${_QT_RELNAME}-imageformats qt-imageformats_PATH= ${LOCALBASE}/${QT_PLUGINDIR_REL}/imageformats/libqtiff.so qt-languageserver_PORT= devel/${_QT_RELNAME}-languageserver -qt-languageserver_LIB= libQt${_QT_LIBVER}LanguageServer.so +qt-languageserver_PATH= ${LOCALBASE}/${QT_LIBDIR_REL}/libQt6LanguageServer.a qt-lottie_PORT= graphics/${_QT_RELNAME}-lottie qt-lottie_LIB= libQt${_QT_LIBVER}Bodymovin.so diff --git a/accessibility/qt6-speech/distinfo b/accessibility/qt6-speech/distinfo index 6cb863f7f75b..96d967342d45 100644 --- a/accessibility/qt6-speech/distinfo +++ b/accessibility/qt6-speech/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1727500271 -SHA256 (KDE/Qt/6.7.3/qtspeech-everywhere-src-6.7.3.tar.xz) = f609fbf41b6ef47c371d5388abb27bd00bab049e752fa046fd4b68a82f4a0912 -SIZE (KDE/Qt/6.7.3/qtspeech-everywhere-src-6.7.3.tar.xz) = 262376 +TIMESTAMP = 1733204902 +SHA256 (KDE/Qt/6.8.1/qtspeech-everywhere-src-6.8.1.tar.xz) = b0c5fe36c157b0b0cceb89d0d6325e539652f33963f7424cc70300870ce1acdf +SIZE (KDE/Qt/6.8.1/qtspeech-everywhere-src-6.8.1.tar.xz) = 262512 diff --git a/accessibility/qt6-speech/pkg-plist b/accessibility/qt6-speech/pkg-plist index ba71926b7a34..a2a38d208116 100644 --- a/accessibility/qt6-speech/pkg-plist +++ b/accessibility/qt6-speech/pkg-plist @@ -50,6 +50,7 @@ lib/cmake/Qt6TextToSpeech/Qt6TextToSpeechDependencies.cmake lib/cmake/Qt6TextToSpeech/Qt6TextToSpeechPlugins.cmake lib/cmake/Qt6TextToSpeech/Qt6TextToSpeechTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6TextToSpeech/Qt6TextToSpeechTargets.cmake +lib/cmake/Qt6TextToSpeech/Qt6TextToSpeechVersionlessAliasTargets.cmake lib/cmake/Qt6TextToSpeech/Qt6TextToSpeechVersionlessTargets.cmake %%QT_LIBDIR%%/libQt6TextToSpeech.prl %%QT_LIBDIR%%/libQt6TextToSpeech.so @@ -64,5 +65,6 @@ lib/cmake/Qt6TextToSpeech/Qt6TextToSpeechVersionlessTargets.cmake %%QT_QMLDIR%%/QtTextToSpeech/libtexttospeechqmlplugin.so %%QT_QMLDIR%%/QtTextToSpeech/plugins.qmltypes %%QT_QMLDIR%%/QtTextToSpeech/qmldir +%%QT_SBOMDIR%%/qtspeech-%%FULLVER%%.spdx libdata/pkgconfig/Qt6TextToSpeech.pc %%QT_DATADIR%%/modules/TextToSpeech.json diff --git a/comms/qt6-connectivity/distinfo b/comms/qt6-connectivity/distinfo index e067e77b7cd2..c11de072a84a 100644 --- a/comms/qt6-connectivity/distinfo +++ b/comms/qt6-connectivity/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1727500272 -SHA256 (KDE/Qt/6.7.3/qtconnectivity-everywhere-src-6.7.3.tar.xz) = 80f99b2f097b79107d4b35ed9c5c82451148364ffd814d7ae0aaf206e5b2fcc5 -SIZE (KDE/Qt/6.7.3/qtconnectivity-everywhere-src-6.7.3.tar.xz) = 1062684 +TIMESTAMP = 1733204905 +SHA256 (KDE/Qt/6.8.1/qtconnectivity-everywhere-src-6.8.1.tar.xz) = ccfd46e7ad2290710788274e145fb1f224d8a5ce360764ec10824b5908a6441c +SIZE (KDE/Qt/6.8.1/qtconnectivity-everywhere-src-6.8.1.tar.xz) = 1067952 diff --git a/comms/qt6-connectivity/pkg-plist b/comms/qt6-connectivity/pkg-plist index a89cd779adde..bd5dd2a600cb 100644 --- a/comms/qt6-connectivity/pkg-plist +++ b/comms/qt6-connectivity/pkg-plist @@ -14,7 +14,6 @@ %%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergyserviceprivate_p.h %%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qprivatelinearbuffer_p.h %%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qtbluetooth-config_p.h -%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qtbluetoothexports_p.h %%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qtbluetoothglobal_p.h %%QT_INCDIR%%/QtBluetooth/QBluetoothAddress %%QT_INCDIR%%/QtBluetooth/QBluetoothDeviceDiscoveryAgent @@ -113,6 +112,7 @@ lib/cmake/Qt6Bluetooth/Qt6BluetoothConfigVersionImpl.cmake lib/cmake/Qt6Bluetooth/Qt6BluetoothDependencies.cmake 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/Qt6BuildInternals/StandaloneTests/QtConnectivityTestsConfig.cmake lib/cmake/Qt6Nfc/Qt6NfcAdditionalTargetInfo.cmake @@ -122,6 +122,7 @@ lib/cmake/Qt6Nfc/Qt6NfcConfigVersionImpl.cmake lib/cmake/Qt6Nfc/Qt6NfcDependencies.cmake lib/cmake/Qt6Nfc/Qt6NfcTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6Nfc/Qt6NfcTargets.cmake +lib/cmake/Qt6Nfc/Qt6NfcVersionlessAliasTargets.cmake lib/cmake/Qt6Nfc/Qt6NfcVersionlessTargets.cmake %%QT_LIBDIR%%/libQt6Bluetooth.prl %%QT_LIBDIR%%/libQt6Bluetooth.so @@ -137,6 +138,7 @@ lib/cmake/Qt6Nfc/Qt6NfcVersionlessTargets.cmake %%QT_MKSPECDIR%%/modules/qt_lib_bluetooth_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 diff --git a/comms/qt6-sensors/distinfo b/comms/qt6-sensors/distinfo index 376c1cf3f66b..dfc574909369 100644 --- a/comms/qt6-sensors/distinfo +++ b/comms/qt6-sensors/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1727500273 -SHA256 (KDE/Qt/6.7.3/qtsensors-everywhere-src-6.7.3.tar.xz) = c03a8d5da362ed5f3f185902def04a7c2b69be3f8a283b1389eb6c49a5f3c8fc -SIZE (KDE/Qt/6.7.3/qtsensors-everywhere-src-6.7.3.tar.xz) = 1497316 +TIMESTAMP = 1733204908 +SHA256 (KDE/Qt/6.8.1/qtsensors-everywhere-src-6.8.1.tar.xz) = 41f49b614850d40c647b80e70ef6be759e8fc90ac6cce3ab6f82a357201d9750 +SIZE (KDE/Qt/6.8.1/qtsensors-everywhere-src-6.8.1.tar.xz) = 1498024 diff --git a/comms/qt6-sensors/pkg-plist b/comms/qt6-sensors/pkg-plist index af1fc404005e..b48fd5a657f4 100644 --- a/comms/qt6-sensors/pkg-plist +++ b/comms/qt6-sensors/pkg-plist @@ -120,7 +120,6 @@ %%QT_INCDIR%%/QtSensorsQuick/%%FULLVER%%/QtSensorsQuick/private/qmltapsensor_p.h %%QT_INCDIR%%/QtSensorsQuick/%%FULLVER%%/QtSensorsQuick/private/qmltiltsensor_p.h %%QT_INCDIR%%/QtSensorsQuick/%%FULLVER%%/QtSensorsQuick/private/qsensorsquickglobal_p.h -%%QT_INCDIR%%/QtSensorsQuick/%%FULLVER%%/QtSensorsQuick/private/qtsensorsquickexports_p.h %%QT_INCDIR%%/QtSensorsQuick/QtSensorsQuick %%QT_INCDIR%%/QtSensorsQuick/QtSensorsQuickDepends %%QT_INCDIR%%/QtSensorsQuick/QtSensorsQuickVersion @@ -142,6 +141,7 @@ lib/cmake/Qt6Sensors/Qt6SensorsDependencies.cmake lib/cmake/Qt6Sensors/Qt6SensorsPlugins.cmake lib/cmake/Qt6Sensors/Qt6SensorsTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6Sensors/Qt6SensorsTargets.cmake +lib/cmake/Qt6Sensors/Qt6SensorsVersionlessAliasTargets.cmake lib/cmake/Qt6Sensors/Qt6SensorsVersionlessTargets.cmake lib/cmake/Qt6Sensors/Qt6genericSensorPluginAdditionalTargetInfo.cmake lib/cmake/Qt6Sensors/Qt6genericSensorPluginConfig.cmake @@ -156,6 +156,7 @@ lib/cmake/Qt6SensorsQuick/Qt6SensorsQuickConfigVersionImpl.cmake lib/cmake/Qt6SensorsQuick/Qt6SensorsQuickDependencies.cmake lib/cmake/Qt6SensorsQuick/Qt6SensorsQuickTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6SensorsQuick/Qt6SensorsQuickTargets.cmake +lib/cmake/Qt6SensorsQuick/Qt6SensorsQuickVersionlessAliasTargets.cmake lib/cmake/Qt6SensorsQuick/Qt6SensorsQuickVersionlessTargets.cmake %%QT_LIBDIR%%/libQt6Sensors.prl %%QT_LIBDIR%%/libQt6Sensors.so @@ -175,6 +176,7 @@ lib/cmake/Qt6SensorsQuick/Qt6SensorsQuickVersionlessTargets.cmake %%QT_QMLDIR%%/QtSensors/libsensorsquickplugin.so %%QT_QMLDIR%%/QtSensors/plugins.qmltypes %%QT_QMLDIR%%/QtSensors/qmldir +%%QT_SBOMDIR%%/qtsensors-%%FULLVER%%.spdx libdata/pkgconfig/Qt6Sensors.pc libdata/pkgconfig/Qt6SensorsQuick.pc %%QT_DATADIR%%/modules/Sensors.json diff --git a/comms/qt6-serialbus/distinfo b/comms/qt6-serialbus/distinfo index ca7372efc618..4fbb74b45533 100644 --- a/comms/qt6-serialbus/distinfo +++ b/comms/qt6-serialbus/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1727500274 -SHA256 (KDE/Qt/6.7.3/qtserialbus-everywhere-src-6.7.3.tar.xz) = 55d82e9c7a827808b7383f0a57ad12c2a6fcf5b6c936b27e633155163c0a6276 -SIZE (KDE/Qt/6.7.3/qtserialbus-everywhere-src-6.7.3.tar.xz) = 547720 +TIMESTAMP = 1733204910 +SHA256 (KDE/Qt/6.8.1/qtserialbus-everywhere-src-6.8.1.tar.xz) = 40788d92ec5c3ae297818e9f9eea9d21e398a54fa3fd8ddd530d324548ed15da +SIZE (KDE/Qt/6.8.1/qtserialbus-everywhere-src-6.8.1.tar.xz) = 548316 diff --git a/comms/qt6-serialbus/pkg-plist b/comms/qt6-serialbus/pkg-plist index 87bc33d83aa9..3e25770c0e29 100644 --- a/comms/qt6-serialbus/pkg-plist +++ b/comms/qt6-serialbus/pkg-plist @@ -16,7 +16,6 @@ %%QT_INCDIR%%/QtSerialBus/%%FULLVER%%/QtSerialBus/private/qmodbustcpclient_p.h %%QT_INCDIR%%/QtSerialBus/%%FULLVER%%/QtSerialBus/private/qmodbustcpserver_p.h %%QT_INCDIR%%/QtSerialBus/%%FULLVER%%/QtSerialBus/private/qtserialbus-config_p.h -%%QT_INCDIR%%/QtSerialBus/%%FULLVER%%/QtSerialBus/private/qtserialbusexports_p.h %%QT_INCDIR%%/QtSerialBus/QCanBus %%QT_INCDIR%%/QtSerialBus/QCanBusDevice %%QT_INCDIR%%/QtSerialBus/QCanBusDeviceInfo @@ -95,6 +94,7 @@ lib/cmake/Qt6SerialBus/Qt6SerialBusDependencies.cmake lib/cmake/Qt6SerialBus/Qt6SerialBusPlugins.cmake lib/cmake/Qt6SerialBus/Qt6SerialBusTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6SerialBus/Qt6SerialBusTargets.cmake +lib/cmake/Qt6SerialBus/Qt6SerialBusVersionlessAliasTargets.cmake lib/cmake/Qt6SerialBus/Qt6SerialBusVersionlessTargets.cmake lib/cmake/Qt6SerialBus/Qt6TinyCanBusPluginAdditionalTargetInfo.cmake lib/cmake/Qt6SerialBus/Qt6TinyCanBusPluginConfig.cmake @@ -120,5 +120,6 @@ lib/cmake/Qt6SerialBus/Qt6VirtualCanBusPluginTargets.cmake %%QT_PLUGINDIR%%/canbus/libqtpeakcanbus.so %%QT_PLUGINDIR%%/canbus/libqttinycanbus.so %%QT_PLUGINDIR%%/canbus/libqtvirtualcanbus.so +%%QT_SBOMDIR%%/qtserialbus-%%FULLVER%%.spdx libdata/pkgconfig/Qt6SerialBus.pc %%QT_DATADIR%%/modules/SerialBus.json diff --git a/comms/qt6-serialport/distinfo b/comms/qt6-serialport/distinfo index a09c4f387d46..55faaef31cfb 100644 --- a/comms/qt6-serialport/distinfo +++ b/comms/qt6-serialport/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1727500275 -SHA256 (KDE/Qt/6.7.3/qtserialport-everywhere-src-6.7.3.tar.xz) = d4fa58ee809b39c9eda8d20ee4677971e918edb9a076540466693bc46db146f0 -SIZE (KDE/Qt/6.7.3/qtserialport-everywhere-src-6.7.3.tar.xz) = 271372 +TIMESTAMP = 1733204912 +SHA256 (KDE/Qt/6.8.1/qtserialport-everywhere-src-6.8.1.tar.xz) = 098e72a5c06d7db003e3eea1b0ed72d7308e3ea9cb9e89b538816dc96c938395 +SIZE (KDE/Qt/6.8.1/qtserialport-everywhere-src-6.8.1.tar.xz) = 273504 diff --git a/comms/qt6-serialport/pkg-plist b/comms/qt6-serialport/pkg-plist index 74e640167a68..dccd385cbb17 100644 --- a/comms/qt6-serialport/pkg-plist +++ b/comms/qt6-serialport/pkg-plist @@ -20,6 +20,7 @@ lib/cmake/Qt6SerialPort/Qt6SerialPortConfigVersionImpl.cmake lib/cmake/Qt6SerialPort/Qt6SerialPortDependencies.cmake lib/cmake/Qt6SerialPort/Qt6SerialPortTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6SerialPort/Qt6SerialPortTargets.cmake +lib/cmake/Qt6SerialPort/Qt6SerialPortVersionlessAliasTargets.cmake lib/cmake/Qt6SerialPort/Qt6SerialPortVersionlessTargets.cmake %%QT_LIBDIR%%/libQt6SerialPort.prl %%QT_LIBDIR%%/libQt6SerialPort.so @@ -28,5 +29,6 @@ lib/cmake/Qt6SerialPort/Qt6SerialPortVersionlessTargets.cmake %%QT_LIBDIR%%/metatypes/qt6serialport_%%CMAKE_BUILD_TYPE%%_metatypes.json %%QT_MKSPECDIR%%/modules/qt_lib_serialport.pri %%QT_MKSPECDIR%%/modules/qt_lib_serialport_private.pri +%%QT_SBOMDIR%%/qtserialport-%%FULLVER%%.spdx libdata/pkgconfig/Qt6SerialPort.pc %%QT_DATADIR%%/modules/SerialPort.json diff --git a/databases/qt6-base_sqldriver/Makefile b/databases/qt6-base_sqldriver/Makefile index b7f4abfe8308..cf9304b0d0a1 100644 --- a/databases/qt6-base_sqldriver/Makefile +++ b/databases/qt6-base_sqldriver/Makefile @@ -21,7 +21,8 @@ USE_QT= base CMAKE_ARGS= -DCMAKE_PROJECT_NAME=Qt6${FLAVOR} CMAKE_ON= FEATURE_sql_${FLAVOR} ${${FLAVOR}_CMAKE_ON} CMAKE_OFF= ${FLAVORS:N${FLAVOR}:S/^/FEATURE_sql_/} \ - FEATURE_sql_ibase + FEATURE_sql_ibase \ + QT_GENERATE_SBOM mysql_USES= mysql odbc_LIB_DEPENDS= libodbc.so:databases/unixODBC diff --git a/databases/qt6-base_sqldriver/distinfo b/databases/qt6-base_sqldriver/distinfo index 02d1fca5373f..12061b287ac6 100644 --- a/databases/qt6-base_sqldriver/distinfo +++ b/databases/qt6-base_sqldriver/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1727500277 -SHA256 (KDE/Qt/6.7.3/qtbase-everywhere-src-6.7.3.tar.xz) = 8ccbb9ab055205ac76632c9eeddd1ed6fc66936fc56afc2ed0fd5d9e23da3097 -SIZE (KDE/Qt/6.7.3/qtbase-everywhere-src-6.7.3.tar.xz) = 49426156 +TIMESTAMP = 1733204932 +SHA256 (KDE/Qt/6.8.1/qtbase-everywhere-src-6.8.1.tar.xz) = 40b14562ef3bd779bc0e0418ea2ae08fa28235f8ea6e8c0cb3bce1d6ad58dcaf +SIZE (KDE/Qt/6.8.1/qtbase-everywhere-src-6.8.1.tar.xz) = 48220752 diff --git a/devel/py-qt5-sip/distinfo b/devel/py-qt5-sip/distinfo index 6d329e843fcf..6dab4849f628 100644 --- a/devel/py-qt5-sip/distinfo +++ b/devel/py-qt5-sip/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1729208010 -SHA256 (PyQt5_sip-12.15.0.tar.gz) = d23fdfcf363b5cedd9d39f8a9c5710e7d52804f5b08a58e91c638b36eafcb702 -SIZE (PyQt5_sip-12.15.0.tar.gz) = 104024 +TIMESTAMP = 1734040730 +SHA256 (pyqt5_sip-12.16.1.tar.gz) = 8c831f8b619811a32369d72339faa50ae53a963f5fdfa4d71f845c63e9673125 +SIZE (pyqt5_sip-12.16.1.tar.gz) = 103975 diff --git a/devel/py-qt5-sip/files/patch-pyproject.toml b/devel/py-qt5-sip/files/patch-pyproject.toml new file mode 100644 index 000000000000..e72a7c13302f --- /dev/null +++ b/devel/py-qt5-sip/files/patch-pyproject.toml @@ -0,0 +1,11 @@ +Reduce setuptools requirement until [1] is resolved. Seems to work fine +with 63.x. + +[1] https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=270358 + +--- pyproject.toml.orig 2024-12-12 10:01:35 UTC ++++ pyproject.toml +@@ -1,2 +1,2 @@ + [build-system] +-requires = ["setuptools >=69.5"] ++requires = ["setuptools >=63"] diff --git a/devel/py-qt5-sip/files/patch-siplib.c b/devel/py-qt5-sip/files/patch-siplib.c index ba4f09878a2d..7728d0fddd2f 100644 --- a/devel/py-qt5-sip/files/patch-siplib.c +++ b/devel/py-qt5-sip/files/patch-siplib.c @@ -1,6 +1,6 @@ ---- siplib.c.orig 2022-02-01 13:29:23 UTC +--- siplib.c.orig 2024-12-12 10:01:35 UTC +++ siplib.c -@@ -20,6 +20,12 @@ +@@ -12,6 +12,12 @@ #include #include #include diff --git a/devel/py-qt6-pyqt/distinfo b/devel/py-qt6-pyqt/distinfo index 302c3c02add5..cfe39113ff75 100644 --- a/devel/py-qt6-pyqt/distinfo +++ b/devel/py-qt6-pyqt/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1729210525 -SHA256 (PyQt6-6.7.1.tar.gz) = 3672a82ccd3a62e99ab200a13903421e2928e399fda25ced98d140313ad59cb9 -SIZE (PyQt6-6.7.1.tar.gz) = 1051212 +TIMESTAMP = 1733628605 +SHA256 (PyQt6-6.8.0.tar.gz) = 6d8628de4c2a050f0b74462e4c9cb97f839bf6ffabbca91711722ffb281570d9 +SIZE (PyQt6-6.8.0.tar.gz) = 1061357 diff --git a/devel/py-qt6-pyqt/pkg-plist b/devel/py-qt6-pyqt/pkg-plist index 741bedcd9a28..e51a14d4b7f9 100644 --- a/devel/py-qt6-pyqt/pkg-plist +++ b/devel/py-qt6-pyqt/pkg-plist @@ -300,6 +300,7 @@ bin/pyuic6 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtGui/qpainter.sip %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtGui/qpainterpath.sip %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtGui/qpalette.sip +%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtGui/qpdfoutputintent.sip %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtGui/qpdfwriter.sip %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtGui/qpen.sip %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtGui/qpicture.sip @@ -309,6 +310,7 @@ bin/pyuic6 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtGui/qpointingdevice.sip %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtGui/qpolygon.sip %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtGui/qpygui_qlist.sip +%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtGui/qpygui_vulkan.sip %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtGui/qquaternion.sip %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtGui/qrasterwindow.sip %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtGui/qrawfont.sip @@ -345,6 +347,7 @@ bin/pyuic6 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtHelp/QtHelp.toml %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtHelp/QtHelpmod.sip %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtHelp/qcompressedhelpinfo.sip +%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtHelp/qhelpcontentitem.sip %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtHelp/qhelpcontentwidget.sip %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtHelp/qhelpengine.sip %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtHelp/qhelpenginecore.sip @@ -354,12 +357,16 @@ bin/pyuic6 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtHelp/qhelpindexwidget.sip %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtHelp/qhelplink.sip %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtHelp/qhelpsearchengine.sip +%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtHelp/qhelpsearchenginecore.sip %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtHelp/qhelpsearchquerywidget.sip +%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtHelp/qhelpsearchresult.sip %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtHelp/qhelpsearchresultwidget.sip %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtMultimedia/QtMultimedia.toml %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtMultimedia/QtMultimediamod.sip %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtMultimedia/qaudio.sip %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtMultimedia/qaudiobuffer.sip +%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtMultimedia/qaudiobufferinput.sip +%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtMultimedia/qaudiobufferoutput.sip %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtMultimedia/qaudiodecoder.sip %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtMultimedia/qaudiodevice.sip %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtMultimedia/qaudioformat.sip @@ -384,6 +391,7 @@ bin/pyuic6 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtMultimedia/qtvideo.sip %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtMultimedia/qvideoframe.sip %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtMultimedia/qvideoframeformat.sip +%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtMultimedia/qvideoframeinput.sip %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtMultimedia/qvideosink.sip %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtMultimedia/qwindowcapture.sip %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtMultimediaWidgets/QtMultimediaWidgets.toml @@ -396,6 +404,7 @@ bin/pyuic6 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtNetwork/qabstractsocket.sip %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtNetwork/qauthenticator.sip %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtNetwork/qdnslookup.sip +%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtNetwork/qformdatabuilder.sip %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtNetwork/qhostaddress.sip %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtNetwork/qhostinfo.sip %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtNetwork/qhstspolicy.sip @@ -415,11 +424,14 @@ bin/pyuic6 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtNetwork/qnetworkproxy.sip %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtNetwork/qnetworkreply.sip %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtNetwork/qnetworkrequest.sip +%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtNetwork/qnetworkrequestfactory.sip %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtNetwork/qocspresponse.sip %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtNetwork/qpassworddigestor.sip %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtNetwork/qpynetwork_qhash.sip %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtNetwork/qpynetwork_qlist.sip %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtNetwork/qpynetwork_qmap.sip +%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtNetwork/qrestaccessmanager.sip +%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtNetwork/qrestreply.sip %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtNetwork/qssl.sip %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtNetwork/qsslcertificate.sip %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtNetwork/qsslcertificateextension.sip diff --git a/devel/py-qt6-sip/distinfo b/devel/py-qt6-sip/distinfo index 1e6d16ef8a0f..6657c829fff4 100644 --- a/devel/py-qt6-sip/distinfo +++ b/devel/py-qt6-sip/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1729208051 -SHA256 (PyQt6_sip-13.8.0.tar.gz) = 2f74cf3d6d9cab5152bd9f49d570b2dfb87553ebb5c4919abfde27f5b9fd69d4 -SIZE (PyQt6_sip-13.8.0.tar.gz) = 92264 +TIMESTAMP = 1734040710 +SHA256 (pyqt6_sip-13.9.1.tar.gz) = 15be741d1ae8c82bb7afe9a61f3cf8c50457f7d61229a1c39c24cd6e8f4d86dc +SIZE (pyqt6_sip-13.9.1.tar.gz) = 92358 diff --git a/devel/py-qt6-sip/files/patch-pyproject.toml b/devel/py-qt6-sip/files/patch-pyproject.toml new file mode 100644 index 000000000000..69837c67f5e6 --- /dev/null +++ b/devel/py-qt6-sip/files/patch-pyproject.toml @@ -0,0 +1,11 @@ +Reduce setuptools requirement until [1] is resolved. Seems to work fine +with 63.x. + +[1] https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=270358 + +--- pyproject.toml.orig 2024-12-12 10:04:05 UTC ++++ pyproject.toml +@@ -1,2 +1,2 @@ + [build-system] +-requires = ["setuptools >=69.5"] ++requires = ["setuptools >=63"] diff --git a/devel/py-qt6-sip/files/patch-sip__core.c b/devel/py-qt6-sip/files/patch-sip__core.c index 828da34f5c32..71642deb0bf6 100644 --- a/devel/py-qt6-sip/files/patch-sip__core.c +++ b/devel/py-qt6-sip/files/patch-sip__core.c @@ -1,6 +1,6 @@ ---- sip_core.c.orig 2022-06-17 14:27:21 UTC +--- sip_core.c.orig 2024-12-12 10:04:05 UTC +++ sip_core.c -@@ -20,6 +20,12 @@ +@@ -11,6 +11,12 @@ #define PY_SSIZE_T_CLEAN #include #include diff --git a/devel/py-qt6/Makefile b/devel/py-qt6/Makefile index 5f468cd282c4..2bf2a31c1a43 100644 --- a/devel/py-qt6/Makefile +++ b/devel/py-qt6/Makefile @@ -1,6 +1,5 @@ PORTNAME= qt6 PORTVERSION= ${PYQT_VERSION} -PORTREVISION= 1 CATEGORIES= devel python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-qtbuilder/distinfo b/devel/py-qtbuilder/distinfo index ca8cc7b31d22..f4e91d3d442e 100644 --- a/devel/py-qtbuilder/distinfo +++ b/devel/py-qtbuilder/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1729155151 -SHA256 (pyqt_builder-1.16.4.tar.gz) = 4515e41ae379be2e54f88a89ecf47cd6e4cac43e862c4abfde18389c2666afdf -SIZE (pyqt_builder-1.16.4.tar.gz) = 3672095 +TIMESTAMP = 1733628553 +SHA256 (pyqt_builder-1.17.0.tar.gz) = fce0e92346d2a4296525b7ad9f02b74ea425f26210390ae0d3e4ca08c31cf4cc +SIZE (pyqt_builder-1.17.0.tar.gz) = 3671922 diff --git a/devel/py-sip/distinfo b/devel/py-sip/distinfo index 4736fccef7a5..4733db7418be 100644 --- a/devel/py-sip/distinfo +++ b/devel/py-sip/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1729152451 -SHA256 (sip-6.8.6.tar.gz) = 7fc959e48e6ec5d5af8bd026f69f5e24d08b3cb8abb342176f5ab8030cc07d7a -SIZE (sip-6.8.6.tar.gz) = 420778 +TIMESTAMP = 1734038155 +SHA256 (sip-6.9.1.tar.gz) = 7904be5190d7879952563b78a3af0e58fa27d9525af7f53f93eac7a83b433e7b +SIZE (sip-6.9.1.tar.gz) = 422504 diff --git a/devel/pyside6-tools/Makefile b/devel/pyside6-tools/Makefile index e6acf9df55e7..6d2e86f490a6 100644 --- a/devel/pyside6-tools/Makefile +++ b/devel/pyside6-tools/Makefile @@ -4,7 +4,8 @@ CATEGORIES= devel MASTER_SITES= QT/official_releases/QtForPython/shiboken6/PySide6-${DISTVERSION}-src PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} PKGNAMESUFFIX= -tools -DISTNAME= pyside-setup-everywhere-src-${DISTVERSION} +DISTNAME= pyside-setup-everywhere-src-${DISTVERSION:R} +DIST_SUBDIR= KDE/Qt/${PYSIDE6_VERSION} MAINTAINER= kde@FreeBSD.org COMMENT= PySide6 development tools @@ -18,16 +19,18 @@ LIB_DEPENDS= libshiboken6.abi${PYTHON_MAJOR_VER}.so:devel/shiboken6@${PY_FLAVOR} libxkbcommon.so:x11/libxkbcommon \ libzstd.so:archivers/zstd -USES= cmake gl llvm:lib,noexport python qt:6 shebangfix tar:xz +USES= cmake gl llvm:lib,min=17,noexport python qt:6 shebangfix tar:xz USE_GL= opengl USE_PYTHON= flavors USE_QT= base declarative languageserver quick3d shadertools tools -SHEBANG_FILES= pyside_tool.py qtpy2cpp_lib/tests/baseline/basic_test.py +SHEBANG_FILES= pyside_tool.py \ + qtpy2cpp_lib/tests/baseline/basic_test.py -PLIST_SUB= PYSIDE_BINDIR_REL=${PYSIDE_BINDIR_REL} WRKSRC_SUBDIR= sources/pyside-tools +PLIST_SUB= PYSIDE_BINDIR_REL=${PYSIDE_BINDIR_REL} + PYSIDE_RELNAME= ${PORTNAME} PYSIDE_BINDIR_REL?= bin/${PYSIDE_RELNAME} diff --git a/devel/pyside6-tools/distinfo b/devel/pyside6-tools/distinfo index 4ca0529ade23..6ec86726653b 100644 --- a/devel/pyside6-tools/distinfo +++ b/devel/pyside6-tools/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1727499901 -SHA256 (pyside-setup-everywhere-src-6.7.3.tar.xz) = a4c414be013d5051a2d10a9a1151e686488a3172c08a57461ea04b0a0ab74e09 -SIZE (pyside-setup-everywhere-src-6.7.3.tar.xz) = 14591496 +TIMESTAMP = 1730090384 +SHA256 (KDE/Qt/6.8.0.2/pyside-setup-everywhere-src-6.8.0.tar.xz) = 1a1a219a8f327e340d258275fad3a9f261b8f04bc57041747e73dd6ad252b4e1 +SIZE (KDE/Qt/6.8.0.2/pyside-setup-everywhere-src-6.8.0.tar.xz) = 14646216 diff --git a/devel/pyside6-tools/pkg-plist b/devel/pyside6-tools/pkg-plist index 7c4547659f22..c540202d2f97 100644 --- a/devel/pyside6-tools/pkg-plist +++ b/devel/pyside6-tools/pkg-plist @@ -14,6 +14,8 @@ %%PYSIDE_BINDIR_REL%%/deploy_lib/__pycache__/dependency_util%%PYTHON_EXT_SUFFIX%%.pyc %%PYSIDE_BINDIR_REL%%/deploy_lib/__pycache__/deploy_util%%PYTHON_EXT_SUFFIX%%.opt-1.pyc %%PYSIDE_BINDIR_REL%%/deploy_lib/__pycache__/deploy_util%%PYTHON_EXT_SUFFIX%%.pyc +%%PYSIDE_BINDIR_REL%%/deploy_lib/__pycache__/design_studio%%PYTHON_EXT_SUFFIX%%.opt-1.pyc +%%PYSIDE_BINDIR_REL%%/deploy_lib/__pycache__/design_studio%%PYTHON_EXT_SUFFIX%%.pyc %%PYSIDE_BINDIR_REL%%/deploy_lib/__pycache__/nuitka_helper%%PYTHON_EXT_SUFFIX%%.opt-1.pyc %%PYSIDE_BINDIR_REL%%/deploy_lib/__pycache__/nuitka_helper%%PYTHON_EXT_SUFFIX%%.pyc %%PYSIDE_BINDIR_REL%%/deploy_lib/__pycache__/python_helper%%PYTHON_EXT_SUFFIX%%.opt-1.pyc @@ -37,6 +39,7 @@ %%PYSIDE_BINDIR_REL%%/deploy_lib/default.spec %%PYSIDE_BINDIR_REL%%/deploy_lib/dependency_util.py %%PYSIDE_BINDIR_REL%%/deploy_lib/deploy_util.py +%%PYSIDE_BINDIR_REL%%/deploy_lib/design_studio.py %%PYSIDE_BINDIR_REL%%/deploy_lib/nuitka_helper.py %%PYSIDE_BINDIR_REL%%/deploy_lib/pyside_icon.icns %%PYSIDE_BINDIR_REL%%/deploy_lib/pyside_icon.ico @@ -97,4 +100,5 @@ %%PYSIDE_BINDIR_REL%%/qtpy2cpp_lib/visitor.py %%PYSIDE_BINDIR_REL%%/rcc %%PYSIDE_BINDIR_REL%%/requirements-android.txt +%%PYSIDE_BINDIR_REL%%/svgtoqml %%PYSIDE_BINDIR_REL%%/uic diff --git a/devel/pyside6/Makefile b/devel/pyside6/Makefile index de3d0b1c68c5..836f59d5e108 100644 --- a/devel/pyside6/Makefile +++ b/devel/pyside6/Makefile @@ -3,7 +3,8 @@ DISTVERSION= ${PYSIDE6_VERSION} CATEGORIES= devel MASTER_SITES= QT/official_releases/QtForPython/shiboken6/PySide6-${DISTVERSION}-src PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -DISTNAME= pyside-setup-everywhere-src-${DISTVERSION} +DISTNAME= pyside-setup-everywhere-src-${DISTVERSION:R} +DIST_SUBDIR= KDE/Qt/${PYSIDE6_VERSION} MAINTAINER= kde@FreeBSD.org COMMENT= Python Qt bindings for Qt 6 @@ -15,7 +16,7 @@ BUILD_DEPENDS= ${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers LIB_DEPENDS= libshiboken6.abi${PYTHON_MAJOR_VER}.so:devel/shiboken6@${PY_FLAVOR} \ libxkbcommon.so:x11/libxkbcommon -USES= cmake gl llvm:lib,noexport python qt:6 tar:xz +USES= cmake gl llvm:lib,min=17,noexport python qt:6 tar:xz USE_GL= opengl USE_LDCONFIG= yes USE_PYTHON= flavors @@ -29,18 +30,23 @@ CONFIGURE_ENV= LLVM_INSTALL_DIR="${LLVM_PREFIX}/lib/cmake/llvm" PATCH_WRKSRC= ${WRKSRC:H:H} WRKSRC_SUBDIR= sources/pyside6 -PLIST_SUB= DISTVERSION=${DISTVERSION} +PLIST_SUB= PYTHON_MAJOR_VER=${PYTHON_MAJOR_VER} \ + SHLIB_VER=${DISTVERSION:R:R} \ + SHLIB_VERSION=${DISTVERSION} .include .if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH} == i386 -PLIST_SUB+= WEBENGINE="" -USE_QT+= webengine +PLIST_SUB+= WEBENGINE="" \ + WEBVIEW="" +USE_QT+= webengine webview .else CMAKE_ON+= CMAKE_DISABLE_FIND_PACKAGE_Qt6WebEngineCore \ CMAKE_DISABLE_FIND_PACKAGE_Qt6WebEngineQuick \ - CMAKE_DISABLE_FIND_PACKAGE_Qt6WebEngineWidgets -PLIST_SUB+= WEBENGINE="@comment " + CMAKE_DISABLE_FIND_PACKAGE_Qt6WebEngineWidgets \ + CMAKE_DISABLE_FIND_PACKAGE_Qt6WebView +PLIST_SUB+= WEBENGINE="@comment " \ + WEBVIEW="@comment " .endif post-install: diff --git a/devel/pyside6/distinfo b/devel/pyside6/distinfo index 4b9537dfc498..b59e0648b868 100644 --- a/devel/pyside6/distinfo +++ b/devel/pyside6/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1727499890 -SHA256 (pyside-setup-everywhere-src-6.7.3.tar.xz) = a4c414be013d5051a2d10a9a1151e686488a3172c08a57461ea04b0a0ab74e09 -SIZE (pyside-setup-everywhere-src-6.7.3.tar.xz) = 14591496 +TIMESTAMP = 1730090226 +SHA256 (KDE/Qt/6.8.0.2/pyside-setup-everywhere-src-6.8.0.tar.xz) = 1a1a219a8f327e340d258275fad3a9f261b8f04bc57041747e73dd6ad252b4e1 +SIZE (KDE/Qt/6.8.0.2/pyside-setup-everywhere-src-6.8.0.tar.xz) = 14646216 diff --git a/devel/pyside6/files/patch-sources_pyside6_cmake_Macros_PySideModules.cmake b/devel/pyside6/files/patch-sources_pyside6_cmake_Macros_PySideModules.cmake index ae379547d829..036b0a6eb34a 100644 --- a/devel/pyside6/files/patch-sources_pyside6_cmake_Macros_PySideModules.cmake +++ b/devel/pyside6/files/patch-sources_pyside6_cmake_Macros_PySideModules.cmake @@ -1,6 +1,6 @@ ---- sources/pyside6/cmake/Macros/PySideModules.cmake.orig 2023-11-27 12:04:49 UTC +--- sources/pyside6/cmake/Macros/PySideModules.cmake.orig 2024-10-09 13:33:59 UTC +++ sources/pyside6/cmake/Macros/PySideModules.cmake -@@ -107,7 +107,7 @@ macro(create_pyside_module) +@@ -122,7 +122,7 @@ macro(create_pyside_module) get_target_property(qt_core_includes Qt${QT_MAJOR_VERSION}::Core INTERFACE_INCLUDE_DIRECTORIES) set(shiboken_include_dir_list ${pyside6_SOURCE_DIR} ${qt_platform_includes} diff --git a/devel/pyside6/files/patch-sources_pyside6_cmake_PySideHelpers.cmake b/devel/pyside6/files/patch-sources_pyside6_cmake_PySideHelpers.cmake new file mode 100644 index 000000000000..547a9eaf5d7b --- /dev/null +++ b/devel/pyside6/files/patch-sources_pyside6_cmake_PySideHelpers.cmake @@ -0,0 +1,13 @@ +Find required packages before testing whether they are FOUND. + +--- sources/pyside6/cmake/PySideHelpers.cmake.orig 2024-10-09 13:33:59 UTC ++++ sources/pyside6/cmake/PySideHelpers.cmake +@@ -132,6 +132,8 @@ macro(collect_optional_modules) + list(APPEND ALL_OPTIONAL_MODULES WebChannel WebEngineCore WebEngineWidgets + WebEngineQuick WebSockets HttpServer) + # for Windows and Linux, QtWebView depends on QtWebEngine to render content ++ find_package(Qt${QT_MAJOR_VERSION}WebEngineCore) ++ find_package(Qt${QT_MAJOR_VERSION}WebEngineQuick) + if ((WIN32 OR UNIX) AND NOT APPLE AND Qt${QT_MAJOR_VERSION}WebEngineCore_FOUND AND + Qt${QT_MAJOR_VERSION}WebEngineQuick_FOUND) + list(APPEND ALL_OPTIONAL_MODULES WebView) diff --git a/devel/pyside6/pkg-plist b/devel/pyside6/pkg-plist index 7cd3b16bd011..b3ae9504c185 100644 --- a/devel/pyside6/pkg-plist +++ b/devel/pyside6/pkg-plist @@ -18,6 +18,7 @@ include/PySide6/QtDesigner/pyside6_qtdesigner_python.h include/PySide6/QtDesigner/qpydesignerextensions.h include/PySide6/QtGraphs/pyside6_qtgraphs_python.h include/PySide6/QtGraphs/qtgraphs_helper.h +include/PySide6/QtGraphsWidgets/pyside6_qtgraphswidgets_python.h include/PySide6/QtGui/pyside6_qtgui_python.h include/PySide6/QtGui/qpytextobject.h include/PySide6/QtGui/qtguihelper.h @@ -59,12 +60,13 @@ include/PySide6/QtWebChannel/pyside6_qtwebchannel_python.h %%WEBENGINE%%include/PySide6/QtWebEngineQuick/pyside6_qtwebenginequick_python.h %%WEBENGINE%%include/PySide6/QtWebEngineWidgets/pyside6_qtwebenginewidgets_python.h include/PySide6/QtWebSockets/pyside6_qtwebsockets_python.h +%%WEBVIEW%%include/PySide6/QtWebView/pyside6_qtwebview_python.h include/PySide6/QtWidgets/pyside6_qtwidgets_python.h include/PySide6/QtXml/pyside6_qtxml_python.h include/PySide6/class_property.h include/PySide6/dynamicqmetaobject.h +include/PySide6/dynamicslot_p.h include/PySide6/feature_select.h -include/PySide6/globalreceiverv2.h include/PySide6/pyside.h include/PySide6/pyside6_global.h include/PySide6/pyside_numpy.h @@ -108,33 +110,33 @@ include/PySide6/pysideutils.h include/PySide6/pysideweakref.h include/PySide6/qobjectconnect.h include/PySide6/signalmanager.h -lib/cmake/PySide6/PySide6Config.abi3.cmake +lib/cmake/PySide6/PySide6Config.abi%%PYTHON_MAJOR_VER%%.cmake lib/cmake/PySide6/PySide6Config.cmake lib/cmake/PySide6/PySide6ConfigVersion.cmake lib/cmake/PySide6/PySide6Targets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/PySide6/PySide6Targets.cmake -lib/cmake/PySide6Qml/PySide6QmlConfig.abi3.cmake +lib/cmake/PySide6Qml/PySide6QmlConfig.abi%%PYTHON_MAJOR_VER%%.cmake lib/cmake/PySide6Qml/PySide6QmlConfig.cmake lib/cmake/PySide6Qml/PySide6QmlConfigVersion.cmake lib/cmake/PySide6Qml/PySide6QmlTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/PySide6Qml/PySide6QmlTargets.cmake -lib/libpyside6.abi3.so -lib/libpyside6.abi3.so.6.7 -lib/libpyside6.abi3.so.%%DISTVERSION%% -lib/libpyside6qml.abi3.so -lib/libpyside6qml.abi3.so.6.7 -lib/libpyside6qml.abi3.so.%%DISTVERSION%% -%%PYTHON_SITELIBDIR%%/PySide6/Qt3DAnimation.abi3.so +lib/libpyside6.abi%%PYTHON_MAJOR_VER%%.so +lib/libpyside6.abi%%PYTHON_MAJOR_VER%%.so.%%SHLIB_VER%% +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%% +%%PYTHON_SITELIBDIR%%/PySide6/Qt3DAnimation.abi%%PYTHON_MAJOR_VER%%.so %%PYTHON_SITELIBDIR%%/PySide6/Qt3DAnimation.pyi -%%PYTHON_SITELIBDIR%%/PySide6/Qt3DCore.abi3.so +%%PYTHON_SITELIBDIR%%/PySide6/Qt3DCore.abi%%PYTHON_MAJOR_VER%%.so %%PYTHON_SITELIBDIR%%/PySide6/Qt3DCore.pyi -%%PYTHON_SITELIBDIR%%/PySide6/Qt3DExtras.abi3.so +%%PYTHON_SITELIBDIR%%/PySide6/Qt3DExtras.abi%%PYTHON_MAJOR_VER%%.so %%PYTHON_SITELIBDIR%%/PySide6/Qt3DExtras.pyi -%%PYTHON_SITELIBDIR%%/PySide6/Qt3DInput.abi3.so +%%PYTHON_SITELIBDIR%%/PySide6/Qt3DInput.abi%%PYTHON_MAJOR_VER%%.so %%PYTHON_SITELIBDIR%%/PySide6/Qt3DInput.pyi -%%PYTHON_SITELIBDIR%%/PySide6/Qt3DLogic.abi3.so +%%PYTHON_SITELIBDIR%%/PySide6/Qt3DLogic.abi%%PYTHON_MAJOR_VER%%.so %%PYTHON_SITELIBDIR%%/PySide6/Qt3DLogic.pyi -%%PYTHON_SITELIBDIR%%/PySide6/Qt3DRender.abi3.so +%%PYTHON_SITELIBDIR%%/PySide6/Qt3DRender.abi%%PYTHON_MAJOR_VER%%.so %%PYTHON_SITELIBDIR%%/PySide6/Qt3DRender.pyi %%PYTHON_SITELIBDIR%%/PySide6/QtAsyncio/__init__.py %%PYTHON_SITELIBDIR%%/PySide6/QtAsyncio/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc @@ -148,104 +150,108 @@ lib/libpyside6qml.abi3.so.%%DISTVERSION%% %%PYTHON_SITELIBDIR%%/PySide6/QtAsyncio/events.py %%PYTHON_SITELIBDIR%%/PySide6/QtAsyncio/futures.py %%PYTHON_SITELIBDIR%%/PySide6/QtAsyncio/tasks.py -%%PYTHON_SITELIBDIR%%/PySide6/QtBluetooth.abi3.so +%%PYTHON_SITELIBDIR%%/PySide6/QtBluetooth.abi%%PYTHON_MAJOR_VER%%.so %%PYTHON_SITELIBDIR%%/PySide6/QtBluetooth.pyi -%%PYTHON_SITELIBDIR%%/PySide6/QtCharts.abi3.so +%%PYTHON_SITELIBDIR%%/PySide6/QtCharts.abi%%PYTHON_MAJOR_VER%%.so %%PYTHON_SITELIBDIR%%/PySide6/QtCharts.pyi -%%PYTHON_SITELIBDIR%%/PySide6/QtConcurrent.abi3.so +%%PYTHON_SITELIBDIR%%/PySide6/QtConcurrent.abi%%PYTHON_MAJOR_VER%%.so %%PYTHON_SITELIBDIR%%/PySide6/QtConcurrent.pyi -%%PYTHON_SITELIBDIR%%/PySide6/QtCore.abi3.so +%%PYTHON_SITELIBDIR%%/PySide6/QtCore.abi%%PYTHON_MAJOR_VER%%.so %%PYTHON_SITELIBDIR%%/PySide6/QtCore.pyi -%%PYTHON_SITELIBDIR%%/PySide6/QtDBus.abi3.so +%%PYTHON_SITELIBDIR%%/PySide6/QtDBus.abi%%PYTHON_MAJOR_VER%%.so %%PYTHON_SITELIBDIR%%/PySide6/QtDBus.pyi -%%PYTHON_SITELIBDIR%%/PySide6/QtDataVisualization.abi3.so +%%PYTHON_SITELIBDIR%%/PySide6/QtDataVisualization.abi%%PYTHON_MAJOR_VER%%.so %%PYTHON_SITELIBDIR%%/PySide6/QtDataVisualization.pyi -%%PYTHON_SITELIBDIR%%/PySide6/QtDesigner.abi3.so +%%PYTHON_SITELIBDIR%%/PySide6/QtDesigner.abi%%PYTHON_MAJOR_VER%%.so %%PYTHON_SITELIBDIR%%/PySide6/QtDesigner.pyi -%%PYTHON_SITELIBDIR%%/PySide6/QtExampleIcons.abi3.so -%%PYTHON_SITELIBDIR%%/PySide6/QtGraphs.abi3.so +%%PYTHON_SITELIBDIR%%/PySide6/QtExampleIcons.abi%%PYTHON_MAJOR_VER%%.so +%%PYTHON_SITELIBDIR%%/PySide6/QtGraphs.abi%%PYTHON_MAJOR_VER%%.so %%PYTHON_SITELIBDIR%%/PySide6/QtGraphs.pyi -%%PYTHON_SITELIBDIR%%/PySide6/QtGui.abi3.so +%%PYTHON_SITELIBDIR%%/PySide6/QtGraphsWidgets.abi%%PYTHON_MAJOR_VER%%.so +%%PYTHON_SITELIBDIR%%/PySide6/QtGraphsWidgets.pyi +%%PYTHON_SITELIBDIR%%/PySide6/QtGui.abi%%PYTHON_MAJOR_VER%%.so %%PYTHON_SITELIBDIR%%/PySide6/QtGui.pyi -%%PYTHON_SITELIBDIR%%/PySide6/QtHelp.abi3.so +%%PYTHON_SITELIBDIR%%/PySide6/QtHelp.abi%%PYTHON_MAJOR_VER%%.so %%PYTHON_SITELIBDIR%%/PySide6/QtHelp.pyi -%%PYTHON_SITELIBDIR%%/PySide6/QtHttpServer.abi3.so +%%PYTHON_SITELIBDIR%%/PySide6/QtHttpServer.abi%%PYTHON_MAJOR_VER%%.so %%PYTHON_SITELIBDIR%%/PySide6/QtHttpServer.pyi -%%PYTHON_SITELIBDIR%%/PySide6/QtLocation.abi3.so +%%PYTHON_SITELIBDIR%%/PySide6/QtLocation.abi%%PYTHON_MAJOR_VER%%.so %%PYTHON_SITELIBDIR%%/PySide6/QtLocation.pyi -%%PYTHON_SITELIBDIR%%/PySide6/QtMultimedia.abi3.so +%%PYTHON_SITELIBDIR%%/PySide6/QtMultimedia.abi%%PYTHON_MAJOR_VER%%.so %%PYTHON_SITELIBDIR%%/PySide6/QtMultimedia.pyi -%%PYTHON_SITELIBDIR%%/PySide6/QtMultimediaWidgets.abi3.so +%%PYTHON_SITELIBDIR%%/PySide6/QtMultimediaWidgets.abi%%PYTHON_MAJOR_VER%%.so %%PYTHON_SITELIBDIR%%/PySide6/QtMultimediaWidgets.pyi -%%PYTHON_SITELIBDIR%%/PySide6/QtNetwork.abi3.so +%%PYTHON_SITELIBDIR%%/PySide6/QtNetwork.abi%%PYTHON_MAJOR_VER%%.so %%PYTHON_SITELIBDIR%%/PySide6/QtNetwork.pyi -%%PYTHON_SITELIBDIR%%/PySide6/QtNetworkAuth.abi3.so +%%PYTHON_SITELIBDIR%%/PySide6/QtNetworkAuth.abi%%PYTHON_MAJOR_VER%%.so %%PYTHON_SITELIBDIR%%/PySide6/QtNetworkAuth.pyi -%%PYTHON_SITELIBDIR%%/PySide6/QtNfc.abi3.so +%%PYTHON_SITELIBDIR%%/PySide6/QtNfc.abi%%PYTHON_MAJOR_VER%%.so %%PYTHON_SITELIBDIR%%/PySide6/QtNfc.pyi -%%PYTHON_SITELIBDIR%%/PySide6/QtOpenGL.abi3.so +%%PYTHON_SITELIBDIR%%/PySide6/QtOpenGL.abi%%PYTHON_MAJOR_VER%%.so %%PYTHON_SITELIBDIR%%/PySide6/QtOpenGL.pyi -%%PYTHON_SITELIBDIR%%/PySide6/QtOpenGLWidgets.abi3.so +%%PYTHON_SITELIBDIR%%/PySide6/QtOpenGLWidgets.abi%%PYTHON_MAJOR_VER%%.so %%PYTHON_SITELIBDIR%%/PySide6/QtOpenGLWidgets.pyi -%%PYTHON_SITELIBDIR%%/PySide6/QtPdf.abi3.so +%%PYTHON_SITELIBDIR%%/PySide6/QtPdf.abi%%PYTHON_MAJOR_VER%%.so %%PYTHON_SITELIBDIR%%/PySide6/QtPdf.pyi -%%PYTHON_SITELIBDIR%%/PySide6/QtPdfWidgets.abi3.so +%%PYTHON_SITELIBDIR%%/PySide6/QtPdfWidgets.abi%%PYTHON_MAJOR_VER%%.so %%PYTHON_SITELIBDIR%%/PySide6/QtPdfWidgets.pyi -%%PYTHON_SITELIBDIR%%/PySide6/QtPositioning.abi3.so +%%PYTHON_SITELIBDIR%%/PySide6/QtPositioning.abi%%PYTHON_MAJOR_VER%%.so %%PYTHON_SITELIBDIR%%/PySide6/QtPositioning.pyi -%%PYTHON_SITELIBDIR%%/PySide6/QtPrintSupport.abi3.so +%%PYTHON_SITELIBDIR%%/PySide6/QtPrintSupport.abi%%PYTHON_MAJOR_VER%%.so %%PYTHON_SITELIBDIR%%/PySide6/QtPrintSupport.pyi -%%PYTHON_SITELIBDIR%%/PySide6/QtQml.abi3.so +%%PYTHON_SITELIBDIR%%/PySide6/QtQml.abi%%PYTHON_MAJOR_VER%%.so %%PYTHON_SITELIBDIR%%/PySide6/QtQml.pyi -%%PYTHON_SITELIBDIR%%/PySide6/QtQuick.abi3.so +%%PYTHON_SITELIBDIR%%/PySide6/QtQuick.abi%%PYTHON_MAJOR_VER%%.so %%PYTHON_SITELIBDIR%%/PySide6/QtQuick.pyi -%%PYTHON_SITELIBDIR%%/PySide6/QtQuick3D.abi3.so +%%PYTHON_SITELIBDIR%%/PySide6/QtQuick3D.abi%%PYTHON_MAJOR_VER%%.so %%PYTHON_SITELIBDIR%%/PySide6/QtQuick3D.pyi -%%PYTHON_SITELIBDIR%%/PySide6/QtQuickControls2.abi3.so +%%PYTHON_SITELIBDIR%%/PySide6/QtQuickControls2.abi%%PYTHON_MAJOR_VER%%.so %%PYTHON_SITELIBDIR%%/PySide6/QtQuickControls2.pyi -%%PYTHON_SITELIBDIR%%/PySide6/QtQuickTest.abi3.so +%%PYTHON_SITELIBDIR%%/PySide6/QtQuickTest.abi%%PYTHON_MAJOR_VER%%.so %%PYTHON_SITELIBDIR%%/PySide6/QtQuickTest.pyi -%%PYTHON_SITELIBDIR%%/PySide6/QtQuickWidgets.abi3.so +%%PYTHON_SITELIBDIR%%/PySide6/QtQuickWidgets.abi%%PYTHON_MAJOR_VER%%.so %%PYTHON_SITELIBDIR%%/PySide6/QtQuickWidgets.pyi -%%PYTHON_SITELIBDIR%%/PySide6/QtRemoteObjects.abi3.so +%%PYTHON_SITELIBDIR%%/PySide6/QtRemoteObjects.abi%%PYTHON_MAJOR_VER%%.so %%PYTHON_SITELIBDIR%%/PySide6/QtRemoteObjects.pyi -%%PYTHON_SITELIBDIR%%/PySide6/QtScxml.abi3.so +%%PYTHON_SITELIBDIR%%/PySide6/QtScxml.abi%%PYTHON_MAJOR_VER%%.so %%PYTHON_SITELIBDIR%%/PySide6/QtScxml.pyi -%%PYTHON_SITELIBDIR%%/PySide6/QtSensors.abi3.so +%%PYTHON_SITELIBDIR%%/PySide6/QtSensors.abi%%PYTHON_MAJOR_VER%%.so %%PYTHON_SITELIBDIR%%/PySide6/QtSensors.pyi -%%PYTHON_SITELIBDIR%%/PySide6/QtSerialBus.abi3.so +%%PYTHON_SITELIBDIR%%/PySide6/QtSerialBus.abi%%PYTHON_MAJOR_VER%%.so %%PYTHON_SITELIBDIR%%/PySide6/QtSerialBus.pyi -%%PYTHON_SITELIBDIR%%/PySide6/QtSerialPort.abi3.so +%%PYTHON_SITELIBDIR%%/PySide6/QtSerialPort.abi%%PYTHON_MAJOR_VER%%.so %%PYTHON_SITELIBDIR%%/PySide6/QtSerialPort.pyi -%%PYTHON_SITELIBDIR%%/PySide6/QtSpatialAudio.abi3.so +%%PYTHON_SITELIBDIR%%/PySide6/QtSpatialAudio.abi%%PYTHON_MAJOR_VER%%.so %%PYTHON_SITELIBDIR%%/PySide6/QtSpatialAudio.pyi -%%PYTHON_SITELIBDIR%%/PySide6/QtSql.abi3.so +%%PYTHON_SITELIBDIR%%/PySide6/QtSql.abi%%PYTHON_MAJOR_VER%%.so %%PYTHON_SITELIBDIR%%/PySide6/QtSql.pyi -%%PYTHON_SITELIBDIR%%/PySide6/QtStateMachine.abi3.so +%%PYTHON_SITELIBDIR%%/PySide6/QtStateMachine.abi%%PYTHON_MAJOR_VER%%.so %%PYTHON_SITELIBDIR%%/PySide6/QtStateMachine.pyi -%%PYTHON_SITELIBDIR%%/PySide6/QtSvg.abi3.so +%%PYTHON_SITELIBDIR%%/PySide6/QtSvg.abi%%PYTHON_MAJOR_VER%%.so %%PYTHON_SITELIBDIR%%/PySide6/QtSvg.pyi -%%PYTHON_SITELIBDIR%%/PySide6/QtSvgWidgets.abi3.so +%%PYTHON_SITELIBDIR%%/PySide6/QtSvgWidgets.abi%%PYTHON_MAJOR_VER%%.so %%PYTHON_SITELIBDIR%%/PySide6/QtSvgWidgets.pyi -%%PYTHON_SITELIBDIR%%/PySide6/QtTest.abi3.so +%%PYTHON_SITELIBDIR%%/PySide6/QtTest.abi%%PYTHON_MAJOR_VER%%.so %%PYTHON_SITELIBDIR%%/PySide6/QtTest.pyi -%%PYTHON_SITELIBDIR%%/PySide6/QtTextToSpeech.abi3.so +%%PYTHON_SITELIBDIR%%/PySide6/QtTextToSpeech.abi%%PYTHON_MAJOR_VER%%.so %%PYTHON_SITELIBDIR%%/PySide6/QtTextToSpeech.pyi -%%PYTHON_SITELIBDIR%%/PySide6/QtUiTools.abi3.so +%%PYTHON_SITELIBDIR%%/PySide6/QtUiTools.abi%%PYTHON_MAJOR_VER%%.so %%PYTHON_SITELIBDIR%%/PySide6/QtUiTools.pyi -%%PYTHON_SITELIBDIR%%/PySide6/QtWebChannel.abi3.so +%%PYTHON_SITELIBDIR%%/PySide6/QtWebChannel.abi%%PYTHON_MAJOR_VER%%.so %%PYTHON_SITELIBDIR%%/PySide6/QtWebChannel.pyi -%%WEBENGINE%%%%PYTHON_SITELIBDIR%%/PySide6/QtWebEngineCore.abi3.so +%%WEBENGINE%%%%PYTHON_SITELIBDIR%%/PySide6/QtWebEngineCore.abi%%PYTHON_MAJOR_VER%%.so %%WEBENGINE%%%%PYTHON_SITELIBDIR%%/PySide6/QtWebEngineCore.pyi -%%WEBENGINE%%%%PYTHON_SITELIBDIR%%/PySide6/QtWebEngineQuick.abi3.so +%%WEBENGINE%%%%PYTHON_SITELIBDIR%%/PySide6/QtWebEngineQuick.abi%%PYTHON_MAJOR_VER%%.so %%WEBENGINE%%%%PYTHON_SITELIBDIR%%/PySide6/QtWebEngineQuick.pyi -%%WEBENGINE%%%%PYTHON_SITELIBDIR%%/PySide6/QtWebEngineWidgets.abi3.so +%%WEBENGINE%%%%PYTHON_SITELIBDIR%%/PySide6/QtWebEngineWidgets.abi%%PYTHON_MAJOR_VER%%.so %%WEBENGINE%%%%PYTHON_SITELIBDIR%%/PySide6/QtWebEngineWidgets.pyi -%%PYTHON_SITELIBDIR%%/PySide6/QtWebSockets.abi3.so +%%PYTHON_SITELIBDIR%%/PySide6/QtWebSockets.abi%%PYTHON_MAJOR_VER%%.so %%PYTHON_SITELIBDIR%%/PySide6/QtWebSockets.pyi -%%PYTHON_SITELIBDIR%%/PySide6/QtWidgets.abi3.so +%%WEBVIEW%%%%PYTHON_SITELIBDIR%%/PySide6/QtWebView.abi%%PYTHON_MAJOR_VER%%.so +%%WEBVIEW%%%%PYTHON_SITELIBDIR%%/PySide6/QtWebView.pyi +%%PYTHON_SITELIBDIR%%/PySide6/QtWidgets.abi%%PYTHON_MAJOR_VER%%.so %%PYTHON_SITELIBDIR%%/PySide6/QtWidgets.pyi -%%PYTHON_SITELIBDIR%%/PySide6/QtXml.abi3.so +%%PYTHON_SITELIBDIR%%/PySide6/QtXml.abi%%PYTHON_MAJOR_VER%%.so %%PYTHON_SITELIBDIR%%/PySide6/QtXml.pyi %%PYTHON_SITELIBDIR%%/PySide6/__init__.py %%PYTHON_SITELIBDIR%%/PySide6/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc @@ -288,7 +294,6 @@ share/PySide6/glue/qtstatemachine.cpp share/PySide6/glue/qttest.cpp share/PySide6/glue/qtuitools.cpp %%WEBENGINE%%share/PySide6/glue/qtwebenginecore.cpp -%%WEBENGINE%%share/PySide6/glue/qtwebenginewidgets.cpp share/PySide6/glue/qtwidgets.cpp share/PySide6/glue/qtxml.cpp share/PySide6/typesystems/common.xml @@ -319,6 +324,7 @@ share/PySide6/typesystems/typesystem_glgeti_v_modifications.xml share/PySide6/typesystems/typesystem_glgetv_includes.xml share/PySide6/typesystems/typesystem_glgetv_modifications.xml share/PySide6/typesystems/typesystem_graphs.xml +share/PySide6/typesystems/typesystem_graphswidgets.xml share/PySide6/typesystems/typesystem_gui.xml share/PySide6/typesystems/typesystem_gui_common.xml share/PySide6/typesystems/typesystem_gui_mac.xml @@ -386,6 +392,7 @@ share/PySide6/typesystems/typesystem_webchannel.xml %%WEBENGINE%%share/PySide6/typesystems/typesystem_webenginequick.xml %%WEBENGINE%%share/PySide6/typesystems/typesystem_webenginewidgets.xml share/PySide6/typesystems/typesystem_websockets.xml +%%WEBVIEW%%share/PySide6/typesystems/typesystem_webview.xml share/PySide6/typesystems/typesystem_widgets.xml share/PySide6/typesystems/typesystem_widgets_common.xml share/PySide6/typesystems/typesystem_xml.xml diff --git a/devel/qt6-5compat/distinfo b/devel/qt6-5compat/distinfo index 7ed013bb048e..72d615e6597b 100644 --- a/devel/qt6-5compat/distinfo +++ b/devel/qt6-5compat/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1727500278 -SHA256 (KDE/Qt/6.7.3/qt5compat-everywhere-src-6.7.3.tar.xz) = 8b6a68a3dfaa7e9d10a0dafccee594c72e8de061bc573ae86b1c081b423a53f0 -SIZE (KDE/Qt/6.7.3/qt5compat-everywhere-src-6.7.3.tar.xz) = 14631404 +TIMESTAMP = 1733204939 +SHA256 (KDE/Qt/6.8.1/qt5compat-everywhere-src-6.8.1.tar.xz) = 05c8c088b4cd8331fa8a9c8b7ff7c42a088cb112e673eae5708048d0131264fc +SIZE (KDE/Qt/6.8.1/qt5compat-everywhere-src-6.8.1.tar.xz) = 14632944 diff --git a/devel/qt6-5compat/pkg-plist b/devel/qt6-5compat/pkg-plist index fc17ea8b4ded..5e786214d546 100644 --- a/devel/qt6-5compat/pkg-plist +++ b/devel/qt6-5compat/pkg-plist @@ -13,7 +13,6 @@ %%QT_INCDIR%%/QtCore5Compat/%%FULLVER%%/QtCore5Compat/private/qutfcodec_p.h %%QT_INCDIR%%/QtCore5Compat/%%FULLVER%%/QtCore5Compat/private/qxml_p.h %%QT_INCDIR%%/QtCore5Compat/QBinaryJson -%%QT_INCDIR%%/QtCore5Compat/QConcatenable %%QT_INCDIR%%/QtCore5Compat/QLinkedList %%QT_INCDIR%%/QtCore5Compat/QLinkedListData %%QT_INCDIR%%/QtCore5Compat/QLinkedListIterator @@ -59,6 +58,7 @@ lib/cmake/Qt6Core5Compat/Qt6Core5CompatConfigVersionImpl.cmake lib/cmake/Qt6Core5Compat/Qt6Core5CompatDependencies.cmake 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/Qt6Qml/QmlPlugins/Qt6qtgraphicaleffectspluginAdditionalTargetInfo.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6qtgraphicaleffectspluginConfig.cmake @@ -117,5 +117,6 @@ lib/cmake/Qt6Qml/QmlPlugins/Qt6qtgraphicaleffectsprivateTargets.cmake %%QT_QMLDIR%%/Qt5Compat/GraphicalEffects/private/plugins.qmltypes %%QT_QMLDIR%%/Qt5Compat/GraphicalEffects/private/qmldir %%QT_QMLDIR%%/Qt5Compat/GraphicalEffects/qmldir +%%QT_SBOMDIR%%/qt5compat-%%FULLVER%%.spdx libdata/pkgconfig/Qt6Core5Compat.pc %%QT_DATADIR%%/modules/Core5Compat.json diff --git a/devel/qt6-base/Makefile b/devel/qt6-base/Makefile index e4ebeebc9040..833fc8789529 100644 --- a/devel/qt6-base/Makefile +++ b/devel/qt6-base/Makefile @@ -1,11 +1,10 @@ PORTNAME= base DISTVERSION= ${QT6_VERSION} -PORTREVISION= 2 CATEGORIES= devel PKGNAMEPREFIX= qt6- PATCH_SITES= https://github.com/qt/qtbase/commit/ -PATCHFILES+= 5875da6d70303468eab85030a80f54c268f80b79.patch:-p1 # PR282335 +PATCHFILES+= df30953228f0e364e9a3915d97f522efd8e67489.patch:-p1 # Fix configure of sqldrivers MAINTAINER= kde@FreeBSD.org COMMENT= Qt base (core, gui, widgets, network,...) @@ -13,8 +12,7 @@ COMMENT= Qt base (core, gui, widgets, network,...) BUILD_DEPENDS= xml:textproc/xmlstarlet \ ${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers \ ${LOCALBASE}/include/linux/input.h:devel/evdev-proto -LIB_DEPENDS= \ - libatk-1.0.so:accessibility/at-spi2-core \ +LIB_DEPENDS= libatk-1.0.so:accessibility/at-spi2-core \ libatk-bridge-2.0.so:accessibility/at-spi2-core \ libatspi.so:accessibility/at-spi2-core \ libbrotlidec.so:archivers/brotli \ @@ -43,7 +41,16 @@ USES= cmake compiler:c++17-lang gl gnome jpeg perl5 pkgconfig python \ qt-dist:6 shebangfix ssl USE_GL= egl opengl USE_GNOME= cairo gdkpixbuf2 glib20 gtk30 pango +USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} USE_LOCALE= C.UTF-8 + +SHEBANG_FILES= ${WRKSRC}/libexec/qt-android-runner.py \ + ${WRKSRC}/mkspecs/features/uikit/device_destinations.sh \ + ${WRKSRC}/mkspecs/features/uikit/devices.py \ + ${WRKSRC}/mkspecs/features/data/mac/objc_namespace.sh \ + ${WRKSRC}/util/testrunner/qt-testrunner.py \ + ${WRKSRC}/util/testrunner/sanitizer-testrunner.py + CMAKE_ARGS= -DOPENSSL_ROOT_DIR="${OPENSSLBASE}" CMAKE_ON= CMAKE_DISABLE_FIND_PACKAGE_LTTngUST \ QT_AVOID_CMAKE_ARCHIVING_API \ @@ -51,19 +58,12 @@ CMAKE_ON= CMAKE_DISABLE_FIND_PACKAGE_LTTngUST \ QT_FEATURE_openssl_linked CMAKE_OFF= QT_FEATURE_eglfs \ QT_FEATURE_gssapi -# sql drivers are handled in the qt6-base-sqldriver port +# sql drivers are handled in the databases/qt6-base_sqldriver port CMAKE_OFF+= FEATURE_sql_mysql \ FEATURE_sql_odbc \ FEATURE_sql_psql \ FEATURE_sql_sqlite -SHEBANG_FILES= ${WRKSRC}/mkspecs/features/uikit/device_destinations.sh \ - ${WRKSRC}/mkspecs/features/uikit/devices.py \ - ${WRKSRC}/mkspecs/features/data/mac/objc_namespace.sh \ - ${WRKSRC}/util/testrunner/qt-testrunner.py \ - ${WRKSRC}/util/testrunner/sanitizer-testrunner.py -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} - # zstd from base fails to compress files during the build (error 11: unsupported argument) BINARY_ALIAS= zstd=${LOCALBASE}/bin/zstd @@ -72,16 +72,17 @@ OPTIONS_DEFAULT= CUPS X11 OPTIONS_SUB= yes CUPS_LIB_DEPENDS= libcups.so:print/cups -CUPS_CMAKE_OFF= -DFEATURE_cups=OFF +CUPS_CMAKE_BOOL= FEATURE_cups -X11_USES= xorg -X11_USE= XORG=ice,pixman,sm,x11,xau,xcb,xcomposite,xcursor,xdamage,xdmcp,xext,xfixes,xi,xinerama,xrandr,xrender -X11_CMAKE_BOOL= FEATURE_xcb FEATURE_xlib X11_LIB_DEPENDS= libxcb-cursor.so:x11/xcb-util-cursor \ libxcb-icccm.so:x11/xcb-util-wm \ libxcb-image.so:x11/xcb-util-image \ libxcb-keysyms.so:x11/xcb-util-keysyms \ libxcb-render-util.so:x11/xcb-util-renderutil +X11_USES= xorg +X11_USE= XORG=ice,pixman,sm,x11,xau,xcb,xcomposite,xcursor,xdamage,xdmcp,xext,xfixes,xi,xinerama,xrandr,xrender +X11_CMAKE_BOOL= FEATURE_xcb \ + FEATURE_xlib .include diff --git a/devel/qt6-base/distinfo b/devel/qt6-base/distinfo index d1611125fac6..e757274a7679 100644 --- a/devel/qt6-base/distinfo +++ b/devel/qt6-base/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1732082826 -SHA256 (KDE/Qt/6.7.3/qtbase-everywhere-src-6.7.3.tar.xz) = 8ccbb9ab055205ac76632c9eeddd1ed6fc66936fc56afc2ed0fd5d9e23da3097 -SIZE (KDE/Qt/6.7.3/qtbase-everywhere-src-6.7.3.tar.xz) = 49426156 -SHA256 (KDE/Qt/6.7.3/5875da6d70303468eab85030a80f54c268f80b79.patch) = 245db6c2856d5db56c4778539182b35dd090f0662e2d31315668ada1efabb8c1 -SIZE (KDE/Qt/6.7.3/5875da6d70303468eab85030a80f54c268f80b79.patch) = 6727 +TIMESTAMP = 1733288022 +SHA256 (KDE/Qt/6.8.1/qtbase-everywhere-src-6.8.1.tar.xz) = 40b14562ef3bd779bc0e0418ea2ae08fa28235f8ea6e8c0cb3bce1d6ad58dcaf +SIZE (KDE/Qt/6.8.1/qtbase-everywhere-src-6.8.1.tar.xz) = 48220752 +SHA256 (KDE/Qt/6.8.1/df30953228f0e364e9a3915d97f522efd8e67489.patch) = 5ecd419eb22eaeaef9e099df6bfedfac10209e7189a942fabc2f60e376e9b3f8 +SIZE (KDE/Qt/6.8.1/df30953228f0e364e9a3915d97f522efd8e67489.patch) = 3466 diff --git a/devel/qt6-base/files/patch-cmake_QtBuildPathsHelpers.cmake b/devel/qt6-base/files/patch-cmake_QtBuildPathsHelpers.cmake index d1c33877dc66..5413c6a9fa95 100644 --- a/devel/qt6-base/files/patch-cmake_QtBuildPathsHelpers.cmake +++ b/devel/qt6-base/files/patch-cmake_QtBuildPathsHelpers.cmake @@ -1,6 +1,6 @@ ---- cmake/QtBuildPathsHelpers.cmake.orig 2023-09-15 10:20:51 UTC +--- cmake/QtBuildPathsHelpers.cmake.orig 2024-08-08 08:58:52 UTC +++ cmake/QtBuildPathsHelpers.cmake -@@ -100,7 +100,7 @@ function(qt_internal_setup_build_and_install_paths) +@@ -101,7 +101,7 @@ function(qt_internal_setup_build_and_install_paths) if(QT_CONFIG_INSTALL_DIR) string(APPEND QT_CONFIG_INSTALL_DIR "/") endif() diff --git a/devel/qt6-base/files/patch-cmake_QtFlagHandlingHelpers.cmake b/devel/qt6-base/files/patch-cmake_QtFlagHandlingHelpers.cmake index 39f338bc0a6a..561cc85a2ecd 100644 --- a/devel/qt6-base/files/patch-cmake_QtFlagHandlingHelpers.cmake +++ b/devel/qt6-base/files/patch-cmake_QtFlagHandlingHelpers.cmake @@ -1,6 +1,6 @@ ---- cmake/QtFlagHandlingHelpers.cmake.orig 2023-09-15 10:20:51 UTC +--- cmake/QtFlagHandlingHelpers.cmake.orig 2024-09-18 16:48:24 UTC +++ cmake/QtFlagHandlingHelpers.cmake -@@ -167,6 +167,10 @@ function(qt_internal_add_link_flags_no_undefined targe +@@ -177,6 +177,10 @@ function(qt_internal_add_link_flags_no_undefined targe set(no_undefined_flag "-Wl,--no-undefined") endif() diff --git a/devel/qt6-base/files/patch-src_corelib_CMakeLists.txt b/devel/qt6-base/files/patch-src_corelib_CMakeLists.txt index e574c4c77272..c6642e2251f3 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-05-06 23:06:44 UTC +--- src/corelib/CMakeLists.txt.orig 2024-09-18 16:48:24 UTC +++ src/corelib/CMakeLists.txt -@@ -381,6 +381,10 @@ endif() +@@ -393,6 +393,10 @@ endif() target_link_libraries(Platform INTERFACE Threads::Threads) endif() diff --git a/devel/qt6-base/files/patch-src_corelib_global_qcompare.h b/devel/qt6-base/files/patch-src_corelib_global_qcompare.h index dca740aacab1..c6aa355fe312 100644 --- a/devel/qt6-base/files/patch-src_corelib_global_qcompare.h +++ b/devel/qt6-base/files/patch-src_corelib_global_qcompare.h @@ -1,9 +1,9 @@ Also disable spurious zero as null pointer constant warnings for Clang which are errors in www/dooble due to -Werror being passed. ---- src/corelib/global/qcompare.h.orig 2024-01-22 10:20:09 UTC +--- src/corelib/global/qcompare.h.orig 2024-08-08 08:58:52 UTC +++ src/corelib/global/qcompare.h -@@ -195,6 +195,7 @@ class partial_ordering (private) +@@ -222,6 +222,7 @@ class partial_ordering (private) QT_WARNING_PUSH // https://gcc.gnu.org/bugzilla/show_bug.cgi?id=100903 @@ -11,7 +11,7 @@ are errors in www/dooble due to -Werror being passed. QT_WARNING_DISABLE_GCC("-Wzero-as-null-pointer-constant") friend constexpr bool is_eq (partial_ordering o) noexcept { return o == 0; } friend constexpr bool is_neq (partial_ordering o) noexcept { return o != 0; } -@@ -380,6 +381,7 @@ class weak_ordering (private) +@@ -407,6 +408,7 @@ class weak_ordering (private) QT_WARNING_PUSH // https://gcc.gnu.org/bugzilla/show_bug.cgi?id=100903 @@ -19,7 +19,7 @@ are errors in www/dooble due to -Werror being passed. QT_WARNING_DISABLE_GCC("-Wzero-as-null-pointer-constant") friend constexpr bool is_eq (weak_ordering o) noexcept { return o == 0; } friend constexpr bool is_neq (weak_ordering o) noexcept { return o != 0; } -@@ -575,6 +577,7 @@ class strong_ordering (public) +@@ -602,6 +604,7 @@ class strong_ordering (public) QT_WARNING_PUSH // https://gcc.gnu.org/bugzilla/show_bug.cgi?id=100903 @@ -27,7 +27,7 @@ are errors in www/dooble due to -Werror being passed. QT_WARNING_DISABLE_GCC("-Wzero-as-null-pointer-constant") friend constexpr bool is_eq (strong_ordering o) noexcept { return o == 0; } friend constexpr bool is_neq (strong_ordering o) noexcept { return o != 0; } -@@ -859,6 +862,7 @@ class QPartialOrdering (private) +@@ -886,6 +889,7 @@ class QPartialOrdering (private) QT_WARNING_PUSH // https://gcc.gnu.org/bugzilla/show_bug.cgi?id=100903 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 420a902bd19c..cad98022de4a 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-09-16 09:24:52 UTC +--- src/corelib/global/qcomparehelpers.h.orig 2024-11-12 10:55:11 UTC +++ src/corelib/global/qcomparehelpers.h -@@ -197,6 +197,7 @@ template constexpr auto to_Qt(In in) noe - { return !comparesEqual(rhs, lhs); } +@@ -242,6 +242,7 @@ template constexpr auto to_Qt(In in) noe - #define QT_DECLARE_ORDERING_HELPER_TEMPLATE(OrderingType, LeftType, RightType, Constexpr) \ + #define QT_DECLARE_ORDERING_HELPER_TEMPLATE(OrderingType, LeftType, RightType, Constexpr, \ + Noexcept, Attributes) \ + QT_WARNING_DISABLE_CLANG("-Wzero-as-null-pointer-constant") \ - friend Constexpr bool operator<(LeftType const &lhs, RightType const &rhs) \ - noexcept(noexcept(compareThreeWay(lhs, rhs))) \ - { return compareThreeWay(lhs, rhs) < 0; } \ -@@ -225,6 +226,7 @@ template constexpr auto to_Qt(In in) noe - + Attributes \ + friend Constexpr bool operator<(LeftType const &lhs, RightType const &rhs) Noexcept \ + { \ +@@ -279,6 +280,7 @@ template constexpr auto to_Qt(In in) noe // Helpers for reversed ordering, using the existing compareThreeWay() function. - #define QT_DECLARE_REVERSED_ORDERING_HELPER_TEMPLATE(OrderingType, LeftType, RightType, Constexpr) \ + #define QT_DECLARE_REVERSED_ORDERING_HELPER_TEMPLATE(OrderingType, LeftType, RightType, Constexpr, \ + Noexcept, Attributes) \ + QT_WARNING_DISABLE_CLANG("-Wzero-as-null-pointer-constant") \ - friend Constexpr bool operator<(RightType const &lhs, LeftType const &rhs) \ - noexcept(noexcept(compareThreeWay(rhs, lhs))) \ - { return compareThreeWay(rhs, lhs) > 0; } \ + Attributes \ + 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 6766a7584185..4f46b58b8203 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-01-22 10:20:09 UTC +--- src/corelib/global/qcompilerdetection.h.orig 2024-08-08 08:58:52 UTC +++ src/corelib/global/qcompilerdetection.h -@@ -964,7 +964,7 @@ +@@ -965,7 +965,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 89de4c983d39..3d9fef9324c9 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,14 +1,13 @@ ---- src/platformsupport/devicediscovery/qdevicediscovery_static.cpp.orig 2022-09-19 10:23:04 UTC +--- src/platformsupport/devicediscovery/qdevicediscovery_static.cpp.orig 2024-09-18 16:48:24 UTC +++ src/platformsupport/devicediscovery/qdevicediscovery_static.cpp -@@ -11,11 +11,7 @@ +@@ -11,9 +11,7 @@ #include #include -#ifdef Q_OS_FREEBSD -#include --#else - #include --#endif - #include - - /* android (and perhaps some other linux-derived stuff) don't define everything +-#elif defined(Q_OS_VXWORKS) ++#if defined(Q_OS_VXWORKS) + #include + #define ABS_X EV_DEV_PTR_ABS_X + #else 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 34a67b2e9629..9758fa6d2577 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,14 +1,13 @@ ---- src/platformsupport/input/evdevkeyboard/qevdevkeyboard_defaultmap_p.h.orig 2022-09-19 10:23:04 UTC +--- src/platformsupport/input/evdevkeyboard/qevdevkeyboard_defaultmap_p.h.orig 2024-09-18 16:48:24 UTC +++ src/platformsupport/input/evdevkeyboard/qevdevkeyboard_defaultmap_p.h -@@ -17,11 +17,7 @@ +@@ -17,9 +17,7 @@ #include "qnamespace.h" #include "private/qglobal_p.h" -#ifdef Q_OS_FREEBSD -#include --#else +-#elif !defined(Q_OS_VXWORKS) ++#if !defined(Q_OS_VXWORKS) #include "linux/input.h" --#endif - - // no QT_BEGIN_NAMESPACE, since we include it internally... + #endif 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 cd2db903643f..f6c12d7e0838 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,14 +1,13 @@ ---- src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp.orig 2023-09-21 19:24:26 UTC +--- src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp.orig 2024-09-18 16:48:24 UTC +++ src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp -@@ -17,11 +17,7 @@ +@@ -17,9 +17,7 @@ #include #include -#ifdef Q_OS_FREEBSD -#include --#else +-#elif defined(Q_OS_VXWORKS) ++#if defined(Q_OS_VXWORKS) + #include + #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 3f40930c477e..eab2816a23c0 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,14 +1,13 @@ ---- src/platformsupport/input/evdevtablet/qevdevtablethandler.cpp.orig 2023-09-21 19:24:26 UTC +--- src/platformsupport/input/evdevtablet/qevdevtablethandler.cpp.orig 2024-09-18 16:48:24 UTC +++ src/platformsupport/input/evdevtablet/qevdevtablethandler.cpp -@@ -10,11 +10,7 @@ +@@ -10,9 +10,7 @@ #include #include #include -#ifdef Q_OS_FREEBSD -#include --#else - #include --#endif - - QT_BEGIN_NAMESPACE - +-#elif defined(Q_OS_VXWORKS) ++#if defined(Q_OS_VXWORKS) + #include + #include + #define SYN_REPORT 0 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 1fae16c7af55..0d76065f028a 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,14 +1,13 @@ ---- src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp.orig 2023-09-15 10:20:51 UTC +--- src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp.orig 2024-09-18 16:48:24 UTC +++ src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp -@@ -19,11 +19,7 @@ +@@ -19,9 +19,7 @@ #include -#ifdef Q_OS_FREEBSD -#include --#else - #include --#endif - - #ifndef input_event_sec - #define input_event_sec time.tv_sec +-#elif defined(Q_OS_VXWORKS) ++#if defined(Q_OS_VXWORKS) + #include + #include + #define SYN_REPORT 0 diff --git a/devel/qt6-base/pkg-plist b/devel/qt6-base/pkg-plist index bdc63f0743be..4359e28733ec 100644 --- a/devel/qt6-base/pkg-plist +++ b/devel/qt6-base/pkg-plist @@ -30,7 +30,6 @@ bin/qmake6 %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qabstractitemmodel_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qabstractproxymodel_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qanimationgroup_p.h -%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qbytearray_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qbytedata_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcalendarbackend_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcalendarmath_p.h @@ -40,7 +39,6 @@ bin/qmake6 %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qconfig_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcore_unix_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcoreapplication_p.h -%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcorecmdlineargs_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcoreevent_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qdatastream_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qdataurl_p.h @@ -48,6 +46,7 @@ bin/qmake6 %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qdatetimeparser_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qdebug_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qdir_p.h +%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qdirentryinfo_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qdoublescanprint_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qduplicatetracker_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qelfparser_p.h @@ -116,6 +115,7 @@ bin/qmake6 %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qmimeprovider_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qmimetype_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qmimetypeparser_p.h +%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qminimalflatset_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qmutex_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qnativeinterface_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qnoncontiguousbytedevice_p.h @@ -146,6 +146,7 @@ bin/qmake6 %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qsimd_p.h %%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 @@ -161,6 +162,7 @@ bin/qmake6 %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qthreadpool_p.h %%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 @@ -171,6 +173,7 @@ bin/qmake6 %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qunicodetables_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qunicodetools_p.h %%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/qvariant_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qvariantanimation_p.h @@ -184,6 +187,7 @@ bin/qmake6 %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qzipwriter_p.h %%QT_INCDIR%%/QtCore/QAbstractAnimation %%QT_INCDIR%%/QtCore/QAbstractEventDispatcher +%%QT_INCDIR%%/QtCore/QAbstractEventDispatcherV2 %%QT_INCDIR%%/QtCore/QAbstractItemModel %%QT_INCDIR%%/QtCore/QAbstractListModel %%QT_INCDIR%%/QtCore/QAbstractNativeEventFilter @@ -192,6 +196,7 @@ bin/qmake6 %%QT_INCDIR%%/QtCore/QAnimationDriver %%QT_INCDIR%%/QtCore/QAnimationGroup %%QT_INCDIR%%/QtCore/QAnyStringView +%%QT_INCDIR%%/QtCore/QApplicationStatic %%QT_INCDIR%%/QtCore/QArgument %%QT_INCDIR%%/QtCore/QArrayData %%QT_INCDIR%%/QtCore/QArrayDataOps @@ -236,6 +241,7 @@ bin/qmake6 %%QT_INCDIR%%/QtCore/QCborValueRef %%QT_INCDIR%%/QtCore/QChar %%QT_INCDIR%%/QtCore/QChildEvent +%%QT_INCDIR%%/QtCore/QChronoTimer %%QT_INCDIR%%/QtCore/QCollator %%QT_INCDIR%%/QtCore/QCollatorSortKey %%QT_INCDIR%%/QtCore/QCommandLineOption @@ -257,6 +263,7 @@ bin/qmake6 %%QT_INCDIR%%/QtCore/QDebugStateSaver %%QT_INCDIR%%/QtCore/QDir %%QT_INCDIR%%/QtCore/QDirIterator +%%QT_INCDIR%%/QtCore/QDirListing %%QT_INCDIR%%/QtCore/QDynamicPropertyChangeEvent %%QT_INCDIR%%/QtCore/QEasingCurve %%QT_INCDIR%%/QtCore/QElapsedTimer @@ -291,6 +298,7 @@ bin/qmake6 %%QT_INCDIR%%/QtCore/QHash %%QT_INCDIR%%/QtCore/QHashDummyValue %%QT_INCDIR%%/QtCore/QHashFunctions +%%QT_INCDIR%%/QtCore/QHashHeterogeneousSearch %%QT_INCDIR%%/QtCore/QHashIterator %%QT_INCDIR%%/QtCore/QHashSeed %%QT_INCDIR%%/QtCore/QIODevice @@ -600,6 +608,7 @@ bin/qmake6 %%QT_INCDIR%%/QtCore/q20vector.h %%QT_INCDIR%%/QtCore/q23functional.h %%QT_INCDIR%%/QtCore/q23utility.h +%%QT_INCDIR%%/QtCore/q26numeric.h %%QT_INCDIR%%/QtCore/qabstractanimation.h %%QT_INCDIR%%/QtCore/qabstracteventdispatcher.h %%QT_INCDIR%%/QtCore/qabstractitemmodel.h @@ -637,6 +646,7 @@ bin/qmake6 %%QT_INCDIR%%/QtCore/qcborstreamwriter.h %%QT_INCDIR%%/QtCore/qcborvalue.h %%QT_INCDIR%%/QtCore/qchar.h +%%QT_INCDIR%%/QtCore/qchronotimer.h %%QT_INCDIR%%/QtCore/qcollator.h %%QT_INCDIR%%/QtCore/qcommandlineoption.h %%QT_INCDIR%%/QtCore/qcommandlineparser.h @@ -662,6 +672,7 @@ bin/qmake6 %%QT_INCDIR%%/QtCore/qdebug.h %%QT_INCDIR%%/QtCore/qdir.h %%QT_INCDIR%%/QtCore/qdiriterator.h +%%QT_INCDIR%%/QtCore/qdirlisting.h %%QT_INCDIR%%/QtCore/qeasingcurve.h %%QT_INCDIR%%/QtCore/qelapsedtimer.h %%QT_INCDIR%%/QtCore/qendian.h @@ -802,6 +813,7 @@ bin/qmake6 %%QT_INCDIR%%/QtCore/qtcore-config.h %%QT_INCDIR%%/QtCore/qtcoreexports.h %%QT_INCDIR%%/QtCore/qtcoreversion.h +%%QT_INCDIR%%/QtCore/qtdeprecationdefinitions.h %%QT_INCDIR%%/QtCore/qtdeprecationmarkers.h %%QT_INCDIR%%/QtCore/qtemporarydir.h %%QT_INCDIR%%/QtCore/qtemporaryfile.h @@ -924,6 +936,20 @@ bin/qmake6 %%QT_INCDIR%%/QtDeviceDiscoverySupport/QtDeviceDiscoverySupportVersion %%QT_INCDIR%%/QtDeviceDiscoverySupport/qtdevicediscoverysupportversion.h %%QT_INCDIR%%/QtExampleIcons/QtExampleIconsDepends +%%QT_INCDIR%%/QtExamplesAssetDownloader/QtExamplesAssetDownloader +%%QT_INCDIR%%/QtExamplesAssetDownloader/QtExamplesAssetDownloaderDepends +%%QT_INCDIR%%/QtExamplesAssetDownloader/QtExamplesAssetDownloaderVersion +%%QT_INCDIR%%/QtExamplesAssetDownloader/assetdownloader.h +%%QT_INCDIR%%/QtExamplesAssetDownloader/barrier.h +%%QT_INCDIR%%/QtExamplesAssetDownloader/concurrentcall.h +%%QT_INCDIR%%/QtExamplesAssetDownloader/conditional.h +%%QT_INCDIR%%/QtExamplesAssetDownloader/networkquery.h +%%QT_INCDIR%%/QtExamplesAssetDownloader/qprocesstask.h +%%QT_INCDIR%%/QtExamplesAssetDownloader/qtexamplesassetdownloaderversion.h +%%QT_INCDIR%%/QtExamplesAssetDownloader/tasking_global.h +%%QT_INCDIR%%/QtExamplesAssetDownloader/tasktree.h +%%QT_INCDIR%%/QtExamplesAssetDownloader/tasktreerunner.h +%%QT_INCDIR%%/QtExamplesAssetDownloader/tcpsocket.h %%QT_INCDIR%%/QtFbSupport/%%FULLVER%%/QtFbSupport/private/qfbbackingstore_p.h %%QT_INCDIR%%/QtFbSupport/%%FULLVER%%/QtFbSupport/private/qfbcursor_p.h %%QT_INCDIR%%/QtFbSupport/%%FULLVER%%/QtFbSupport/private/qfbscreen_p.h @@ -951,10 +977,13 @@ bin/qmake6 %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qblendfunctions_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qblittable_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qbmphandler_p.h +%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qcmyk_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qcolor_p.h +%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qcolorclut_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qcolormatrix_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qcolorspace_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qcolortransferfunction_p.h +%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qcolortransfergeneric_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qcolortransfertable_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qcolortransform_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qcolortrc_p.h @@ -1173,7 +1202,9 @@ bin/qmake6 %%QT_INCDIR%%/QtGui/QAbstractUndoItem %%QT_INCDIR%%/QtGui/QAccessible %%QT_INCDIR%%/QtGui/QAccessibleActionInterface +%%QT_INCDIR%%/QtGui/QAccessibleAnnouncementEvent %%QT_INCDIR%%/QtGui/QAccessibleApplication +%%QT_INCDIR%%/QtGui/QAccessibleAttributesInterface %%QT_INCDIR%%/QtGui/QAccessibleBridge %%QT_INCDIR%%/QtGui/QAccessibleBridgePlugin %%QT_INCDIR%%/QtGui/QAccessibleEditableTextInterface @@ -1295,6 +1326,7 @@ bin/qmake6 %%QT_INCDIR%%/QtGui/QPainterPath %%QT_INCDIR%%/QtGui/QPainterPathStroker %%QT_INCDIR%%/QtGui/QPalette +%%QT_INCDIR%%/QtGui/QPdfOutputIntent %%QT_INCDIR%%/QtGui/QPdfWriter %%QT_INCDIR%%/QtGui/QPen %%QT_INCDIR%%/QtGui/QPicture @@ -1316,6 +1348,7 @@ bin/qmake6 %%QT_INCDIR%%/QtGui/QResizeEvent %%QT_INCDIR%%/QtGui/QRgb %%QT_INCDIR%%/QtGui/QRgba64 +%%QT_INCDIR%%/QtGui/QRgbaFloat %%QT_INCDIR%%/QtGui/QRgbaFloat16 %%QT_INCDIR%%/QtGui/QRgbaFloat32 %%QT_INCDIR%%/QtGui/QScreen @@ -1398,6 +1431,7 @@ bin/qmake6 %%X11%%%%QT_INCDIR%%/QtGui/bus_interface.h %%X11%%%%QT_INCDIR%%/QtGui/cache_adaptor.h %%X11%%%%QT_INCDIR%%/QtGui/deviceeventcontroller_adaptor.h +%%QT_INCDIR%%/QtGui/properties_interface.h %%QT_INCDIR%%/QtGui/qabstractfileiconprovider.h %%QT_INCDIR%%/QtGui/qabstracttextdocumentlayout.h %%QT_INCDIR%%/QtGui/qaccessible.h @@ -1460,6 +1494,7 @@ bin/qmake6 %%QT_INCDIR%%/QtGui/qpainter.h %%QT_INCDIR%%/QtGui/qpainterpath.h %%QT_INCDIR%%/QtGui/qpalette.h +%%QT_INCDIR%%/QtGui/qpdfoutputintent.h %%QT_INCDIR%%/QtGui/qpdfwriter.h %%QT_INCDIR%%/QtGui/qpen.h %%QT_INCDIR%%/QtGui/qpicture.h @@ -1562,6 +1597,7 @@ bin/qmake6 %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qhttp2connection_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qhttp2protocolhandler_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qhttpheaderparser_p.h +%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qhttpheadershelper_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qhttpmultipart_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qhttpnetworkconnection_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qhttpnetworkconnectionchannel_p.h @@ -1602,6 +1638,7 @@ bin/qmake6 %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qocspresponse_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qrestaccessmanager_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qrestreply_p.h +%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsocketabstraction_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsocks5socketengine_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qssl_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslcertificate_p.h @@ -1618,7 +1655,6 @@ bin/qmake6 %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qtldurl_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qtlsbackend_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qtnetwork-config_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qtnetworkexports_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qtnetworkglobal_p.h %%QT_INCDIR%%/QtNetwork/QAbstractNetworkCache %%QT_INCDIR%%/QtNetwork/QAbstractSocket @@ -1629,14 +1665,17 @@ bin/qmake6 %%QT_INCDIR%%/QtNetwork/QDnsMailExchangeRecord %%QT_INCDIR%%/QtNetwork/QDnsServiceRecord %%QT_INCDIR%%/QtNetwork/QDnsTextRecord +%%QT_INCDIR%%/QtNetwork/QDnsTlsAssociationRecord %%DTLS%%%%QT_INCDIR%%/QtNetwork/QDtls %%DTLS%%%%QT_INCDIR%%/QtNetwork/QDtlsClientVerifier -%%QT_INCDIR%%/QtNetwork/QHttpHeaders +%%QT_INCDIR%%/QtNetwork/QFormDataBuilder +%%QT_INCDIR%%/QtNetwork/QFormDataPartBuilder %%QT_INCDIR%%/QtNetwork/QHostAddress %%QT_INCDIR%%/QtNetwork/QHostInfo %%QT_INCDIR%%/QtNetwork/QHstsPolicy %%QT_INCDIR%%/QtNetwork/QHttp1Configuration %%QT_INCDIR%%/QtNetwork/QHttp2Configuration +%%QT_INCDIR%%/QtNetwork/QHttpHeaders %%QT_INCDIR%%/QtNetwork/QHttpMultiPart %%QT_INCDIR%%/QtNetwork/QHttpPart %%QT_INCDIR%%/QtNetwork/QIPv6Address @@ -1685,6 +1724,7 @@ bin/qmake6 %%QT_INCDIR%%/QtNetwork/qauthenticator.h %%QT_INCDIR%%/QtNetwork/qdnslookup.h %%DTLS%%%%QT_INCDIR%%/QtNetwork/qdtls.h +%%QT_INCDIR%%/QtNetwork/qformdatabuilder.h %%QT_INCDIR%%/QtNetwork/qhostaddress.h %%QT_INCDIR%%/QtNetwork/qhostinfo.h %%QT_INCDIR%%/QtNetwork/qhstspolicy.h @@ -1931,6 +1971,7 @@ bin/qmake6 %%QT_INCDIR%%/QtSql/qtsqlexports.h %%QT_INCDIR%%/QtSql/qtsqlglobal.h %%QT_INCDIR%%/QtSql/qtsqlversion.h +%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/catch_p.h %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/cycle_p.h %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qabstracttestlogger_p.h %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qbenchmark_p.h @@ -1951,6 +1992,7 @@ bin/qmake6 %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestblacklist_p.h %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestcase_p.h %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestcoreelement_p.h +%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestcrashhandler_p.h %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestelement_p.h %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestelementattribute_p.h %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtesthelpers_p.h @@ -1958,7 +2000,6 @@ bin/qmake6 %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestlog_p.h %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestresult_p.h %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtesttable_p.h -%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qttestexports_p.h %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qttestlib-config_p.h %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qxmltestlogger_p.h %%QT_INCDIR%%/QtTest/QAbstractItemModelTester @@ -1999,7 +2040,9 @@ bin/qmake6 %%QT_INCDIR%%/QtTest/qtestmouse.h %%QT_INCDIR%%/QtTest/qtestspontaneevent.h %%QT_INCDIR%%/QtTest/qtestsystem.h +%%QT_INCDIR%%/QtTest/qtesttostring.h %%QT_INCDIR%%/QtTest/qtesttouch.h +%%QT_INCDIR%%/QtTest/qtestwheel.h %%QT_INCDIR%%/QtTest/qttestexports.h %%QT_INCDIR%%/QtTest/qttestglobal.h %%QT_INCDIR%%/QtTest/qttestlib-config.h @@ -2474,6 +2517,7 @@ bin/qmake6 %%QT_INCDIR%%/QtXml/qtxmlglobal.h %%QT_INCDIR%%/QtXml/qtxmlversion.h lib/cmake/Qt6/3rdparty/extra-cmake-modules/COPYING-CMAKE-SCRIPTS +lib/cmake/Qt6/3rdparty/extra-cmake-modules/REUSE.toml lib/cmake/Qt6/3rdparty/extra-cmake-modules/find-modules/ECMFindModuleHelpersStub.cmake lib/cmake/Qt6/3rdparty/extra-cmake-modules/find-modules/FindEGL.cmake lib/cmake/Qt6/3rdparty/extra-cmake-modules/find-modules/FindGLIB2.cmake @@ -2489,6 +2533,7 @@ lib/cmake/Qt6/3rdparty/kwin/FindLibdrm.cmake lib/cmake/Qt6/3rdparty/kwin/FindLibinput.cmake lib/cmake/Qt6/3rdparty/kwin/FindXKB.cmake lib/cmake/Qt6/3rdparty/kwin/Findgbm.cmake +lib/cmake/Qt6/3rdparty/kwin/REUSE.toml lib/cmake/Qt6/3rdparty/kwin/qt_attribution.json lib/cmake/Qt6/FindATSPI2.cmake lib/cmake/Qt6/FindDB2.cmake @@ -2554,6 +2599,7 @@ lib/cmake/Qt6/Qt6ConfigVersion.cmake lib/cmake/Qt6/Qt6ConfigVersionImpl.cmake lib/cmake/Qt6/Qt6Dependencies.cmake lib/cmake/Qt6/Qt6Targets.cmake +lib/cmake/Qt6/Qt6VersionlessAliasTargets.cmake lib/cmake/Qt6/Qt6VersionlessTargets.cmake lib/cmake/Qt6/QtAndroidHelpers.cmake lib/cmake/Qt6/QtAppHelpers.cmake @@ -2567,6 +2613,7 @@ lib/cmake/Qt6/QtBuildOptionsHelpers.cmake lib/cmake/Qt6/QtBuildPathsHelpers.cmake lib/cmake/Qt6/QtBuildRepoExamplesHelpers.cmake lib/cmake/Qt6/QtBuildRepoHelpers.cmake +lib/cmake/Qt6/QtBuildStaticDocToolsScript.cmake lib/cmake/Qt6/QtCMakeHelpers.cmake lib/cmake/Qt6/QtCMakePackageVersionFile.cmake.in lib/cmake/Qt6/QtCMakeVersionHelpers.cmake @@ -2597,6 +2644,7 @@ lib/cmake/Qt6/QtGlobalStateHelpers.cmake lib/cmake/Qt6/QtHeadersClean.cmake lib/cmake/Qt6/QtInitProject.cmake lib/cmake/Qt6/QtInstallHelpers.cmake +lib/cmake/Qt6/QtInstallPaths.cmake lib/cmake/Qt6/QtJavaHelpers.cmake lib/cmake/Qt6/QtLalrHelpers.cmake lib/cmake/Qt6/QtMkspecHelpers.cmake @@ -2630,7 +2678,10 @@ lib/cmake/Qt6/QtPublicDependencyHelpers.cmake lib/cmake/Qt6/QtPublicExternalProjectHelpers.cmake lib/cmake/Qt6/QtPublicFinalizerHelpers.cmake lib/cmake/Qt6/QtPublicFindPackageHelpers.cmake +lib/cmake/Qt6/QtPublicGitHelpers.cmake lib/cmake/Qt6/QtPublicPluginHelpers.cmake +lib/cmake/Qt6/QtPublicSbomGenerationHelpers.cmake +lib/cmake/Qt6/QtPublicSbomHelpers.cmake lib/cmake/Qt6/QtPublicTargetHelpers.cmake lib/cmake/Qt6/QtPublicTestHelpers.cmake lib/cmake/Qt6/QtPublicToolHelpers.cmake @@ -2640,6 +2691,7 @@ lib/cmake/Qt6/QtQmakeHelpers.cmake lib/cmake/Qt6/QtResourceHelpers.cmake lib/cmake/Qt6/QtRpathHelpers.cmake lib/cmake/Qt6/QtSanitizerHelpers.cmake +lib/cmake/Qt6/QtSbomHelpers.cmake lib/cmake/Qt6/QtScopeFinalizerHelpers.cmake lib/cmake/Qt6/QtSeparateDebugInfo.Info.plist.in lib/cmake/Qt6/QtSeparateDebugInfo.cmake @@ -2653,6 +2705,8 @@ lib/cmake/Qt6/QtTestHelpers.cmake lib/cmake/Qt6/QtToolHelpers.cmake lib/cmake/Qt6/QtToolchainHelpers.cmake lib/cmake/Qt6/QtUnityBuildHelpers.cmake +lib/cmake/Qt6/QtVersionlessAliasTargets.cmake.in +lib/cmake/Qt6/QtVersionlessTargets.cmake.in lib/cmake/Qt6/QtWasmHelpers.cmake lib/cmake/Qt6/QtWrapperScriptHelpers.cmake lib/cmake/Qt6/QtWriteArgsFile.cmake @@ -2668,8 +2722,9 @@ lib/cmake/Qt6/libexec/qt-internal-ninja.in lib/cmake/Qt6/libexec/qt-internal-strip.bat.in lib/cmake/Qt6/libexec/qt-internal-strip.in lib/cmake/Qt6/modulecppexports.h.in -lib/cmake/Qt6/modulecppexports_p.h.in lib/cmake/Qt6/platforms/FindIntegrityPlatformGraphics.cmake +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.toolchain.cmake @@ -2687,6 +2742,7 @@ lib/cmake/Qt6Concurrent/Qt6ConcurrentConfigVersionImpl.cmake lib/cmake/Qt6Concurrent/Qt6ConcurrentDependencies.cmake 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/Qt6Core/Qt6CTestMacros.cmake lib/cmake/Qt6Core/Qt6CoreAdditionalTargetInfo.cmake @@ -2701,8 +2757,8 @@ lib/cmake/Qt6Core/Qt6CoreMacros.cmake lib/cmake/Qt6Core/Qt6CoreResourceInit.in.cpp 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/Qt6Core/QtInstallPaths.cmake lib/cmake/Qt6CoreTools/Qt6CoreToolsAdditionalTargetInfo.cmake lib/cmake/Qt6CoreTools/Qt6CoreToolsConfig.cmake lib/cmake/Qt6CoreTools/Qt6CoreToolsConfigVersion.cmake @@ -2719,6 +2775,7 @@ lib/cmake/Qt6DBus/Qt6DBusDependencies.cmake lib/cmake/Qt6DBus/Qt6DBusMacros.cmake 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/Qt6DBusTools/Qt6DBusToolsAdditionalTargetInfo.cmake lib/cmake/Qt6DBusTools/Qt6DBusToolsConfig.cmake @@ -2735,6 +2792,7 @@ lib/cmake/Qt6DeviceDiscoverySupportPrivate/Qt6DeviceDiscoverySupportPrivateConfi lib/cmake/Qt6DeviceDiscoverySupportPrivate/Qt6DeviceDiscoverySupportPrivateDependencies.cmake lib/cmake/Qt6DeviceDiscoverySupportPrivate/Qt6DeviceDiscoverySupportPrivateTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6DeviceDiscoverySupportPrivate/Qt6DeviceDiscoverySupportPrivateTargets.cmake +lib/cmake/Qt6DeviceDiscoverySupportPrivate/Qt6DeviceDiscoverySupportPrivateVersionlessAliasTargets.cmake lib/cmake/Qt6DeviceDiscoverySupportPrivate/Qt6DeviceDiscoverySupportPrivateVersionlessTargets.cmake lib/cmake/Qt6ExampleIconsPrivate/Qt6ExampleIconsPrivateAdditionalTargetInfo.cmake lib/cmake/Qt6ExampleIconsPrivate/Qt6ExampleIconsPrivateConfig.cmake @@ -2742,7 +2800,17 @@ lib/cmake/Qt6ExampleIconsPrivate/Qt6ExampleIconsPrivateConfigVersion.cmake lib/cmake/Qt6ExampleIconsPrivate/Qt6ExampleIconsPrivateConfigVersionImpl.cmake lib/cmake/Qt6ExampleIconsPrivate/Qt6ExampleIconsPrivateTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6ExampleIconsPrivate/Qt6ExampleIconsPrivateTargets.cmake +lib/cmake/Qt6ExampleIconsPrivate/Qt6ExampleIconsPrivateVersionlessAliasTargets.cmake lib/cmake/Qt6ExampleIconsPrivate/Qt6ExampleIconsPrivateVersionlessTargets.cmake +lib/cmake/Qt6ExamplesAssetDownloaderPrivate/Qt6ExamplesAssetDownloaderPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6ExamplesAssetDownloaderPrivate/Qt6ExamplesAssetDownloaderPrivateConfig.cmake +lib/cmake/Qt6ExamplesAssetDownloaderPrivate/Qt6ExamplesAssetDownloaderPrivateConfigVersion.cmake +lib/cmake/Qt6ExamplesAssetDownloaderPrivate/Qt6ExamplesAssetDownloaderPrivateConfigVersionImpl.cmake +lib/cmake/Qt6ExamplesAssetDownloaderPrivate/Qt6ExamplesAssetDownloaderPrivateDependencies.cmake +lib/cmake/Qt6ExamplesAssetDownloaderPrivate/Qt6ExamplesAssetDownloaderPrivateTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/Qt6ExamplesAssetDownloaderPrivate/Qt6ExamplesAssetDownloaderPrivateTargets.cmake +lib/cmake/Qt6ExamplesAssetDownloaderPrivate/Qt6ExamplesAssetDownloaderPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6ExamplesAssetDownloaderPrivate/Qt6ExamplesAssetDownloaderPrivateVersionlessTargets.cmake lib/cmake/Qt6FbSupportPrivate/Qt6FbSupportPrivateAdditionalTargetInfo.cmake lib/cmake/Qt6FbSupportPrivate/Qt6FbSupportPrivateConfig.cmake lib/cmake/Qt6FbSupportPrivate/Qt6FbSupportPrivateConfigVersion.cmake @@ -2750,6 +2818,7 @@ lib/cmake/Qt6FbSupportPrivate/Qt6FbSupportPrivateConfigVersionImpl.cmake lib/cmake/Qt6FbSupportPrivate/Qt6FbSupportPrivateDependencies.cmake lib/cmake/Qt6FbSupportPrivate/Qt6FbSupportPrivateTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6FbSupportPrivate/Qt6FbSupportPrivateTargets.cmake +lib/cmake/Qt6FbSupportPrivate/Qt6FbSupportPrivateVersionlessAliasTargets.cmake lib/cmake/Qt6FbSupportPrivate/Qt6FbSupportPrivateVersionlessTargets.cmake lib/cmake/Qt6Gui/Qt6GuiAdditionalTargetInfo.cmake lib/cmake/Qt6Gui/Qt6GuiConfig.cmake @@ -2759,6 +2828,7 @@ lib/cmake/Qt6Gui/Qt6GuiDependencies.cmake lib/cmake/Qt6Gui/Qt6GuiPlugins.cmake lib/cmake/Qt6Gui/Qt6GuiTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6Gui/Qt6GuiTargets.cmake +lib/cmake/Qt6Gui/Qt6GuiVersionlessAliasTargets.cmake lib/cmake/Qt6Gui/Qt6GuiVersionlessTargets.cmake lib/cmake/Qt6Gui/Qt6QComposePlatformInputContextPluginAdditionalTargetInfo.cmake lib/cmake/Qt6Gui/Qt6QComposePlatformInputContextPluginConfig.cmake @@ -2896,6 +2966,7 @@ lib/cmake/Qt6InputSupportPrivate/Qt6InputSupportPrivateConfigVersionImpl.cmake lib/cmake/Qt6InputSupportPrivate/Qt6InputSupportPrivateDependencies.cmake lib/cmake/Qt6InputSupportPrivate/Qt6InputSupportPrivateTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6InputSupportPrivate/Qt6InputSupportPrivateTargets.cmake +lib/cmake/Qt6InputSupportPrivate/Qt6InputSupportPrivateVersionlessAliasTargets.cmake lib/cmake/Qt6InputSupportPrivate/Qt6InputSupportPrivateVersionlessTargets.cmake lib/cmake/Qt6KmsSupportPrivate/Qt6KmsSupportPrivateAdditionalTargetInfo.cmake lib/cmake/Qt6KmsSupportPrivate/Qt6KmsSupportPrivateConfig.cmake @@ -2904,6 +2975,7 @@ lib/cmake/Qt6KmsSupportPrivate/Qt6KmsSupportPrivateConfigVersionImpl.cmake lib/cmake/Qt6KmsSupportPrivate/Qt6KmsSupportPrivateDependencies.cmake lib/cmake/Qt6KmsSupportPrivate/Qt6KmsSupportPrivateTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6KmsSupportPrivate/Qt6KmsSupportPrivateTargets.cmake +lib/cmake/Qt6KmsSupportPrivate/Qt6KmsSupportPrivateVersionlessAliasTargets.cmake lib/cmake/Qt6KmsSupportPrivate/Qt6KmsSupportPrivateVersionlessTargets.cmake lib/cmake/Qt6Network/Qt6NetworkAdditionalTargetInfo.cmake lib/cmake/Qt6Network/Qt6NetworkConfig.cmake @@ -2913,6 +2985,7 @@ lib/cmake/Qt6Network/Qt6NetworkDependencies.cmake lib/cmake/Qt6Network/Qt6NetworkPlugins.cmake lib/cmake/Qt6Network/Qt6NetworkTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6Network/Qt6NetworkTargets.cmake +lib/cmake/Qt6Network/Qt6NetworkVersionlessAliasTargets.cmake lib/cmake/Qt6Network/Qt6NetworkVersionlessTargets.cmake lib/cmake/Qt6Network/Qt6QGlibNetworkInformationPluginAdditionalTargetInfo.cmake lib/cmake/Qt6Network/Qt6QGlibNetworkInformationPluginConfig.cmake @@ -2939,6 +3012,7 @@ lib/cmake/Qt6OpenGL/Qt6OpenGLConfigVersionImpl.cmake lib/cmake/Qt6OpenGL/Qt6OpenGLDependencies.cmake 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/Qt6OpenGLWidgets/Qt6OpenGLWidgetsAdditionalTargetInfo.cmake lib/cmake/Qt6OpenGLWidgets/Qt6OpenGLWidgetsConfig.cmake @@ -2947,6 +3021,7 @@ lib/cmake/Qt6OpenGLWidgets/Qt6OpenGLWidgetsConfigVersionImpl.cmake lib/cmake/Qt6OpenGLWidgets/Qt6OpenGLWidgetsDependencies.cmake 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/Qt6PrintSupport/Qt6PrintSupportAdditionalTargetInfo.cmake lib/cmake/Qt6PrintSupport/Qt6PrintSupportConfig.cmake @@ -2956,6 +3031,7 @@ lib/cmake/Qt6PrintSupport/Qt6PrintSupportDependencies.cmake %%CUPS%%lib/cmake/Qt6PrintSupport/Qt6PrintSupportPlugins.cmake lib/cmake/Qt6PrintSupport/Qt6PrintSupportTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6PrintSupport/Qt6PrintSupportTargets.cmake +lib/cmake/Qt6PrintSupport/Qt6PrintSupportVersionlessAliasTargets.cmake lib/cmake/Qt6PrintSupport/Qt6PrintSupportVersionlessTargets.cmake %%CUPS%%lib/cmake/Qt6PrintSupport/Qt6QCupsPrinterSupportPluginAdditionalTargetInfo.cmake %%CUPS%%lib/cmake/Qt6PrintSupport/Qt6QCupsPrinterSupportPluginConfig.cmake @@ -2971,6 +3047,7 @@ lib/cmake/Qt6Sql/Qt6SqlDependencies.cmake lib/cmake/Qt6Sql/Qt6SqlPlugins.cmake 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/Qt6Test/Qt6TestAdditionalTargetInfo.cmake lib/cmake/Qt6Test/Qt6TestConfig.cmake @@ -2979,6 +3056,7 @@ lib/cmake/Qt6Test/Qt6TestConfigVersionImpl.cmake lib/cmake/Qt6Test/Qt6TestDependencies.cmake 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/Qt6Widgets/Qt6WidgetsAdditionalTargetInfo.cmake lib/cmake/Qt6Widgets/Qt6WidgetsConfig.cmake @@ -2989,6 +3067,7 @@ lib/cmake/Qt6Widgets/Qt6WidgetsMacros.cmake lib/cmake/Qt6Widgets/Qt6WidgetsPlugins.cmake 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/Qt6WidgetsTools/Qt6WidgetsToolsAdditionalTargetInfo.cmake lib/cmake/Qt6WidgetsTools/Qt6WidgetsToolsConfig.cmake @@ -3005,6 +3084,7 @@ lib/cmake/Qt6WidgetsTools/Qt6WidgetsToolsVersionlessTargets.cmake %%X11%%lib/cmake/Qt6XcbQpaPrivate/Qt6XcbQpaPrivateDependencies.cmake %%X11%%lib/cmake/Qt6XcbQpaPrivate/Qt6XcbQpaPrivateTargets-%%CMAKE_BUILD_TYPE%%.cmake %%X11%%lib/cmake/Qt6XcbQpaPrivate/Qt6XcbQpaPrivateTargets.cmake +%%X11%%lib/cmake/Qt6XcbQpaPrivate/Qt6XcbQpaPrivateVersionlessAliasTargets.cmake %%X11%%lib/cmake/Qt6XcbQpaPrivate/Qt6XcbQpaPrivateVersionlessTargets.cmake lib/cmake/Qt6Xml/Qt6XmlAdditionalTargetInfo.cmake lib/cmake/Qt6Xml/Qt6XmlConfig.cmake @@ -3013,6 +3093,7 @@ lib/cmake/Qt6Xml/Qt6XmlConfigVersionImpl.cmake lib/cmake/Qt6Xml/Qt6XmlDependencies.cmake lib/cmake/Qt6Xml/Qt6XmlTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6Xml/Qt6XmlTargets.cmake +lib/cmake/Qt6Xml/Qt6XmlVersionlessAliasTargets.cmake lib/cmake/Qt6Xml/Qt6XmlVersionlessTargets.cmake %%QT_BINDIR%%/androiddeployqt %%QT_BINDIR%%/androiddeployqt6 @@ -3042,6 +3123,8 @@ lib/cmake/Qt6Xml/Qt6XmlVersionlessTargets.cmake %%QT_LIBDIR%%/libQt6DeviceDiscoverySupport.prl %%QT_LIBDIR%%/libQt6ExampleIcons.a %%QT_LIBDIR%%/libQt6ExampleIcons.prl +%%QT_LIBDIR%%/libQt6ExamplesAssetDownloader.a +%%QT_LIBDIR%%/libQt6ExamplesAssetDownloader.prl %%QT_LIBDIR%%/libQt6FbSupport.a %%QT_LIBDIR%%/libQt6FbSupport.prl %%QT_LIBDIR%%/libQt6Gui.prl @@ -3093,6 +3176,7 @@ lib/cmake/Qt6Xml/Qt6XmlVersionlessTargets.cmake %%QT_LIBDIR%%/metatypes/qt6dbus_%%CMAKE_BUILD_TYPE%%_metatypes.json %%QT_LIBDIR%%/metatypes/qt6devicediscoverysupportprivate_%%CMAKE_BUILD_TYPE%%_metatypes.json %%QT_LIBDIR%%/metatypes/qt6exampleiconsprivate_%%CMAKE_BUILD_TYPE%%_metatypes.json +%%QT_LIBDIR%%/metatypes/qt6examplesassetdownloaderprivate_%%CMAKE_BUILD_TYPE%%_metatypes.json %%QT_LIBDIR%%/metatypes/qt6fbsupportprivate_%%CMAKE_BUILD_TYPE%%_metatypes.json %%QT_LIBDIR%%/metatypes/qt6gui_%%CMAKE_BUILD_TYPE%%_metatypes.json %%QT_LIBDIR%%/metatypes/qt6inputsupportprivate_%%CMAKE_BUILD_TYPE%%_metatypes.json @@ -3108,6 +3192,7 @@ lib/cmake/Qt6Xml/Qt6XmlVersionlessTargets.cmake %%QT_LIBDIR%%/metatypes/qt6xml_%%CMAKE_BUILD_TYPE%%_metatypes.json %%DEBUG%%%%QT_LIBDIR%%/objects-Debug/ExampleIconsPrivate_resources_1/.qt/rcc/qrc_example_icons_init.cpp.o %%NO_DEBUG%%%%QT_LIBDIR%%/objects-Release/ExampleIconsPrivate_resources_1/.qt/rcc/qrc_example_icons_init.cpp.o +%%QT_MKSPECDIR%%/REUSE.toml %%QT_MKSPECDIR%%/aix-g++-64/qmake.conf %%QT_MKSPECDIR%%/aix-g++-64/qplatformdefs.h %%QT_MKSPECDIR%%/aix-g++/qmake.conf @@ -3473,9 +3558,13 @@ lib/cmake/Qt6Xml/Qt6XmlVersionlessTargets.cmake %%QT_MKSPECDIR%%/macx-ios-clang/Info.plist.dSYM.in %%QT_MKSPECDIR%%/macx-ios-clang/Info.plist.lib %%QT_MKSPECDIR%%/macx-ios-clang/LaunchScreen.storyboard -%%QT_MKSPECDIR%%/macx-ios-clang/features/default_post.prf %%QT_MKSPECDIR%%/macx-ios-clang/qmake.conf %%QT_MKSPECDIR%%/macx-ios-clang/qplatformdefs.h +%%QT_MKSPECDIR%%/macx-visionos-clang/Info.plist.app +%%QT_MKSPECDIR%%/macx-visionos-clang/Info.plist.dSYM.in +%%QT_MKSPECDIR%%/macx-visionos-clang/Info.plist.lib +%%QT_MKSPECDIR%%/macx-visionos-clang/qmake.conf +%%QT_MKSPECDIR%%/macx-visionos-clang/qplatformdefs.h %%QT_MKSPECDIR%%/macx-xcode/QtTest.plist %%QT_MKSPECDIR%%/macx-xcode/WorkspaceSettings.xcsettings %%QT_MKSPECDIR%%/macx-xcode/default.xcscheme @@ -3490,6 +3579,7 @@ lib/cmake/Qt6Xml/Qt6XmlVersionlessTargets.cmake %%QT_MKSPECDIR%%/modules/qt_lib_dbus_private.pri %%QT_MKSPECDIR%%/modules/qt_lib_devicediscovery_support_private.pri %%QT_MKSPECDIR%%/modules/qt_lib_example_icons_private.pri +%%QT_MKSPECDIR%%/modules/qt_lib_examples_asset_downloader_private.pri %%QT_MKSPECDIR%%/modules/qt_lib_fb_support_private.pri %%QT_MKSPECDIR%%/modules/qt_lib_gui.pri %%QT_MKSPECDIR%%/modules/qt_lib_gui_private.pri @@ -3603,6 +3693,7 @@ lib/cmake/Qt6Xml/Qt6XmlVersionlessTargets.cmake %%QT_PLUGINDIR%%/tls/libqopensslbackend.so %%X11%%%%QT_PLUGINDIR%%/xcbglintegrations/libqxcb-egl-integration.so %%X11%%%%QT_PLUGINDIR%%/xcbglintegrations/libqxcb-glx-integration.so +%%QT_SBOMDIR%%/qtbase-%%FULLVER%%.spdx libdata/pkgconfig/Qt6Concurrent.pc libdata/pkgconfig/Qt6Core.pc libdata/pkgconfig/Qt6DBus.pc @@ -3620,6 +3711,7 @@ libdata/pkgconfig/Qt6Xml.pc %%QT_TOOLDIR%%/ensure_pro_file.cmake %%QT_TOOLDIR%%/moc %%QT_TOOLDIR%%/qlalr +%%QT_TOOLDIR%%/qt-android-runner.py %%QT_TOOLDIR%%/qt-cmake-private %%QT_TOOLDIR%%/qt-cmake-private-install.cmake %%QT_TOOLDIR%%/qt-cmake-standalone-test @@ -3681,6 +3773,7 @@ libdata/pkgconfig/Qt6Xml.pc %%QT_DOCDIR%%/global/externalsites/qtdesignstudio.qdoc %%QT_DOCDIR%%/global/externalsites/rfc.qdoc %%QT_DOCDIR%%/global/fileextensions.qdocconf +%%QT_DOCDIR%%/global/grid.qdocconf %%QT_DOCDIR%%/global/html-config.qdocconf %%QT_DOCDIR%%/global/html-footer-online.qdocconf %%QT_DOCDIR%%/global/html-footer.qdocconf @@ -3766,6 +3859,7 @@ libdata/pkgconfig/Qt6Xml.pc %%QT_DATADIR%%/modules/DBus.json %%QT_DATADIR%%/modules/DeviceDiscoverySupportPrivate.json %%QT_DATADIR%%/modules/ExampleIconsPrivate.json +%%QT_DATADIR%%/modules/ExamplesAssetDownloaderPrivate.json %%QT_DATADIR%%/modules/FbSupportPrivate.json %%QT_DATADIR%%/modules/Gui.json %%QT_DATADIR%%/modules/InputSupportPrivate.json diff --git a/devel/qt6-grpc/Makefile b/devel/qt6-grpc/Makefile index b91eb423b9d5..9eb71318f7aa 100644 --- a/devel/qt6-grpc/Makefile +++ b/devel/qt6-grpc/Makefile @@ -1,6 +1,5 @@ PORTNAME= grpc DISTVERSION= ${QT6_VERSION} -PORTREVISION= 2 CATEGORIES= devel PKGNAMEPREFIX= qt6- diff --git a/devel/qt6-grpc/distinfo b/devel/qt6-grpc/distinfo index cbc4b0c100f6..f6504519d8bd 100644 --- a/devel/qt6-grpc/distinfo +++ b/devel/qt6-grpc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1727577070 -SHA256 (KDE/Qt/6.7.3/qtgrpc-everywhere-src-6.7.3.tar.xz) = eeaaadd4163ebc3db935ba24da0c23aa1cc3d5156176b852aa17c35f1e81c6df -SIZE (KDE/Qt/6.7.3/qtgrpc-everywhere-src-6.7.3.tar.xz) = 473000 +TIMESTAMP = 1733204943 +SHA256 (KDE/Qt/6.8.1/qtgrpc-everywhere-src-6.8.1.tar.xz) = b1615c7096b012e5f42aea57c420d2ce21c906d0eda3ea373b09a47cf40b5e80 +SIZE (KDE/Qt/6.8.1/qtgrpc-everywhere-src-6.8.1.tar.xz) = 467788 diff --git a/devel/qt6-grpc/pkg-plist b/devel/qt6-grpc/pkg-plist index 897b88c216f1..0640f182da26 100644 --- a/devel/qt6-grpc/pkg-plist +++ b/devel/qt6-grpc/pkg-plist @@ -1,77 +1,85 @@ %%QT_INCDIR%%/QtGrpc/%%FULLVER%%/QtGrpc/private/qabstractgrpcchannel_p.h -%%QT_INCDIR%%/QtGrpc/%%FULLVER%%/QtGrpc/private/qgrpcclientinterceptormanager_p.h %%QT_INCDIR%%/QtGrpc/%%FULLVER%%/QtGrpc/private/qtgrpc-config_p.h -%%QT_INCDIR%%/QtGrpc/%%FULLVER%%/QtGrpc/private/qtgrpcglobal_p.h +%%QT_INCDIR%%/QtGrpc/%%FULLVER%%/QtGrpc/private/qtgrpclogging_p.h %%QT_INCDIR%%/QtGrpc/QAbstractGrpcChannel -%%QT_INCDIR%%/QtGrpc/QAbstractGrpcClient -%%QT_INCDIR%%/QtGrpc/QGrpcBidirStream +%%QT_INCDIR%%/QtGrpc/QGrpcBidiStream %%QT_INCDIR%%/QtGrpc/QGrpcCallOptions %%QT_INCDIR%%/QtGrpc/QGrpcCallReply -%%QT_INCDIR%%/QtGrpc/QGrpcChannelOperation %%QT_INCDIR%%/QtGrpc/QGrpcChannelOptions -%%QT_INCDIR%%/QtGrpc/QGrpcClientInterceptor -%%QT_INCDIR%%/QtGrpc/QGrpcClientInterceptorManager +%%QT_INCDIR%%/QtGrpc/QGrpcClientBase %%QT_INCDIR%%/QtGrpc/QGrpcClientStream %%QT_INCDIR%%/QtGrpc/QGrpcHttp2Channel -%%QT_INCDIR%%/QtGrpc/QGrpcInterceptorContinuation -%%QT_INCDIR%%/QtGrpc/QGrpcMetadata %%QT_INCDIR%%/QtGrpc/QGrpcOperation -%%QT_INCDIR%%/QtGrpc/QGrpcRpcInfo +%%QT_INCDIR%%/QtGrpc/QGrpcOperationContext +%%QT_INCDIR%%/QtGrpc/QGrpcSerializationFormat %%QT_INCDIR%%/QtGrpc/QGrpcServerStream %%QT_INCDIR%%/QtGrpc/QGrpcStatus %%QT_INCDIR%%/QtGrpc/QtGrpc %%QT_INCDIR%%/QtGrpc/QtGrpcDepends +%%QT_INCDIR%%/QtGrpc/QtGrpcNamespace %%QT_INCDIR%%/QtGrpc/QtGrpcVersion %%QT_INCDIR%%/QtGrpc/qabstractgrpcchannel.h -%%QT_INCDIR%%/QtGrpc/qabstractgrpcclient.h %%QT_INCDIR%%/QtGrpc/qgrpccalloptions.h %%QT_INCDIR%%/QtGrpc/qgrpccallreply.h -%%QT_INCDIR%%/QtGrpc/qgrpcchanneloperation.h %%QT_INCDIR%%/QtGrpc/qgrpcchanneloptions.h -%%QT_INCDIR%%/QtGrpc/qgrpcclientinterceptor.h -%%QT_INCDIR%%/QtGrpc/qgrpcclientinterceptormanager.h +%%QT_INCDIR%%/QtGrpc/qgrpcclientbase.h %%QT_INCDIR%%/QtGrpc/qgrpchttp2channel.h -%%QT_INCDIR%%/QtGrpc/qgrpcmetadata.h %%QT_INCDIR%%/QtGrpc/qgrpcoperation.h +%%QT_INCDIR%%/QtGrpc/qgrpcoperationcontext.h +%%QT_INCDIR%%/QtGrpc/qgrpcserializationformat.h %%QT_INCDIR%%/QtGrpc/qgrpcstatus.h %%QT_INCDIR%%/QtGrpc/qgrpcstream.h %%QT_INCDIR%%/QtGrpc/qtgrpc-config.h %%QT_INCDIR%%/QtGrpc/qtgrpcexports.h %%QT_INCDIR%%/QtGrpc/qtgrpcglobal.h +%%QT_INCDIR%%/QtGrpc/qtgrpcnamespace.h %%QT_INCDIR%%/QtGrpc/qtgrpcversion.h -%%QT_INCDIR%%/QtGrpcQuick/%%FULLVER%%/QtGrpcQuick/private/qqmlgrpccalloptions_p.h +%%QT_INCDIR%%/QtGrpcQuick/%%FULLVER%%/QtGrpcQuick/private/qqmlabstractgrpcchannel_p.h %%QT_INCDIR%%/QtGrpcQuick/%%FULLVER%%/QtGrpcQuick/private/qqmlgrpcchanneloptions_p.h %%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/QQmlAbstractGrpcChannel %%QT_INCDIR%%/QtGrpcQuick/QtGrpcQuick %%QT_INCDIR%%/QtGrpcQuick/QtGrpcQuickDepends %%QT_INCDIR%%/QtGrpcQuick/QtGrpcQuickVersion %%QT_INCDIR%%/QtGrpcQuick/qqmlabstractgrpcchannel.h +%%QT_INCDIR%%/QtGrpcQuick/qqmlgrpccalloptions.h +%%QT_INCDIR%%/QtGrpcQuick/qqmlgrpcfunctionalhandlers.h %%QT_INCDIR%%/QtGrpcQuick/qtgrpcquickexports.h %%QT_INCDIR%%/QtGrpcQuick/qtgrpcquickversion.h +%%QT_INCDIR%%/QtGrpcQuick/qtqmlgrpcstreamsender.h +%%QT_INCDIR%%/QtProtobuf/%%FULLVER%%/QtProtobuf/private/protobuffieldpresencechecker_p.h %%QT_INCDIR%%/QtProtobuf/%%FULLVER%%/QtProtobuf/private/qprotobufmessage_p.h +%%QT_INCDIR%%/QtProtobuf/%%FULLVER%%/QtProtobuf/private/qprotobufpropertyorderingbuilder_p.h +%%QT_INCDIR%%/QtProtobuf/%%FULLVER%%/QtProtobuf/private/qprotobufregistration_p.h %%QT_INCDIR%%/QtProtobuf/%%FULLVER%%/QtProtobuf/private/qprotobufselfcheckiterator_p.h %%QT_INCDIR%%/QtProtobuf/%%FULLVER%%/QtProtobuf/private/qprotobufserializer_p.h %%QT_INCDIR%%/QtProtobuf/%%FULLVER%%/QtProtobuf/private/qtprotobuf-config_p.h +%%QT_INCDIR%%/QtProtobuf/%%FULLVER%%/QtProtobuf/private/qtprotobufdefs_p.h %%QT_INCDIR%%/QtProtobuf/%%FULLVER%%/QtProtobuf/private/qtprotobuflogging_p.h +%%QT_INCDIR%%/QtProtobuf/%%FULLVER%%/QtProtobuf/private/qtprotobufserializerhelpers_p.h %%QT_INCDIR%%/QtProtobuf/QAbstractProtobufSerializer -%%QT_INCDIR%%/QtProtobuf/QProtobufBaseSerializer %%QT_INCDIR%%/QtProtobuf/QProtobufJsonSerializer +%%QT_INCDIR%%/QtProtobuf/QProtobufMapEntry +%%QT_INCDIR%%/QtProtobuf/QProtobufMapEntryBase %%QT_INCDIR%%/QtProtobuf/QProtobufMessage %%QT_INCDIR%%/QtProtobuf/QProtobufMessageDeleter %%QT_INCDIR%%/QtProtobuf/QProtobufOneof +%%QT_INCDIR%%/QtProtobuf/QProtobufRepeatedIterator %%QT_INCDIR%%/QtProtobuf/QProtobufSerializer %%QT_INCDIR%%/QtProtobuf/QtProtobuf %%QT_INCDIR%%/QtProtobuf/QtProtobufDepends %%QT_INCDIR%%/QtProtobuf/QtProtobufVersion %%QT_INCDIR%%/QtProtobuf/qabstractprotobufserializer.h -%%QT_INCDIR%%/QtProtobuf/qprotobufbaseserializer.h %%QT_INCDIR%%/QtProtobuf/qprotobufjsonserializer.h %%QT_INCDIR%%/QtProtobuf/qprotobuflazymessagepointer.h %%QT_INCDIR%%/QtProtobuf/qprotobufmessage.h %%QT_INCDIR%%/QtProtobuf/qprotobufobject.h %%QT_INCDIR%%/QtProtobuf/qprotobufoneof.h +%%QT_INCDIR%%/QtProtobuf/qprotobufpropertyordering.h +%%QT_INCDIR%%/QtProtobuf/qprotobufregistration.h +%%QT_INCDIR%%/QtProtobuf/qprotobufrepeatediterator.h %%QT_INCDIR%%/QtProtobuf/qprotobufserializer.h %%QT_INCDIR%%/QtProtobuf/qtprotobuf-config.h %%QT_INCDIR%%/QtProtobuf/qtprotobufexports.h @@ -99,6 +107,12 @@ %%QT_INCDIR%%/QtProtobufQtGuiTypes/qtprotobufqtguitypesexports.h %%QT_INCDIR%%/QtProtobufQtGuiTypes/qtprotobufqtguitypesglobal.h %%QT_INCDIR%%/QtProtobufQtGuiTypes/qtprotobufqtguitypesversion.h +%%QT_INCDIR%%/QtProtobufQuick/%%FULLVER%%/QtProtobufQuick/private/qqmlprotobuftypes_p.h +%%QT_INCDIR%%/QtProtobufQuick/QtProtobufQuick +%%QT_INCDIR%%/QtProtobufQuick/QtProtobufQuickDepends +%%QT_INCDIR%%/QtProtobufQuick/QtProtobufQuickVersion +%%QT_INCDIR%%/QtProtobufQuick/qtprotobufquickexports.h +%%QT_INCDIR%%/QtProtobufQuick/qtprotobufquickversion.h %%QT_INCDIR%%/QtProtobufWellKnownTypes/QtProtobufWellKnownTypes %%QT_INCDIR%%/QtProtobufWellKnownTypes/QtProtobufWellKnownTypesDepends %%QT_INCDIR%%/QtProtobufWellKnownTypes/QtProtobufWellKnownTypesVersion @@ -140,6 +154,7 @@ lib/cmake/Qt6Grpc/Qt6GrpcConfigVersionImpl.cmake lib/cmake/Qt6Grpc/Qt6GrpcDependencies.cmake 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/Qt6GrpcQuick/Qt6GrpcQuickAdditionalTargetInfo.cmake lib/cmake/Qt6GrpcQuick/Qt6GrpcQuickConfig.cmake @@ -148,6 +163,7 @@ lib/cmake/Qt6GrpcQuick/Qt6GrpcQuickConfigVersionImpl.cmake lib/cmake/Qt6GrpcQuick/Qt6GrpcQuickDependencies.cmake 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/Qt6GrpcTools/Qt6GrpcToolsAdditionalTargetInfo.cmake lib/cmake/Qt6GrpcTools/Qt6GrpcToolsConfig.cmake @@ -166,6 +182,7 @@ lib/cmake/Qt6Protobuf/Qt6ProtobufConfigVersionImpl.cmake lib/cmake/Qt6Protobuf/Qt6ProtobufDependencies.cmake lib/cmake/Qt6Protobuf/Qt6ProtobufTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6Protobuf/Qt6ProtobufTargets.cmake +lib/cmake/Qt6Protobuf/Qt6ProtobufVersionlessAliasTargets.cmake lib/cmake/Qt6Protobuf/Qt6ProtobufVersionlessTargets.cmake lib/cmake/Qt6Protobuf/QtProtobufProperties.cmake.in lib/cmake/Qt6ProtobufQtCoreTypes/Qt6ProtobufQtCoreTypesAdditionalTargetInfo.cmake @@ -176,6 +193,7 @@ lib/cmake/Qt6ProtobufQtCoreTypes/Qt6ProtobufQtCoreTypesDependencies.cmake lib/cmake/Qt6ProtobufQtCoreTypes/Qt6ProtobufQtCoreTypesProtobufProperties.cmake lib/cmake/Qt6ProtobufQtCoreTypes/Qt6ProtobufQtCoreTypesTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6ProtobufQtCoreTypes/Qt6ProtobufQtCoreTypesTargets.cmake +lib/cmake/Qt6ProtobufQtCoreTypes/Qt6ProtobufQtCoreTypesVersionlessAliasTargets.cmake lib/cmake/Qt6ProtobufQtCoreTypes/Qt6ProtobufQtCoreTypesVersionlessTargets.cmake lib/cmake/Qt6ProtobufQtGuiTypes/Qt6ProtobufQtGuiTypesAdditionalTargetInfo.cmake lib/cmake/Qt6ProtobufQtGuiTypes/Qt6ProtobufQtGuiTypesConfig.cmake @@ -185,7 +203,17 @@ lib/cmake/Qt6ProtobufQtGuiTypes/Qt6ProtobufQtGuiTypesDependencies.cmake lib/cmake/Qt6ProtobufQtGuiTypes/Qt6ProtobufQtGuiTypesProtobufProperties.cmake lib/cmake/Qt6ProtobufQtGuiTypes/Qt6ProtobufQtGuiTypesTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6ProtobufQtGuiTypes/Qt6ProtobufQtGuiTypesTargets.cmake +lib/cmake/Qt6ProtobufQtGuiTypes/Qt6ProtobufQtGuiTypesVersionlessAliasTargets.cmake lib/cmake/Qt6ProtobufQtGuiTypes/Qt6ProtobufQtGuiTypesVersionlessTargets.cmake +lib/cmake/Qt6ProtobufQuick/Qt6ProtobufQuickAdditionalTargetInfo.cmake +lib/cmake/Qt6ProtobufQuick/Qt6ProtobufQuickConfig.cmake +lib/cmake/Qt6ProtobufQuick/Qt6ProtobufQuickConfigVersion.cmake +lib/cmake/Qt6ProtobufQuick/Qt6ProtobufQuickConfigVersionImpl.cmake +lib/cmake/Qt6ProtobufQuick/Qt6ProtobufQuickDependencies.cmake +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/Qt6ProtobufTools/Qt6ProtobufToolsAdditionalTargetInfo.cmake lib/cmake/Qt6ProtobufTools/Qt6ProtobufToolsConfig.cmake lib/cmake/Qt6ProtobufTools/Qt6ProtobufToolsConfigVersion.cmake @@ -204,6 +232,7 @@ lib/cmake/Qt6ProtobufWellKnownTypes/Qt6ProtobufWellKnownTypesConfigVersionImpl.c lib/cmake/Qt6ProtobufWellKnownTypes/Qt6ProtobufWellKnownTypesDependencies.cmake lib/cmake/Qt6ProtobufWellKnownTypes/Qt6ProtobufWellKnownTypesTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6ProtobufWellKnownTypes/Qt6ProtobufWellKnownTypesTargets.cmake +lib/cmake/Qt6ProtobufWellKnownTypes/Qt6ProtobufWellKnownTypesVersionlessAliasTargets.cmake lib/cmake/Qt6ProtobufWellKnownTypes/Qt6ProtobufWellKnownTypesVersionlessTargets.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6grpcquickpluginAdditionalTargetInfo.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6grpcquickpluginConfig.cmake @@ -211,6 +240,12 @@ lib/cmake/Qt6Qml/QmlPlugins/Qt6grpcquickpluginConfigVersion.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6grpcquickpluginConfigVersionImpl.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6grpcquickpluginTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6grpcquickpluginTargets.cmake +lib/cmake/Qt6Qml/QmlPlugins/Qt6protobufquickpluginAdditionalTargetInfo.cmake +lib/cmake/Qt6Qml/QmlPlugins/Qt6protobufquickpluginConfig.cmake +lib/cmake/Qt6Qml/QmlPlugins/Qt6protobufquickpluginConfigVersion.cmake +lib/cmake/Qt6Qml/QmlPlugins/Qt6protobufquickpluginConfigVersionImpl.cmake +lib/cmake/Qt6Qml/QmlPlugins/Qt6protobufquickpluginTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/Qt6Qml/QmlPlugins/Qt6protobufquickpluginTargets.cmake %%QT_LIBDIR%%/libQt6Grpc.prl %%QT_LIBDIR%%/libQt6Grpc.so %%QT_LIBDIR%%/libQt6Grpc.so.6 @@ -231,6 +266,10 @@ lib/cmake/Qt6Qml/QmlPlugins/Qt6grpcquickpluginTargets.cmake %%QT_LIBDIR%%/libQt6ProtobufQtGuiTypes.so %%QT_LIBDIR%%/libQt6ProtobufQtGuiTypes.so.6 %%QT_LIBDIR%%/libQt6ProtobufQtGuiTypes.so.%%FULLVER%% +%%QT_LIBDIR%%/libQt6ProtobufQuick.prl +%%QT_LIBDIR%%/libQt6ProtobufQuick.so +%%QT_LIBDIR%%/libQt6ProtobufQuick.so.6 +%%QT_LIBDIR%%/libQt6ProtobufQuick.so.%%FULLVER%% %%QT_LIBDIR%%/libQt6ProtobufWellKnownTypes.prl %%QT_LIBDIR%%/libQt6ProtobufWellKnownTypes.so %%QT_LIBDIR%%/libQt6ProtobufWellKnownTypes.so.6 @@ -240,6 +279,7 @@ lib/cmake/Qt6Qml/QmlPlugins/Qt6grpcquickpluginTargets.cmake %%QT_LIBDIR%%/metatypes/qt6protobuf_%%CMAKE_BUILD_TYPE%%_metatypes.json %%QT_LIBDIR%%/metatypes/qt6protobufqtcoretypes_%%CMAKE_BUILD_TYPE%%_metatypes.json %%QT_LIBDIR%%/metatypes/qt6protobufqtguitypes_%%CMAKE_BUILD_TYPE%%_metatypes.json +%%QT_LIBDIR%%/metatypes/qt6protobufquick_%%CMAKE_BUILD_TYPE%%_metatypes.json %%QT_LIBDIR%%/metatypes/qt6protobufwellknowntypes_%%CMAKE_BUILD_TYPE%%_metatypes.json %%QT_MKSPECDIR%%/modules/qt_lib_grpc.pri %%QT_MKSPECDIR%%/modules/qt_lib_grpc_private.pri @@ -251,16 +291,23 @@ lib/cmake/Qt6Qml/QmlPlugins/Qt6grpcquickpluginTargets.cmake %%QT_MKSPECDIR%%/modules/qt_lib_protobufqtcoretypes_private.pri %%QT_MKSPECDIR%%/modules/qt_lib_protobufqtguitypes.pri %%QT_MKSPECDIR%%/modules/qt_lib_protobufqtguitypes_private.pri +%%QT_MKSPECDIR%%/modules/qt_lib_protobufquick.pri +%%QT_MKSPECDIR%%/modules/qt_lib_protobufquick_private.pri %%QT_MKSPECDIR%%/modules/qt_lib_protobufwellknowntypes.pri %%QT_MKSPECDIR%%/modules/qt_lib_protobufwellknowntypes_private.pri %%QT_QMLDIR%%/QtGrpc/libgrpcquickplugin.so %%QT_QMLDIR%%/QtGrpc/plugins.qmltypes %%QT_QMLDIR%%/QtGrpc/qmldir +%%QT_QMLDIR%%/QtProtobuf/libprotobufquickplugin.so +%%QT_QMLDIR%%/QtProtobuf/plugins.qmltypes +%%QT_QMLDIR%%/QtProtobuf/qmldir +%%QT_SBOMDIR%%/qtgrpc-%%FULLVER%%.spdx libdata/pkgconfig/Qt6Grpc.pc libdata/pkgconfig/Qt6GrpcQuick.pc libdata/pkgconfig/Qt6Protobuf.pc libdata/pkgconfig/Qt6ProtobufQtCoreTypes.pc libdata/pkgconfig/Qt6ProtobufQtGuiTypes.pc +libdata/pkgconfig/Qt6ProtobufQuick.pc libdata/pkgconfig/Qt6ProtobufWellKnownTypes.pc %%QT_TOOLDIR%%/qtgrpcgen %%QT_TOOLDIR%%/qtprotobufgen @@ -269,4 +316,5 @@ libdata/pkgconfig/Qt6ProtobufWellKnownTypes.pc %%QT_DATADIR%%/modules/Protobuf.json %%QT_DATADIR%%/modules/ProtobufQtCoreTypes.json %%QT_DATADIR%%/modules/ProtobufQtGuiTypes.json +%%QT_DATADIR%%/modules/ProtobufQuick.json %%QT_DATADIR%%/modules/ProtobufWellKnownTypes.json diff --git a/devel/qt6-languageserver/Makefile b/devel/qt6-languageserver/Makefile index 7a535c0f90b1..cacf4c84cd94 100644 --- a/devel/qt6-languageserver/Makefile +++ b/devel/qt6-languageserver/Makefile @@ -9,6 +9,6 @@ COMMENT= Qt 6 implementation of the Language Server Protocol BUILD_DEPENDS= vulkan-headers>0:graphics/vulkan-headers USES= cmake compiler:c++17-lang pkgconfig qt-dist:6 -USE_QT= base +USE_QT= base:build .include diff --git a/devel/qt6-languageserver/distinfo b/devel/qt6-languageserver/distinfo index 5bee3f56c7a9..f3daff0f224e 100644 --- a/devel/qt6-languageserver/distinfo +++ b/devel/qt6-languageserver/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1727500280 -SHA256 (KDE/Qt/6.7.3/qtlanguageserver-everywhere-src-6.7.3.tar.xz) = c56d3872428503d9e49bfc6fa1023332f035ffd711d39e904e50cd6bb1f9df8f -SIZE (KDE/Qt/6.7.3/qtlanguageserver-everywhere-src-6.7.3.tar.xz) = 145752 +TIMESTAMP = 1733204944 +SHA256 (KDE/Qt/6.8.1/qtlanguageserver-everywhere-src-6.8.1.tar.xz) = 865e9436c1432a53e38a30625b6cee60bf72553ff508047115513a233c8e6d7e +SIZE (KDE/Qt/6.8.1/qtlanguageserver-everywhere-src-6.8.1.tar.xz) = 150260 diff --git a/devel/qt6-languageserver/pkg-plist b/devel/qt6-languageserver/pkg-plist index cd2c8ad3b4a8..20a58bc399de 100644 --- a/devel/qt6-languageserver/pkg-plist +++ b/devel/qt6-languageserver/pkg-plist @@ -32,6 +32,7 @@ lib/cmake/Qt6JsonRpcPrivate/Qt6JsonRpcPrivateConfigVersionImpl.cmake lib/cmake/Qt6JsonRpcPrivate/Qt6JsonRpcPrivateDependencies.cmake lib/cmake/Qt6JsonRpcPrivate/Qt6JsonRpcPrivateTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6JsonRpcPrivate/Qt6JsonRpcPrivateTargets.cmake +lib/cmake/Qt6JsonRpcPrivate/Qt6JsonRpcPrivateVersionlessAliasTargets.cmake lib/cmake/Qt6JsonRpcPrivate/Qt6JsonRpcPrivateVersionlessTargets.cmake lib/cmake/Qt6LanguageServerPrivate/Qt6LanguageServerPrivateAdditionalTargetInfo.cmake lib/cmake/Qt6LanguageServerPrivate/Qt6LanguageServerPrivateConfig.cmake @@ -40,18 +41,16 @@ lib/cmake/Qt6LanguageServerPrivate/Qt6LanguageServerPrivateConfigVersionImpl.cma lib/cmake/Qt6LanguageServerPrivate/Qt6LanguageServerPrivateDependencies.cmake lib/cmake/Qt6LanguageServerPrivate/Qt6LanguageServerPrivateTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6LanguageServerPrivate/Qt6LanguageServerPrivateTargets.cmake +lib/cmake/Qt6LanguageServerPrivate/Qt6LanguageServerPrivateVersionlessAliasTargets.cmake lib/cmake/Qt6LanguageServerPrivate/Qt6LanguageServerPrivateVersionlessTargets.cmake +%%QT_LIBDIR%%/libQt6JsonRpc.a %%QT_LIBDIR%%/libQt6JsonRpc.prl -%%QT_LIBDIR%%/libQt6JsonRpc.so -%%QT_LIBDIR%%/libQt6JsonRpc.so.6 -%%QT_LIBDIR%%/libQt6JsonRpc.so.%%FULLVER%% +%%QT_LIBDIR%%/libQt6LanguageServer.a %%QT_LIBDIR%%/libQt6LanguageServer.prl -%%QT_LIBDIR%%/libQt6LanguageServer.so -%%QT_LIBDIR%%/libQt6LanguageServer.so.6 -%%QT_LIBDIR%%/libQt6LanguageServer.so.%%FULLVER%% %%QT_LIBDIR%%/metatypes/qt6jsonrpcprivate_%%CMAKE_BUILD_TYPE%%_metatypes.json %%QT_LIBDIR%%/metatypes/qt6languageserverprivate_%%CMAKE_BUILD_TYPE%%_metatypes.json %%QT_MKSPECDIR%%/modules/qt_lib_jsonrpc_private.pri %%QT_MKSPECDIR%%/modules/qt_lib_languageserver_private.pri +%%QT_SBOMDIR%%/qtlanguageserver-%%FULLVER%%.spdx %%QT_DATADIR%%/modules/JsonRpcPrivate.json %%QT_DATADIR%%/modules/LanguageServerPrivate.json diff --git a/devel/qt6-location/distinfo b/devel/qt6-location/distinfo index a01256e6cbec..fb256f8e14f7 100644 --- a/devel/qt6-location/distinfo +++ b/devel/qt6-location/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1727500281 -SHA256 (KDE/Qt/6.7.3/qtlocation-everywhere-src-6.7.3.tar.xz) = 569fd7ddcd048ef7e8c64465eed93aeb8d021aa6f2befd5c1815fa992bd3a798 -SIZE (KDE/Qt/6.7.3/qtlocation-everywhere-src-6.7.3.tar.xz) = 3166232 +TIMESTAMP = 1733204947 +SHA256 (KDE/Qt/6.8.1/qtlocation-everywhere-src-6.8.1.tar.xz) = 9070db5eb8bb873a1d4e49d3aa922e37e22771c6636d031d3a9f6addae4b59ef +SIZE (KDE/Qt/6.8.1/qtlocation-everywhere-src-6.8.1.tar.xz) = 3164180 diff --git a/devel/qt6-location/pkg-plist b/devel/qt6-location/pkg-plist index fdcc8e074803..b59f3a492945 100644 --- a/devel/qt6-location/pkg-plist +++ b/devel/qt6-location/pkg-plist @@ -91,7 +91,6 @@ %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qplacesearchresult_p.h %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qplacesupplier_p.h %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qplaceuser_p.h -%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qtlocationexports_p.h %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/unsupportedreplies_p.h %%QT_INCDIR%%/QtLocation/QGeoCodeReply %%QT_INCDIR%%/QtLocation/QGeoCodingManager @@ -182,6 +181,7 @@ lib/cmake/Qt6Location/Qt6LocationDependencies.cmake lib/cmake/Qt6Location/Qt6LocationPlugins.cmake lib/cmake/Qt6Location/Qt6LocationTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6Location/Qt6LocationTargets.cmake +lib/cmake/Qt6Location/Qt6LocationVersionlessAliasTargets.cmake lib/cmake/Qt6Location/Qt6LocationVersionlessTargets.cmake lib/cmake/Qt6Location/Qt6QGeoServiceProviderFactoryItemsOverlayPluginAdditionalTargetInfo.cmake lib/cmake/Qt6Location/Qt6QGeoServiceProviderFactoryItemsOverlayPluginConfig.cmake @@ -214,5 +214,6 @@ lib/cmake/Qt6Qml/QmlPlugins/Qt6declarative_locationTargets.cmake %%QT_QMLDIR%%/QtLocation/libdeclarative_locationplugin.so %%QT_QMLDIR%%/QtLocation/plugins.qmltypes %%QT_QMLDIR%%/QtLocation/qmldir +%%QT_SBOMDIR%%/qtlocation-%%FULLVER%%.spdx libdata/pkgconfig/Qt6Location.pc %%QT_DATADIR%%/modules/Location.json diff --git a/devel/qt6-positioning/distinfo b/devel/qt6-positioning/distinfo index 3b0fe93b849a..eeb8e07f8a14 100644 --- a/devel/qt6-positioning/distinfo +++ b/devel/qt6-positioning/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1727500282 -SHA256 (KDE/Qt/6.7.3/qtpositioning-everywhere-src-6.7.3.tar.xz) = da7073754224c91fb938ff5b02ff938540640605ac9ff6526db88d799cc6661c -SIZE (KDE/Qt/6.7.3/qtpositioning-everywhere-src-6.7.3.tar.xz) = 659068 +TIMESTAMP = 1733204949 +SHA256 (KDE/Qt/6.8.1/qtpositioning-everywhere-src-6.8.1.tar.xz) = e310e7232591d4beb1785bfff8ff3e77430bdf5e9a17f56694b732f5267df78d +SIZE (KDE/Qt/6.8.1/qtpositioning-everywhere-src-6.8.1.tar.xz) = 661544 diff --git a/devel/qt6-positioning/pkg-plist b/devel/qt6-positioning/pkg-plist index 694c04e0d889..dc8e5777b4bf 100644 --- a/devel/qt6-positioning/pkg-plist +++ b/devel/qt6-positioning/pkg-plist @@ -20,7 +20,6 @@ %%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qnmeasatelliteinfosource_p.h %%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qpositioningglobal_p.h %%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qtpositioning-config_p.h -%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qtpositioningexports_p.h %%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qwebmercator_p.h %%QT_INCDIR%%/QtPositioning/QGeoAddress %%QT_INCDIR%%/QtPositioning/QGeoAreaMonitorInfo @@ -74,7 +73,6 @@ %%QT_INCDIR%%/QtPositioningQuick/%%FULLVER%%/QtPositioningQuick/private/qpositioningquickmodule_p.h %%QT_INCDIR%%/QtPositioningQuick/%%FULLVER%%/QtPositioningQuick/private/qquickgeocoordinateanimation_p.h %%QT_INCDIR%%/QtPositioningQuick/%%FULLVER%%/QtPositioningQuick/private/qquickgeocoordinateanimation_p_p.h -%%QT_INCDIR%%/QtPositioningQuick/%%FULLVER%%/QtPositioningQuick/private/qtpositioningquickexports_p.h %%QT_INCDIR%%/QtPositioningQuick/QtPositioningQuick %%QT_INCDIR%%/QtPositioningQuick/QtPositioningQuickDepends %%QT_INCDIR%%/QtPositioningQuick/QtPositioningQuickVersion @@ -93,6 +91,7 @@ lib/cmake/Qt6Positioning/Qt6PositioningDependencies.cmake lib/cmake/Qt6Positioning/Qt6PositioningPlugins.cmake lib/cmake/Qt6Positioning/Qt6PositioningTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6Positioning/Qt6PositioningTargets.cmake +lib/cmake/Qt6Positioning/Qt6PositioningVersionlessAliasTargets.cmake lib/cmake/Qt6Positioning/Qt6PositioningVersionlessTargets.cmake lib/cmake/Qt6Positioning/Qt6QGeoPositionInfoSourceFactoryGeoclue2PluginAdditionalTargetInfo.cmake lib/cmake/Qt6Positioning/Qt6QGeoPositionInfoSourceFactoryGeoclue2PluginConfig.cmake @@ -119,6 +118,7 @@ lib/cmake/Qt6PositioningQuick/Qt6PositioningQuickConfigVersionImpl.cmake lib/cmake/Qt6PositioningQuick/Qt6PositioningQuickDependencies.cmake lib/cmake/Qt6PositioningQuick/Qt6PositioningQuickTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6PositioningQuick/Qt6PositioningQuickTargets.cmake +lib/cmake/Qt6PositioningQuick/Qt6PositioningQuickVersionlessAliasTargets.cmake lib/cmake/Qt6PositioningQuick/Qt6PositioningQuickVersionlessTargets.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6positioningquickpluginAdditionalTargetInfo.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6positioningquickpluginConfig.cmake @@ -146,6 +146,7 @@ lib/cmake/Qt6Qml/QmlPlugins/Qt6positioningquickpluginTargets.cmake %%QT_QMLDIR%%/QtPositioning/libpositioningquickplugin.so %%QT_QMLDIR%%/QtPositioning/plugins.qmltypes %%QT_QMLDIR%%/QtPositioning/qmldir +%%QT_SBOMDIR%%/qtpositioning-%%FULLVER%%.spdx libdata/pkgconfig/Qt6Positioning.pc libdata/pkgconfig/Qt6PositioningQuick.pc %%QT_DATADIR%%/modules/Positioning.json diff --git a/devel/qt6-remoteobjects/distinfo b/devel/qt6-remoteobjects/distinfo index 259f0fe581b4..49687a349255 100644 --- a/devel/qt6-remoteobjects/distinfo +++ b/devel/qt6-remoteobjects/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1727500283 -SHA256 (KDE/Qt/6.7.3/qtremoteobjects-everywhere-src-6.7.3.tar.xz) = 99c08aa938a64c10dac0a24e19bc1fc8ce3bb62118c834208bdd6e5c76fc91d1 -SIZE (KDE/Qt/6.7.3/qtremoteobjects-everywhere-src-6.7.3.tar.xz) = 537012 +TIMESTAMP = 1733204951 +SHA256 (KDE/Qt/6.8.1/qtremoteobjects-everywhere-src-6.8.1.tar.xz) = 7ef2870f05614b71d1cfdd7ac12acef5294abc43da244a6e9e411f21208f59f8 +SIZE (KDE/Qt/6.8.1/qtremoteobjects-everywhere-src-6.8.1.tar.xz) = 537132 diff --git a/devel/qt6-remoteobjects/pkg-plist b/devel/qt6-remoteobjects/pkg-plist index 3f07bf630a02..6b10e2fcbf10 100644 --- a/devel/qt6-remoteobjects/pkg-plist +++ b/devel/qt6-remoteobjects/pkg-plist @@ -74,6 +74,7 @@ lib/cmake/Qt6RemoteObjects/Qt6RemoteObjectsDependencies.cmake lib/cmake/Qt6RemoteObjects/Qt6RemoteObjectsMacros.cmake 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/Qt6RemoteObjectsQml/Qt6RemoteObjectsQmlAdditionalTargetInfo.cmake lib/cmake/Qt6RemoteObjectsQml/Qt6RemoteObjectsQmlConfig.cmake @@ -82,6 +83,7 @@ lib/cmake/Qt6RemoteObjectsQml/Qt6RemoteObjectsQmlConfigVersionImpl.cmake lib/cmake/Qt6RemoteObjectsQml/Qt6RemoteObjectsQmlDependencies.cmake lib/cmake/Qt6RemoteObjectsQml/Qt6RemoteObjectsQmlTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6RemoteObjectsQml/Qt6RemoteObjectsQmlTargets.cmake +lib/cmake/Qt6RemoteObjectsQml/Qt6RemoteObjectsQmlVersionlessAliasTargets.cmake lib/cmake/Qt6RemoteObjectsQml/Qt6RemoteObjectsQmlVersionlessTargets.cmake lib/cmake/Qt6RemoteObjectsTools/Qt6RemoteObjectsToolsAdditionalTargetInfo.cmake lib/cmake/Qt6RemoteObjectsTools/Qt6RemoteObjectsToolsConfig.cmake @@ -97,6 +99,7 @@ lib/cmake/Qt6RepParser/Qt6RepParserConfigVersion.cmake lib/cmake/Qt6RepParser/Qt6RepParserConfigVersionImpl.cmake lib/cmake/Qt6RepParser/Qt6RepParserDependencies.cmake lib/cmake/Qt6RepParser/Qt6RepParserTargets.cmake +lib/cmake/Qt6RepParser/Qt6RepParserVersionlessAliasTargets.cmake lib/cmake/Qt6RepParser/Qt6RepParserVersionlessTargets.cmake %%QT_LIBDIR%%/libQt6RemoteObjects.prl %%QT_LIBDIR%%/libQt6RemoteObjects.so @@ -123,6 +126,7 @@ lib/cmake/Qt6RepParser/Qt6RepParserVersionlessTargets.cmake %%QT_QMLDIR%%/QtRemoteObjects/libdeclarative_remoteobjectsplugin.so %%QT_QMLDIR%%/QtRemoteObjects/plugins.qmltypes %%QT_QMLDIR%%/QtRemoteObjects/qmldir +%%QT_SBOMDIR%%/qtremoteobjects-%%FULLVER%%.spdx libdata/pkgconfig/Qt6RemoteObjects.pc libdata/pkgconfig/Qt6RemoteObjectsQml.pc libdata/pkgconfig/Qt6RepParser.pc diff --git a/devel/qt6-scxml/distinfo b/devel/qt6-scxml/distinfo index 798ca2b4c088..80f90b9f8a74 100644 --- a/devel/qt6-scxml/distinfo +++ b/devel/qt6-scxml/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1727500284 -SHA256 (KDE/Qt/6.7.3/qtscxml-everywhere-src-6.7.3.tar.xz) = 608febeb0dafb6fbf559e064dee779ab799441ed804267b534705ea5077eeda3 -SIZE (KDE/Qt/6.7.3/qtscxml-everywhere-src-6.7.3.tar.xz) = 1168340 +TIMESTAMP = 1733204953 +SHA256 (KDE/Qt/6.8.1/qtscxml-everywhere-src-6.8.1.tar.xz) = 2f406f44cfacd6eddb90468012a5d1d99d7a64ec05a21a2a7eda9dfc12614fd6 +SIZE (KDE/Qt/6.8.1/qtscxml-everywhere-src-6.8.1.tar.xz) = 558424 diff --git a/devel/qt6-scxml/pkg-plist b/devel/qt6-scxml/pkg-plist index 7dd6bbbe3228..52f21d451151 100644 --- a/devel/qt6-scxml/pkg-plist +++ b/devel/qt6-scxml/pkg-plist @@ -10,7 +10,6 @@ %%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/%%FULLVER%%/QtScxml/private/qtscxmlexports_p.h %%QT_INCDIR%%/QtScxml/QScxmlCompiler %%QT_INCDIR%%/QtScxml/QScxmlCppDataModel %%QT_INCDIR%%/QtScxml/QScxmlDataModel @@ -43,7 +42,6 @@ %%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 -%%QT_INCDIR%%/QtScxmlQml/%%FULLVER%%/QtScxmlQml/private/qtscxmlqmlexports_p.h %%QT_INCDIR%%/QtScxmlQml/%%FULLVER%%/QtScxmlQml/private/statemachineextended_p.h %%QT_INCDIR%%/QtScxmlQml/%%FULLVER%%/QtScxmlQml/private/statemachineloader_p.h %%QT_INCDIR%%/QtScxmlQml/QtScxmlQml @@ -93,7 +91,6 @@ %%QT_INCDIR%%/QtStateMachineQml/%%FULLVER%%/QtStateMachineQml/private/childrenprivate_p.h %%QT_INCDIR%%/QtStateMachineQml/%%FULLVER%%/QtStateMachineQml/private/finalstate_p.h %%QT_INCDIR%%/QtStateMachineQml/%%FULLVER%%/QtStateMachineQml/private/qstatemachineqmlglobals_p.h -%%QT_INCDIR%%/QtStateMachineQml/%%FULLVER%%/QtStateMachineQml/private/qtstatemachineqmlexports_p.h %%QT_INCDIR%%/QtStateMachineQml/%%FULLVER%%/QtStateMachineQml/private/signaltransition_p.h %%QT_INCDIR%%/QtStateMachineQml/%%FULLVER%%/QtStateMachineQml/private/state_p.h %%QT_INCDIR%%/QtStateMachineQml/%%FULLVER%%/QtStateMachineQml/private/statemachine_p.h @@ -132,6 +129,7 @@ lib/cmake/Qt6Scxml/Qt6ScxmlMacros.cmake lib/cmake/Qt6Scxml/Qt6ScxmlPlugins.cmake 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/Qt6ScxmlQml/Qt6ScxmlQmlAdditionalTargetInfo.cmake lib/cmake/Qt6ScxmlQml/Qt6ScxmlQmlConfig.cmake @@ -140,6 +138,7 @@ lib/cmake/Qt6ScxmlQml/Qt6ScxmlQmlConfigVersionImpl.cmake lib/cmake/Qt6ScxmlQml/Qt6ScxmlQmlDependencies.cmake 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/Qt6ScxmlTools/Qt6ScxmlToolsAdditionalTargetInfo.cmake lib/cmake/Qt6ScxmlTools/Qt6ScxmlToolsConfig.cmake @@ -156,6 +155,7 @@ lib/cmake/Qt6StateMachine/Qt6StateMachineConfigVersionImpl.cmake lib/cmake/Qt6StateMachine/Qt6StateMachineDependencies.cmake 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/Qt6StateMachineQml/Qt6StateMachineQmlAdditionalTargetInfo.cmake lib/cmake/Qt6StateMachineQml/Qt6StateMachineQmlConfig.cmake @@ -164,6 +164,7 @@ lib/cmake/Qt6StateMachineQml/Qt6StateMachineQmlConfigVersionImpl.cmake lib/cmake/Qt6StateMachineQml/Qt6StateMachineQmlDependencies.cmake lib/cmake/Qt6StateMachineQml/Qt6StateMachineQmlTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6StateMachineQml/Qt6StateMachineQmlTargets.cmake +lib/cmake/Qt6StateMachineQml/Qt6StateMachineQmlVersionlessAliasTargets.cmake lib/cmake/Qt6StateMachineQml/Qt6StateMachineQmlVersionlessTargets.cmake %%QT_LIBDIR%%/libQt6Scxml.prl %%QT_LIBDIR%%/libQt6Scxml.so @@ -201,6 +202,7 @@ lib/cmake/Qt6StateMachineQml/Qt6StateMachineQmlVersionlessTargets.cmake %%QT_QMLDIR%%/QtScxml/libdeclarative_scxmlplugin.so %%QT_QMLDIR%%/QtScxml/plugins.qmltypes %%QT_QMLDIR%%/QtScxml/qmldir +%%QT_SBOMDIR%%/qtscxml-%%FULLVER%%.spdx libdata/pkgconfig/Qt6Scxml.pc libdata/pkgconfig/Qt6ScxmlQml.pc libdata/pkgconfig/Qt6StateMachine.pc diff --git a/devel/qt6-tools/Makefile b/devel/qt6-tools/Makefile index e20f79d0f116..ac5626146844 100644 --- a/devel/qt6-tools/Makefile +++ b/devel/qt6-tools/Makefile @@ -3,11 +3,6 @@ DISTVERSION= ${QT6_VERSION} CATEGORIES= devel PKGNAMEPREFIX= qt6- -PATCH_SITES= https://github.com/qt/qttools/commit/ -PATCHFILES+= 687fc1601863ae7a67897bc3590b33bd3bdcc3bc.patch:-p1 -PATCHFILES+= 4a368a06afa5929d8674d2e94c2d7cbd6ad85d4e.patch:-p1 -PATCHFILES+= a2f478b20f369132de1e67b30716d5f070d7bf80.patch:-p1 - MAINTAINER= kde@FreeBSD.org COMMENT= Qt declarative framework for dynamic user interfaces @@ -15,7 +10,7 @@ BUILD_DEPENDS= ${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers LIB_DEPENDS= libxkbcommon.so:x11/libxkbcommon \ libzstd.so:archivers/zstd -USES= cmake compiler:c++17-lang gl llvm:lib,noexport python:build \ +USES= cmake compiler:c++17-lang gl llvm:min=17,lib,noexport python:build \ qt-dist:6 USE_GL= opengl USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} diff --git a/devel/qt6-tools/distinfo b/devel/qt6-tools/distinfo index e761169f1aeb..e1900f2ec7c7 100644 --- a/devel/qt6-tools/distinfo +++ b/devel/qt6-tools/distinfo @@ -1,9 +1,3 @@ -TIMESTAMP = 1728800066 -SHA256 (KDE/Qt/6.7.3/qttools-everywhere-src-6.7.3.tar.xz) = f03bb7df619cd9ac9dba110e30b7bcab5dd88eb8bdc9cc752563b4367233203f -SIZE (KDE/Qt/6.7.3/qttools-everywhere-src-6.7.3.tar.xz) = 9022820 -SHA256 (KDE/Qt/6.7.3/687fc1601863ae7a67897bc3590b33bd3bdcc3bc.patch) = 50de89291c6af06f8f3426939c0a08f99575f25d98693991a15a8550aef767a7 -SIZE (KDE/Qt/6.7.3/687fc1601863ae7a67897bc3590b33bd3bdcc3bc.patch) = 1442 -SHA256 (KDE/Qt/6.7.3/4a368a06afa5929d8674d2e94c2d7cbd6ad85d4e.patch) = e7407d7d0bfbcf385b09f354decd9dcec414979e509352553fb2b310c9b4621a -SIZE (KDE/Qt/6.7.3/4a368a06afa5929d8674d2e94c2d7cbd6ad85d4e.patch) = 4429 -SHA256 (KDE/Qt/6.7.3/a2f478b20f369132de1e67b30716d5f070d7bf80.patch) = edee150309c56f677b1131f8cb3d3895669943fbcb81668802af6b70e9e852a6 -SIZE (KDE/Qt/6.7.3/a2f478b20f369132de1e67b30716d5f070d7bf80.patch) = 3373 +TIMESTAMP = 1733204959 +SHA256 (KDE/Qt/6.8.1/qttools-everywhere-src-6.8.1.tar.xz) = 9d43d409be08b8681a0155a9c65114b69c9a3fc11aef6487bb7fdc5b283c432d +SIZE (KDE/Qt/6.8.1/qttools-everywhere-src-6.8.1.tar.xz) = 10293192 diff --git a/devel/qt6-tools/pkg-plist b/devel/qt6-tools/pkg-plist index ed028d34a528..b43594698111 100644 --- a/devel/qt6-tools/pkg-plist +++ b/devel/qt6-tools/pkg-plist @@ -186,11 +186,8 @@ bin/qtplugininfo6 %%QT_INCDIR%%/QtHelp/%%FULLVER%%/QtHelp/private/qfilternamedialog_p.h %%QT_INCDIR%%/QtHelp/%%FULLVER%%/QtHelp/private/qhelpcollectionhandler_p.h %%QT_INCDIR%%/QtHelp/%%FULLVER%%/QtHelp/private/qhelpdbreader_p.h -%%QT_INCDIR%%/QtHelp/%%FULLVER%%/QtHelp/private/qhelpengine_p.h -%%QT_INCDIR%%/QtHelp/%%FULLVER%%/QtHelp/private/qhelpfiltersettings_p.h -%%QT_INCDIR%%/QtHelp/%%FULLVER%%/QtHelp/private/qhelpsearchindexreader_default_p.h %%QT_INCDIR%%/QtHelp/%%FULLVER%%/QtHelp/private/qhelpsearchindexreader_p.h -%%QT_INCDIR%%/QtHelp/%%FULLVER%%/QtHelp/private/qhelpsearchindexwriter_default_p.h +%%QT_INCDIR%%/QtHelp/%%FULLVER%%/QtHelp/private/qhelpsearchindexwriter_p.h %%QT_INCDIR%%/QtHelp/%%FULLVER%%/QtHelp/private/qoptionswidget_p.h %%QT_INCDIR%%/QtHelp/QCompressedHelpInfo %%QT_INCDIR%%/QtHelp/QHelpContentItem @@ -206,6 +203,7 @@ bin/qtplugininfo6 %%QT_INCDIR%%/QtHelp/QHelpIndexWidget %%QT_INCDIR%%/QtHelp/QHelpLink %%QT_INCDIR%%/QtHelp/QHelpSearchEngine +%%QT_INCDIR%%/QtHelp/QHelpSearchEngineCore %%QT_INCDIR%%/QtHelp/QHelpSearchQuery %%QT_INCDIR%%/QtHelp/QHelpSearchQueryWidget %%QT_INCDIR%%/QtHelp/QHelpSearchResult @@ -215,6 +213,7 @@ bin/qtplugininfo6 %%QT_INCDIR%%/QtHelp/QtHelpVersion %%QT_INCDIR%%/QtHelp/qcompressedhelpinfo.h %%QT_INCDIR%%/QtHelp/qhelp_global.h +%%QT_INCDIR%%/QtHelp/qhelpcontentitem.h %%QT_INCDIR%%/QtHelp/qhelpcontentwidget.h %%QT_INCDIR%%/QtHelp/qhelpengine.h %%QT_INCDIR%%/QtHelp/qhelpenginecore.h @@ -224,7 +223,9 @@ bin/qtplugininfo6 %%QT_INCDIR%%/QtHelp/qhelpindexwidget.h %%QT_INCDIR%%/QtHelp/qhelplink.h %%QT_INCDIR%%/QtHelp/qhelpsearchengine.h +%%QT_INCDIR%%/QtHelp/qhelpsearchenginecore.h %%QT_INCDIR%%/QtHelp/qhelpsearchquerywidget.h +%%QT_INCDIR%%/QtHelp/qhelpsearchresult.h %%QT_INCDIR%%/QtHelp/qhelpsearchresultwidget.h %%QT_INCDIR%%/QtHelp/qthelpversion.h %%QT_INCDIR%%/QtQDocCatch/QtQDocCatchDepends @@ -279,6 +280,7 @@ lib/cmake/Qt6Designer/Qt6DesignerDependencies.cmake lib/cmake/Qt6Designer/Qt6DesignerPlugins.cmake lib/cmake/Qt6Designer/Qt6DesignerTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6Designer/Qt6DesignerTargets.cmake +lib/cmake/Qt6Designer/Qt6DesignerVersionlessAliasTargets.cmake lib/cmake/Qt6Designer/Qt6DesignerVersionlessTargets.cmake lib/cmake/Qt6Designer/Qt6QQuickWidgetPluginAdditionalTargetInfo.cmake lib/cmake/Qt6Designer/Qt6QQuickWidgetPluginConfig.cmake @@ -293,14 +295,17 @@ lib/cmake/Qt6DesignerComponentsPrivate/Qt6DesignerComponentsPrivateConfigVersion lib/cmake/Qt6DesignerComponentsPrivate/Qt6DesignerComponentsPrivateDependencies.cmake lib/cmake/Qt6DesignerComponentsPrivate/Qt6DesignerComponentsPrivateTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6DesignerComponentsPrivate/Qt6DesignerComponentsPrivateTargets.cmake +lib/cmake/Qt6DesignerComponentsPrivate/Qt6DesignerComponentsPrivateVersionlessAliasTargets.cmake lib/cmake/Qt6DesignerComponentsPrivate/Qt6DesignerComponentsPrivateVersionlessTargets.cmake lib/cmake/Qt6Help/Qt6HelpAdditionalTargetInfo.cmake lib/cmake/Qt6Help/Qt6HelpConfig.cmake lib/cmake/Qt6Help/Qt6HelpConfigVersion.cmake lib/cmake/Qt6Help/Qt6HelpConfigVersionImpl.cmake lib/cmake/Qt6Help/Qt6HelpDependencies.cmake +lib/cmake/Qt6Help/Qt6HelpPlugins.cmake 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/Qt6Linguist/Qt6LinguistAdditionalTargetInfo.cmake lib/cmake/Qt6Linguist/Qt6LinguistConfig.cmake @@ -308,6 +313,7 @@ lib/cmake/Qt6Linguist/Qt6LinguistConfigVersion.cmake lib/cmake/Qt6Linguist/Qt6LinguistConfigVersionImpl.cmake lib/cmake/Qt6Linguist/Qt6LinguistDependencies.cmake lib/cmake/Qt6Linguist/Qt6LinguistTargets.cmake +lib/cmake/Qt6Linguist/Qt6LinguistVersionlessAliasTargets.cmake lib/cmake/Qt6Linguist/Qt6LinguistVersionlessTargets.cmake lib/cmake/Qt6LinguistTools/GenerateLUpdateProject.cmake lib/cmake/Qt6LinguistTools/Qt6LinguistToolsAdditionalTargetInfo.cmake @@ -324,18 +330,21 @@ lib/cmake/Qt6QDocCatchConversionsPrivate/Qt6QDocCatchConversionsPrivateConfig.cm lib/cmake/Qt6QDocCatchConversionsPrivate/Qt6QDocCatchConversionsPrivateConfigVersion.cmake lib/cmake/Qt6QDocCatchConversionsPrivate/Qt6QDocCatchConversionsPrivateConfigVersionImpl.cmake lib/cmake/Qt6QDocCatchConversionsPrivate/Qt6QDocCatchConversionsPrivateTargets.cmake +lib/cmake/Qt6QDocCatchConversionsPrivate/Qt6QDocCatchConversionsPrivateVersionlessAliasTargets.cmake lib/cmake/Qt6QDocCatchConversionsPrivate/Qt6QDocCatchConversionsPrivateVersionlessTargets.cmake lib/cmake/Qt6QDocCatchGeneratorsPrivate/Qt6QDocCatchGeneratorsPrivateAdditionalTargetInfo.cmake lib/cmake/Qt6QDocCatchGeneratorsPrivate/Qt6QDocCatchGeneratorsPrivateConfig.cmake lib/cmake/Qt6QDocCatchGeneratorsPrivate/Qt6QDocCatchGeneratorsPrivateConfigVersion.cmake lib/cmake/Qt6QDocCatchGeneratorsPrivate/Qt6QDocCatchGeneratorsPrivateConfigVersionImpl.cmake lib/cmake/Qt6QDocCatchGeneratorsPrivate/Qt6QDocCatchGeneratorsPrivateTargets.cmake +lib/cmake/Qt6QDocCatchGeneratorsPrivate/Qt6QDocCatchGeneratorsPrivateVersionlessAliasTargets.cmake lib/cmake/Qt6QDocCatchGeneratorsPrivate/Qt6QDocCatchGeneratorsPrivateVersionlessTargets.cmake lib/cmake/Qt6QDocCatchPrivate/Qt6QDocCatchPrivateAdditionalTargetInfo.cmake lib/cmake/Qt6QDocCatchPrivate/Qt6QDocCatchPrivateConfig.cmake lib/cmake/Qt6QDocCatchPrivate/Qt6QDocCatchPrivateConfigVersion.cmake lib/cmake/Qt6QDocCatchPrivate/Qt6QDocCatchPrivateConfigVersionImpl.cmake lib/cmake/Qt6QDocCatchPrivate/Qt6QDocCatchPrivateTargets.cmake +lib/cmake/Qt6QDocCatchPrivate/Qt6QDocCatchPrivateVersionlessAliasTargets.cmake lib/cmake/Qt6QDocCatchPrivate/Qt6QDocCatchPrivateVersionlessTargets.cmake lib/cmake/Qt6Tools/Qt6ToolsAdditionalTargetInfo.cmake lib/cmake/Qt6Tools/Qt6ToolsConfig.cmake @@ -343,6 +352,7 @@ lib/cmake/Qt6Tools/Qt6ToolsConfigVersion.cmake lib/cmake/Qt6Tools/Qt6ToolsConfigVersionImpl.cmake lib/cmake/Qt6Tools/Qt6ToolsDependencies.cmake lib/cmake/Qt6Tools/Qt6ToolsTargets.cmake +lib/cmake/Qt6Tools/Qt6ToolsVersionlessAliasTargets.cmake lib/cmake/Qt6Tools/Qt6ToolsVersionlessTargets.cmake lib/cmake/Qt6ToolsTools/Qt6ToolsToolsAdditionalTargetInfo.cmake lib/cmake/Qt6ToolsTools/Qt6ToolsToolsConfig.cmake @@ -358,6 +368,7 @@ lib/cmake/Qt6UiPlugin/Qt6UiPluginConfigVersion.cmake lib/cmake/Qt6UiPlugin/Qt6UiPluginConfigVersionImpl.cmake lib/cmake/Qt6UiPlugin/Qt6UiPluginDependencies.cmake lib/cmake/Qt6UiPlugin/Qt6UiPluginTargets.cmake +lib/cmake/Qt6UiPlugin/Qt6UiPluginVersionlessAliasTargets.cmake lib/cmake/Qt6UiPlugin/Qt6UiPluginVersionlessTargets.cmake lib/cmake/Qt6UiTools/Qt6UiToolsAdditionalTargetInfo.cmake lib/cmake/Qt6UiTools/Qt6UiToolsConfig.cmake @@ -366,6 +377,7 @@ lib/cmake/Qt6UiTools/Qt6UiToolsConfigVersionImpl.cmake lib/cmake/Qt6UiTools/Qt6UiToolsDependencies.cmake lib/cmake/Qt6UiTools/Qt6UiToolsTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6UiTools/Qt6UiToolsTargets.cmake +lib/cmake/Qt6UiTools/Qt6UiToolsVersionlessAliasTargets.cmake lib/cmake/Qt6UiTools/Qt6UiToolsVersionlessTargets.cmake %%QT_BINDIR%%/assistant %%QT_BINDIR%%/designer @@ -415,6 +427,7 @@ lib/cmake/Qt6UiTools/Qt6UiToolsVersionlessTargets.cmake %%QT_MKSPECDIR%%/modules/qt_lib_uitools.pri %%QT_MKSPECDIR%%/modules/qt_lib_uitools_private.pri %%QT_PLUGINDIR%%/designer/libqquickwidget.so +%%QT_SBOMDIR%%/qttools-%%FULLVER%%.spdx libdata/pkgconfig/Qt6Designer.pc libdata/pkgconfig/Qt6Help.pc libdata/pkgconfig/Qt6Linguist.pc diff --git a/devel/qt6-translations/distinfo b/devel/qt6-translations/distinfo index 9ee4f527ada1..09afe063edc3 100644 --- a/devel/qt6-translations/distinfo +++ b/devel/qt6-translations/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1727500286 -SHA256 (KDE/Qt/6.7.3/qttranslations-everywhere-src-6.7.3.tar.xz) = dcc762acac043b9bb5e4d369b6d6f53e0ecfcf76a408fe0db5f7ef071c9d6dc8 -SIZE (KDE/Qt/6.7.3/qttranslations-everywhere-src-6.7.3.tar.xz) = 1547944 +TIMESTAMP = 1733204961 +SHA256 (KDE/Qt/6.8.1/qttranslations-everywhere-src-6.8.1.tar.xz) = 635a6093e99152243b807de51077485ceadd4786d4acb135b9340b2303035a4a +SIZE (KDE/Qt/6.8.1/qttranslations-everywhere-src-6.8.1.tar.xz) = 1550288 diff --git a/devel/shiboken6/Makefile b/devel/shiboken6/Makefile index cc180355b098..5aeb2fde8f17 100644 --- a/devel/shiboken6/Makefile +++ b/devel/shiboken6/Makefile @@ -3,7 +3,11 @@ DISTVERSION= ${PYSIDE6_VERSION} CATEGORIES= devel MASTER_SITES= QT/official_releases/QtForPython/${PORTNAME}/PySide6-${DISTVERSION}-src PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -DISTNAME= pyside-setup-everywhere-src-${DISTVERSION} +DISTNAME= pyside-setup-everywhere-src-${DISTVERSION:R} +DIST_SUBDIR= KDE/Qt/${PYSIDE6_VERSION} + +PATCH_SITES= https://github.com/pyside/pyside-setup/commit/ +PATCHFILES+= dfe3819559ed1e04089f9d5bc009268a7b48b7c2.patch:-p3 # Fix signature handling for 32-bit MAINTAINER= kde@FreeBSD.org COMMENT= Python binding generator for C++ libraries @@ -14,22 +18,24 @@ LICENSE_COMB= multi LIB_DEPENDS= libxslt.so:textproc/libxslt -USES= cmake compiler:c++17-lang gnome llvm:lib,noexport pathfix \ +USES= cmake compiler:c++17-lang gnome llvm:lib,min=17,noexport pathfix \ python qt:6 tar:xz USE_GNOME= libxml2 USE_LDCONFIG= yes USE_PYTHON= flavors USE_QT= base -CONFIGURE_ENV= LLVM_INSTALL_DIR="${LLVM_PREFIX}/lib/cmake/llvm" CMAKE_ARGS= -DClang_DIR:PATH="${LLVM_PREFIX}/lib/cmake/clang" \ -DLLVM_DIR:PATH="${LLVM_PREFIX}/lib/cmake/llvm" \ -DCMAKE_CXX_STANDARD_LIBRARIES=-lexecinfo \ -DUSE_PYTHON_VERSION=${PYTHON_VER} \ -DBUILD_TESTS:BOOL=false +CONFIGURE_ENV= LLVM_INSTALL_DIR="${LLVM_PREFIX}/lib/cmake/llvm" WRKSRC_SUBDIR= sources/shiboken6 -PLIST_SUB= DISTVERSION=${DISTVERSION} +PLIST_SUB= PYTHON_MAJOR_VER=${PYTHON_MAJOR_VER} \ + SHLIB_VER=${DISTVERSION:R:R} \ + SHLIB_VERSION=${DISTVERSION} OPTIONS_DEFINE= DOCS NUMPY OPTIONS_DEFAULT= NUMPY diff --git a/devel/shiboken6/distinfo b/devel/shiboken6/distinfo index d05b048afb54..890feb7e748e 100644 --- a/devel/shiboken6/distinfo +++ b/devel/shiboken6/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1727499878 -SHA256 (pyside-setup-everywhere-src-6.7.3.tar.xz) = a4c414be013d5051a2d10a9a1151e686488a3172c08a57461ea04b0a0ab74e09 -SIZE (pyside-setup-everywhere-src-6.7.3.tar.xz) = 14591496 +TIMESTAMP = 1734031404 +SHA256 (KDE/Qt/6.8.0.2/pyside-setup-everywhere-src-6.8.0.tar.xz) = 1a1a219a8f327e340d258275fad3a9f261b8f04bc57041747e73dd6ad252b4e1 +SIZE (KDE/Qt/6.8.0.2/pyside-setup-everywhere-src-6.8.0.tar.xz) = 14646216 +SHA256 (KDE/Qt/6.8.0.2/dfe3819559ed1e04089f9d5bc009268a7b48b7c2.patch) = 16ad2512a5516fdf3484bedd59a700396429ba99f5cf897566174c8e25bc3d9e +SIZE (KDE/Qt/6.8.0.2/dfe3819559ed1e04089f9d5bc009268a7b48b7c2.patch) = 6314 diff --git a/devel/shiboken6/pkg-plist b/devel/shiboken6/pkg-plist index 579d15768358..4648ae51d5a5 100644 --- a/devel/shiboken6/pkg-plist +++ b/devel/shiboken6/pkg-plist @@ -34,7 +34,7 @@ include/shiboken6/signature.h include/shiboken6/signature_p.h include/shiboken6/threadstatesaver.h include/shiboken6/voidptr.h -lib/cmake/Shiboken6/Shiboken6Config.abi3.cmake +lib/cmake/Shiboken6/Shiboken6Config.abi%%PYTHON_MAJOR_VER%%.cmake lib/cmake/Shiboken6/Shiboken6Config.cmake lib/cmake/Shiboken6/Shiboken6ConfigVersion.cmake lib/cmake/Shiboken6/Shiboken6Targets-%%CMAKE_BUILD_TYPE%%.cmake @@ -44,10 +44,10 @@ lib/cmake/Shiboken6Tools/Shiboken6ToolsConfig.cmake lib/cmake/Shiboken6Tools/Shiboken6ToolsConfigVersion.cmake lib/cmake/Shiboken6Tools/Shiboken6ToolsTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Shiboken6Tools/Shiboken6ToolsTargets.cmake -lib/libshiboken6.abi3.so -lib/libshiboken6.abi3.so.6.7 -lib/libshiboken6.abi3.so.%%DISTVERSION%% -%%PYTHON_SITELIBDIR%%/shiboken6/Shiboken.abi3.so +lib/libshiboken6.abi%%PYTHON_MAJOR_VER%%.so +lib/libshiboken6.abi%%PYTHON_MAJOR_VER%%.so.%%SHLIB_VER%% +lib/libshiboken6.abi%%PYTHON_MAJOR_VER%%.so.%%SHLIB_VERSION%% +%%PYTHON_SITELIBDIR%%/shiboken6/Shiboken.abi%%PYTHON_MAJOR_VER%%.so %%PYTHON_SITELIBDIR%%/shiboken6/Shiboken.pyi %%PYTHON_SITELIBDIR%%/shiboken6/__init__.py %%PYTHON_SITELIBDIR%%/shiboken6/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc diff --git a/graphics/py-qt6-3d/Makefile b/graphics/py-qt6-3d/Makefile index c9c55e4b0e89..7e6e476a7f01 100644 --- a/graphics/py-qt6-3d/Makefile +++ b/graphics/py-qt6-3d/Makefile @@ -1,6 +1,5 @@ PORTNAME= 3d DISTVERSION= ${PYQT3D_VERSION} -PORTREVISION= 1 CATEGORIES= graphics python MASTER_SITES= ${MASTER_SITES_PYQT3D} PKGNAMEPREFIX= ${PYQT_PY_RELNAME}- diff --git a/graphics/py-qt6-3d/distinfo b/graphics/py-qt6-3d/distinfo index bd44753804ba..8b6fccffefd7 100644 --- a/graphics/py-qt6-3d/distinfo +++ b/graphics/py-qt6-3d/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1714271985 -SHA256 (PyQt6_3D-6.7.0.tar.gz) = 3e99bfc801918ab4758dd2660b2d2358e0057c943eb2bd9f8d0ddf156ea5ccd7 -SIZE (PyQt6_3D-6.7.0.tar.gz) = 7469641 +TIMESTAMP = 1733628639 +SHA256 (PyQt6_3D-6.8.0.tar.gz) = f62790a787cfc99fcd84c774fa952b83c877dd2175355a3a6609d37fe1a1c7a3 +SIZE (PyQt6_3D-6.8.0.tar.gz) = 7469509 diff --git a/graphics/qt6-3d/distinfo b/graphics/qt6-3d/distinfo index b62343dde110..c0904368cfec 100644 --- a/graphics/qt6-3d/distinfo +++ b/graphics/qt6-3d/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1727500288 -SHA256 (KDE/Qt/6.7.3/qt3d-everywhere-src-6.7.3.tar.xz) = 45d48c374a901d0ce94aa9b784cf632a4cebd14d3a14ab399d243136596bb694 -SIZE (KDE/Qt/6.7.3/qt3d-everywhere-src-6.7.3.tar.xz) = 141600080 +TIMESTAMP = 1733205017 +SHA256 (KDE/Qt/6.8.1/qt3d-everywhere-src-6.8.1.tar.xz) = 08b006871b7bad92597c6b588ca921f630131e579e25079e49c0b34c0d7c4236 +SIZE (KDE/Qt/6.8.1/qt3d-everywhere-src-6.8.1.tar.xz) = 141818588 diff --git a/graphics/qt6-3d/pkg-plist b/graphics/qt6-3d/pkg-plist index 4602fc62ce75..17056fefcc4e 100644 --- a/graphics/qt6-3d/pkg-plist +++ b/graphics/qt6-3d/pkg-plist @@ -115,6 +115,7 @@ %%QT_INCDIR%%/Qt3DAnimation/qmorphtarget.h %%QT_INCDIR%%/Qt3DAnimation/qskeletonmapping.h %%QT_INCDIR%%/Qt3DAnimation/qt3danimation_global.h +%%QT_INCDIR%%/Qt3DAnimation/qt3danimationexports.h %%QT_INCDIR%%/Qt3DAnimation/qt3danimationversion.h %%QT_INCDIR%%/Qt3DAnimation/qvertexblendanimation.h %%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/aligned_malloc_p.h @@ -125,8 +126,8 @@ %%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/corelogging_p.h %%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/coresettings_p.h %%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/job_common_p.h -%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/matrix4x4_p.h %%SIMD%%%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/matrix4x4_avx2_p.h +%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/matrix4x4_p.h %%SIMD%%%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/matrix4x4_sse_p.h %%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/nullservices_p.h %%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/propertychangehandler_p.h @@ -246,6 +247,7 @@ %%QT_INCDIR%%/Qt3DCore/qskeletonloader.h %%QT_INCDIR%%/Qt3DCore/qt3dcore-config.h %%QT_INCDIR%%/Qt3DCore/qt3dcore_global.h +%%QT_INCDIR%%/Qt3DCore/qt3dcoreexports.h %%QT_INCDIR%%/Qt3DCore/qt3dcoreversion.h %%QT_INCDIR%%/Qt3DCore/qtransform.h %%QT_INCDIR%%/Qt3DExtras/%%FULLVER%%/Qt3DExtras/private/areaallocator_p.h @@ -372,6 +374,7 @@ %%QT_INCDIR%%/Qt3DExtras/qspritesheet.h %%QT_INCDIR%%/Qt3DExtras/qspritesheetitem.h %%QT_INCDIR%%/Qt3DExtras/qt3dextras_global.h +%%QT_INCDIR%%/Qt3DExtras/qt3dextrasexports.h %%QT_INCDIR%%/Qt3DExtras/qt3dextrasversion.h %%QT_INCDIR%%/Qt3DExtras/qt3dwindow.h %%QT_INCDIR%%/Qt3DExtras/qtext2dentity.h @@ -490,6 +493,7 @@ %%QT_INCDIR%%/Qt3DInput/qmouseevent.h %%QT_INCDIR%%/Qt3DInput/qmousehandler.h %%QT_INCDIR%%/Qt3DInput/qt3dinput_global.h +%%QT_INCDIR%%/Qt3DInput/qt3dinputexports.h %%QT_INCDIR%%/Qt3DInput/qt3dinputversion.h %%QT_INCDIR%%/Qt3DLogic/%%FULLVER%%/Qt3DLogic/private/callbackjob_p.h %%QT_INCDIR%%/Qt3DLogic/%%FULLVER%%/Qt3DLogic/private/executor_p.h @@ -508,6 +512,7 @@ %%QT_INCDIR%%/Qt3DLogic/qframeaction.h %%QT_INCDIR%%/Qt3DLogic/qlogicaspect.h %%QT_INCDIR%%/Qt3DLogic/qt3dlogic_global.h +%%QT_INCDIR%%/Qt3DLogic/qt3dlogicexports.h %%QT_INCDIR%%/Qt3DLogic/qt3dlogicversion.h %%QT_INCDIR%%/Qt3DQuick/%%FULLVER%%/Qt3DQuick/private/qqmlaspectengine_p.h %%QT_INCDIR%%/Qt3DQuick/%%FULLVER%%/Qt3DQuick/private/qquaternionanimation_p.h @@ -529,6 +534,7 @@ %%QT_INCDIR%%/Qt3DQuick/Qt3DQuickVersion %%QT_INCDIR%%/Qt3DQuick/qqmlaspectengine.h %%QT_INCDIR%%/Qt3DQuick/qt3dquick_global.h +%%QT_INCDIR%%/Qt3DQuick/qt3dquickexports.h %%QT_INCDIR%%/Qt3DQuick/qt3dquickversion.h %%QT_INCDIR%%/Qt3DQuickAnimation/%%FULLVER%%/Qt3DQuickAnimation/private/qt3dquickanimation_global_p.h %%QT_INCDIR%%/Qt3DQuickAnimation/%%FULLVER%%/Qt3DQuickAnimation/private/qt3dquickanimationnodefactory_p.h @@ -543,6 +549,7 @@ %%QT_INCDIR%%/Qt3DQuickAnimation/Qt3DQuickAnimationDepends %%QT_INCDIR%%/Qt3DQuickAnimation/Qt3DQuickAnimationVersion %%QT_INCDIR%%/Qt3DQuickAnimation/qt3dquickanimation_global.h +%%QT_INCDIR%%/Qt3DQuickAnimation/qt3dquickanimationexports.h %%QT_INCDIR%%/Qt3DQuickAnimation/qt3dquickanimationversion.h %%QT_INCDIR%%/Qt3DQuickExtras/%%FULLVER%%/Qt3DQuickExtras/private/qt3dquickextras_global_p.h %%QT_INCDIR%%/Qt3DQuickExtras/%%FULLVER%%/Qt3DQuickExtras/private/qt3dquickextrasnodefactory_p.h @@ -556,6 +563,7 @@ %%QT_INCDIR%%/Qt3DQuickExtras/Qt3DQuickExtrasVersion %%QT_INCDIR%%/Qt3DQuickExtras/Qt3DQuickWindow %%QT_INCDIR%%/Qt3DQuickExtras/qt3dquickextras_global.h +%%QT_INCDIR%%/Qt3DQuickExtras/qt3dquickextrasexports.h %%QT_INCDIR%%/Qt3DQuickExtras/qt3dquickextrasversion.h %%QT_INCDIR%%/Qt3DQuickExtras/qt3dquickwindow.h %%QT_INCDIR%%/Qt3DQuickInput/%%FULLVER%%/Qt3DQuickInput/private/qt3dquickinput_global_p.h @@ -570,7 +578,9 @@ %%QT_INCDIR%%/Qt3DQuickInput/Qt3DQuickInputDepends %%QT_INCDIR%%/Qt3DQuickInput/Qt3DQuickInputVersion %%QT_INCDIR%%/Qt3DQuickInput/qt3dquickinput_global.h +%%QT_INCDIR%%/Qt3DQuickInput/qt3dquickinputexports.h %%QT_INCDIR%%/Qt3DQuickInput/qt3dquickinputversion.h +%%QT_INCDIR%%/Qt3DQuickRender/%%FULLVER%%/Qt3DQuickRender/private/qt3dquick3drenderforeign_p.h %%QT_INCDIR%%/Qt3DQuickRender/%%FULLVER%%/Qt3DQuickRender/private/qt3dquickrender_global_p.h %%QT_INCDIR%%/Qt3DQuickRender/%%FULLVER%%/Qt3DQuickRender/private/qt3dquickrendernodefactory_p.h %%QT_INCDIR%%/Qt3DQuickRender/%%FULLVER%%/Qt3DQuickRender/private/quick3deffect_p.h @@ -598,6 +608,7 @@ %%QT_INCDIR%%/Qt3DQuickRender/Qt3DQuickRenderDepends %%QT_INCDIR%%/Qt3DQuickRender/Qt3DQuickRenderVersion %%QT_INCDIR%%/Qt3DQuickRender/qt3dquickrender_global.h +%%QT_INCDIR%%/Qt3DQuickRender/qt3dquickrenderexports.h %%QT_INCDIR%%/Qt3DQuickRender/qt3dquickrenderversion.h %%QT_INCDIR%%/Qt3DQuickScene2D/%%FULLVER%%/Qt3DQuickScene2D/private/qscene2d_p.h %%QT_INCDIR%%/Qt3DQuickScene2D/%%FULLVER%%/Qt3DQuickScene2D/private/qt3dquick3dscene2d_p.h @@ -614,7 +625,19 @@ %%QT_INCDIR%%/Qt3DQuickScene2D/Qt3DQuickScene2DVersion %%QT_INCDIR%%/Qt3DQuickScene2D/qscene2d.h %%QT_INCDIR%%/Qt3DQuickScene2D/qt3dquickscene2d_global.h +%%QT_INCDIR%%/Qt3DQuickScene2D/qt3dquickscene2dexports.h %%QT_INCDIR%%/Qt3DQuickScene2D/qt3dquickscene2dversion.h +%%QT_INCDIR%%/Qt3DQuickScene3D/%%FULLVER%%/Qt3DQuickScene3D/private/scene3ditem_p.h +%%QT_INCDIR%%/Qt3DQuickScene3D/%%FULLVER%%/Qt3DQuickScene3D/private/scene3dlogging_p.h +%%QT_INCDIR%%/Qt3DQuickScene3D/%%FULLVER%%/Qt3DQuickScene3D/private/scene3drenderer_p.h +%%QT_INCDIR%%/Qt3DQuickScene3D/%%FULLVER%%/Qt3DQuickScene3D/private/scene3dsgmaterial_p.h +%%QT_INCDIR%%/Qt3DQuickScene3D/%%FULLVER%%/Qt3DQuickScene3D/private/scene3dsgmaterialshader_p.h +%%QT_INCDIR%%/Qt3DQuickScene3D/%%FULLVER%%/Qt3DQuickScene3D/private/scene3dsgnode_p.h +%%QT_INCDIR%%/Qt3DQuickScene3D/Qt3DQuickScene3D +%%QT_INCDIR%%/Qt3DQuickScene3D/Qt3DQuickScene3DDepends +%%QT_INCDIR%%/Qt3DQuickScene3D/Qt3DQuickScene3DVersion +%%QT_INCDIR%%/Qt3DQuickScene3D/qt3dquickscene3dexports.h +%%QT_INCDIR%%/Qt3DQuickScene3D/qt3dquickscene3dversion.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/abstractpickingjob_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/abstractrenderer_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/apishadermanager_p.h @@ -1072,6 +1095,7 @@ %%QT_INCDIR%%/Qt3DRender/qsubtreeenabler.h %%QT_INCDIR%%/Qt3DRender/qt3drender-config.h %%QT_INCDIR%%/Qt3DRender/qt3drender_global.h +%%QT_INCDIR%%/Qt3DRender/qt3drenderexports.h %%QT_INCDIR%%/Qt3DRender/qt3drenderversion.h %%QT_INCDIR%%/Qt3DRender/qtechnique.h %%QT_INCDIR%%/Qt3DRender/qtechniquefilter.h @@ -1092,6 +1116,7 @@ lib/cmake/Qt63DAnimation/Qt63DAnimationConfigVersionImpl.cmake lib/cmake/Qt63DAnimation/Qt63DAnimationDependencies.cmake 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/Qt63DCore/Qt63DCoreAdditionalTargetInfo.cmake lib/cmake/Qt63DCore/Qt63DCoreConfig.cmake @@ -1100,6 +1125,7 @@ lib/cmake/Qt63DCore/Qt63DCoreConfigVersionImpl.cmake lib/cmake/Qt63DCore/Qt63DCoreDependencies.cmake 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/Qt63DExtras/Qt63DExtrasAdditionalTargetInfo.cmake lib/cmake/Qt63DExtras/Qt63DExtrasConfig.cmake @@ -1108,6 +1134,7 @@ lib/cmake/Qt63DExtras/Qt63DExtrasConfigVersionImpl.cmake lib/cmake/Qt63DExtras/Qt63DExtrasDependencies.cmake 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/Qt63DInput/Qt63DInputAdditionalTargetInfo.cmake lib/cmake/Qt63DInput/Qt63DInputConfig.cmake @@ -1117,6 +1144,7 @@ lib/cmake/Qt63DInput/Qt63DInputDependencies.cmake lib/cmake/Qt63DInput/Qt63DInputPlugins.cmake 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/Qt63DLogic/Qt63DLogicAdditionalTargetInfo.cmake lib/cmake/Qt63DLogic/Qt63DLogicConfig.cmake @@ -1125,6 +1153,7 @@ lib/cmake/Qt63DLogic/Qt63DLogicConfigVersionImpl.cmake lib/cmake/Qt63DLogic/Qt63DLogicDependencies.cmake 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/Qt63DQuick/Qt63DQuickAdditionalTargetInfo.cmake lib/cmake/Qt63DQuick/Qt63DQuickConfig.cmake @@ -1133,6 +1162,7 @@ lib/cmake/Qt63DQuick/Qt63DQuickConfigVersionImpl.cmake lib/cmake/Qt63DQuick/Qt63DQuickDependencies.cmake lib/cmake/Qt63DQuick/Qt63DQuickTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt63DQuick/Qt63DQuickTargets.cmake +lib/cmake/Qt63DQuick/Qt63DQuickVersionlessAliasTargets.cmake lib/cmake/Qt63DQuick/Qt63DQuickVersionlessTargets.cmake lib/cmake/Qt63DQuickAnimation/Qt63DQuickAnimationAdditionalTargetInfo.cmake lib/cmake/Qt63DQuickAnimation/Qt63DQuickAnimationConfig.cmake @@ -1141,6 +1171,7 @@ lib/cmake/Qt63DQuickAnimation/Qt63DQuickAnimationConfigVersionImpl.cmake lib/cmake/Qt63DQuickAnimation/Qt63DQuickAnimationDependencies.cmake lib/cmake/Qt63DQuickAnimation/Qt63DQuickAnimationTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt63DQuickAnimation/Qt63DQuickAnimationTargets.cmake +lib/cmake/Qt63DQuickAnimation/Qt63DQuickAnimationVersionlessAliasTargets.cmake lib/cmake/Qt63DQuickAnimation/Qt63DQuickAnimationVersionlessTargets.cmake lib/cmake/Qt63DQuickExtras/Qt63DQuickExtrasAdditionalTargetInfo.cmake lib/cmake/Qt63DQuickExtras/Qt63DQuickExtrasConfig.cmake @@ -1149,6 +1180,7 @@ lib/cmake/Qt63DQuickExtras/Qt63DQuickExtrasConfigVersionImpl.cmake lib/cmake/Qt63DQuickExtras/Qt63DQuickExtrasDependencies.cmake 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/Qt63DQuickInput/Qt63DQuickInputAdditionalTargetInfo.cmake lib/cmake/Qt63DQuickInput/Qt63DQuickInputConfig.cmake @@ -1157,6 +1189,7 @@ lib/cmake/Qt63DQuickInput/Qt63DQuickInputConfigVersionImpl.cmake lib/cmake/Qt63DQuickInput/Qt63DQuickInputDependencies.cmake 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/Qt63DQuickRender/Qt63DQuickRenderAdditionalTargetInfo.cmake lib/cmake/Qt63DQuickRender/Qt63DQuickRenderConfig.cmake @@ -1165,6 +1198,7 @@ lib/cmake/Qt63DQuickRender/Qt63DQuickRenderConfigVersionImpl.cmake lib/cmake/Qt63DQuickRender/Qt63DQuickRenderDependencies.cmake 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/Qt63DQuickScene2D/Qt63DQuickScene2DAdditionalTargetInfo.cmake lib/cmake/Qt63DQuickScene2D/Qt63DQuickScene2DConfig.cmake @@ -1173,7 +1207,17 @@ lib/cmake/Qt63DQuickScene2D/Qt63DQuickScene2DConfigVersionImpl.cmake lib/cmake/Qt63DQuickScene2D/Qt63DQuickScene2DDependencies.cmake 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/Qt63DQuickScene3D/Qt63DQuickScene3DAdditionalTargetInfo.cmake +lib/cmake/Qt63DQuickScene3D/Qt63DQuickScene3DConfig.cmake +lib/cmake/Qt63DQuickScene3D/Qt63DQuickScene3DConfigVersion.cmake +lib/cmake/Qt63DQuickScene3D/Qt63DQuickScene3DConfigVersionImpl.cmake +lib/cmake/Qt63DQuickScene3D/Qt63DQuickScene3DDependencies.cmake +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/Qt63DRender/Qt63DRenderAdditionalTargetInfo.cmake lib/cmake/Qt63DRender/Qt63DRenderConfig.cmake lib/cmake/Qt63DRender/Qt63DRenderConfigVersion.cmake @@ -1182,6 +1226,7 @@ lib/cmake/Qt63DRender/Qt63DRenderDependencies.cmake lib/cmake/Qt63DRender/Qt63DRenderPlugins.cmake lib/cmake/Qt63DRender/Qt63DRenderTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt63DRender/Qt63DRenderTargets.cmake +lib/cmake/Qt63DRender/Qt63DRenderVersionlessAliasTargets.cmake lib/cmake/Qt63DRender/Qt63DRenderVersionlessTargets.cmake lib/cmake/Qt63DRender/Qt6AssimpSceneImportPluginAdditionalTargetInfo.cmake lib/cmake/Qt63DRender/Qt6AssimpSceneImportPluginConfig.cmake @@ -1324,6 +1369,10 @@ lib/cmake/Qt6Qml/QmlPlugins/Qt6quick3drenderpluginTargets.cmake %%QT_LIBDIR%%/libQt63DQuickScene2D.so %%QT_LIBDIR%%/libQt63DQuickScene2D.so.6 %%QT_LIBDIR%%/libQt63DQuickScene2D.so.%%FULLVER%% +%%QT_LIBDIR%%/libQt63DQuickScene3D.prl +%%QT_LIBDIR%%/libQt63DQuickScene3D.so +%%QT_LIBDIR%%/libQt63DQuickScene3D.so.6 +%%QT_LIBDIR%%/libQt63DQuickScene3D.so.%%FULLVER%% %%QT_LIBDIR%%/libQt63DRender.prl %%QT_LIBDIR%%/libQt63DRender.so %%QT_LIBDIR%%/libQt63DRender.so.6 @@ -1339,6 +1388,7 @@ lib/cmake/Qt6Qml/QmlPlugins/Qt6quick3drenderpluginTargets.cmake %%QT_LIBDIR%%/metatypes/qt63dquickinput_%%CMAKE_BUILD_TYPE%%_metatypes.json %%QT_LIBDIR%%/metatypes/qt63dquickrender_%%CMAKE_BUILD_TYPE%%_metatypes.json %%QT_LIBDIR%%/metatypes/qt63dquickscene2d_%%CMAKE_BUILD_TYPE%%_metatypes.json +%%QT_LIBDIR%%/metatypes/qt63dquickscene3d_%%CMAKE_BUILD_TYPE%%_metatypes.json %%QT_LIBDIR%%/metatypes/qt63drender_%%CMAKE_BUILD_TYPE%%_metatypes.json %%QT_MKSPECDIR%%/modules/qt_lib_3danimation.pri %%QT_MKSPECDIR%%/modules/qt_lib_3danimation_private.pri @@ -1362,6 +1412,8 @@ lib/cmake/Qt6Qml/QmlPlugins/Qt6quick3drenderpluginTargets.cmake %%QT_MKSPECDIR%%/modules/qt_lib_3dquickrender_private.pri %%QT_MKSPECDIR%%/modules/qt_lib_3dquickscene2d.pri %%QT_MKSPECDIR%%/modules/qt_lib_3dquickscene2d_private.pri +%%QT_MKSPECDIR%%/modules/qt_lib_3dquickscene3d.pri +%%QT_MKSPECDIR%%/modules/qt_lib_3dquickscene3d_private.pri %%QT_MKSPECDIR%%/modules/qt_lib_3drender.pri %%QT_MKSPECDIR%%/modules/qt_lib_3drender_private.pri %%QT_PLUGINDIR%%/geometryloaders/libdefaultgeometryloader.so @@ -1396,6 +1448,7 @@ lib/cmake/Qt6Qml/QmlPlugins/Qt6quick3drenderpluginTargets.cmake %%QT_QMLDIR%%/QtQuick/Scene3D/libqtquickscene3dplugin.so %%QT_QMLDIR%%/QtQuick/Scene3D/plugins.qmltypes %%QT_QMLDIR%%/QtQuick/Scene3D/qmldir +%%QT_SBOMDIR%%/qt3d-%%FULLVER%%.spdx libdata/pkgconfig/Qt63DAnimation.pc libdata/pkgconfig/Qt63DCore.pc libdata/pkgconfig/Qt63DExtras.pc @@ -1407,6 +1460,7 @@ libdata/pkgconfig/Qt63DQuickExtras.pc libdata/pkgconfig/Qt63DQuickInput.pc libdata/pkgconfig/Qt63DQuickRender.pc libdata/pkgconfig/Qt63DQuickScene2D.pc +libdata/pkgconfig/Qt63DQuickScene3D.pc libdata/pkgconfig/Qt63DRender.pc %%QT_DATADIR%%/modules/3DAnimation.json %%QT_DATADIR%%/modules/3DCore.json @@ -1419,4 +1473,5 @@ libdata/pkgconfig/Qt63DRender.pc %%QT_DATADIR%%/modules/3DQuickInput.json %%QT_DATADIR%%/modules/3DQuickRender.json %%QT_DATADIR%%/modules/3DQuickScene2D.json +%%QT_DATADIR%%/modules/3DQuickScene3D.json %%QT_DATADIR%%/modules/3DRender.json diff --git a/graphics/qt6-imageformats/distinfo b/graphics/qt6-imageformats/distinfo index 92e10f827b13..edc31c557b33 100644 --- a/graphics/qt6-imageformats/distinfo +++ b/graphics/qt6-imageformats/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1727500289 -SHA256 (KDE/Qt/6.7.3/qtimageformats-everywhere-src-6.7.3.tar.xz) = 9fd58144081654c3373768dd96ead294023830927b14fe3d3c1ef641fb324753 -SIZE (KDE/Qt/6.7.3/qtimageformats-everywhere-src-6.7.3.tar.xz) = 1974700 +TIMESTAMP = 1733205020 +SHA256 (KDE/Qt/6.8.1/qtimageformats-everywhere-src-6.8.1.tar.xz) = 138cc2909aa98f5ff7283e36eb3936eb5e625d3ca3b4febae2ca21d8903dd237 +SIZE (KDE/Qt/6.8.1/qtimageformats-everywhere-src-6.8.1.tar.xz) = 2024820 diff --git a/graphics/qt6-imageformats/pkg-plist b/graphics/qt6-imageformats/pkg-plist index e928929d15a5..5e1291d84020 100644 --- a/graphics/qt6-imageformats/pkg-plist +++ b/graphics/qt6-imageformats/pkg-plist @@ -50,3 +50,4 @@ lib/cmake/Qt6Gui/Qt6QWebpPluginTargets.cmake %%QT_PLUGINDIR%%/imageformats/libqtiff.so %%QT_PLUGINDIR%%/imageformats/libqwbmp.so %%QT_PLUGINDIR%%/imageformats/libqwebp.so +%%QT_SBOMDIR%%/qtimageformats-%%FULLVER%%.spdx diff --git a/graphics/qt6-lottie/distinfo b/graphics/qt6-lottie/distinfo index 8f7a23a41ceb..e4613b1e1a1e 100644 --- a/graphics/qt6-lottie/distinfo +++ b/graphics/qt6-lottie/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1727500290 -SHA256 (KDE/Qt/6.7.3/qtlottie-everywhere-src-6.7.3.tar.xz) = 398d1e77767ac163938fc872e15846f0f437f2b419758622c4182f4595d1830d -SIZE (KDE/Qt/6.7.3/qtlottie-everywhere-src-6.7.3.tar.xz) = 83632 +TIMESTAMP = 1733205021 +SHA256 (KDE/Qt/6.8.1/qtlottie-everywhere-src-6.8.1.tar.xz) = 824344c5fcbfdf92b424c21ac96a56b736d5e96afa838689b6207f58e170174a +SIZE (KDE/Qt/6.8.1/qtlottie-everywhere-src-6.8.1.tar.xz) = 83812 diff --git a/graphics/qt6-lottie/pkg-plist b/graphics/qt6-lottie/pkg-plist index 26535618d787..8dda40ef49b5 100644 --- a/graphics/qt6-lottie/pkg-plist +++ b/graphics/qt6-lottie/pkg-plist @@ -37,6 +37,7 @@ lib/cmake/Qt6BodymovinPrivate/Qt6BodymovinPrivateConfigVersionImpl.cmake lib/cmake/Qt6BodymovinPrivate/Qt6BodymovinPrivateDependencies.cmake lib/cmake/Qt6BodymovinPrivate/Qt6BodymovinPrivateTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6BodymovinPrivate/Qt6BodymovinPrivateTargets.cmake +lib/cmake/Qt6BodymovinPrivate/Qt6BodymovinPrivateVersionlessAliasTargets.cmake lib/cmake/Qt6BodymovinPrivate/Qt6BodymovinPrivateVersionlessTargets.cmake lib/cmake/Qt6BuildInternals/StandaloneTests/QtLottieTestsConfig.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6lottieqtpluginAdditionalTargetInfo.cmake @@ -54,4 +55,5 @@ lib/cmake/Qt6Qml/QmlPlugins/Qt6lottieqtpluginTargets.cmake %%QT_QMLDIR%%/Qt/labs/lottieqt/liblottieqtplugin.so %%QT_QMLDIR%%/Qt/labs/lottieqt/plugins.qmltypes %%QT_QMLDIR%%/Qt/labs/lottieqt/qmldir +%%QT_SBOMDIR%%/qtlottie-%%FULLVER%%.spdx %%QT_DATADIR%%/modules/BodymovinPrivate.json diff --git a/graphics/qt6-quickeffectmaker/distinfo b/graphics/qt6-quickeffectmaker/distinfo index d685c326be5c..db3099e90a44 100644 --- a/graphics/qt6-quickeffectmaker/distinfo +++ b/graphics/qt6-quickeffectmaker/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1727500291 -SHA256 (KDE/Qt/6.7.3/qtquickeffectmaker-everywhere-src-6.7.3.tar.xz) = 588bfd1b2dc34d0faca425d49b0ed82fbf4356f3be51e3d49d3630a9ad422e96 -SIZE (KDE/Qt/6.7.3/qtquickeffectmaker-everywhere-src-6.7.3.tar.xz) = 4322056 +TIMESTAMP = 1733205025 +SHA256 (KDE/Qt/6.8.1/qtquickeffectmaker-everywhere-src-6.8.1.tar.xz) = 2d4fdf13356abd90b272cc1836bccb6d6ec8849b72173ea3daef0a5c42fb51f6 +SIZE (KDE/Qt/6.8.1/qtquickeffectmaker-everywhere-src-6.8.1.tar.xz) = 4348024 diff --git a/graphics/qt6-quickeffectmaker/pkg-plist b/graphics/qt6-quickeffectmaker/pkg-plist index 96f9be074fdd..acd6e0a55dad 100644 --- a/graphics/qt6-quickeffectmaker/pkg-plist +++ b/graphics/qt6-quickeffectmaker/pkg-plist @@ -7,6 +7,7 @@ %%QT_QMLDIR%%/QtQuickEffectMaker/defaultnodes/basic/dropshadow.qen %%QT_QMLDIR%%/QtQuickEffectMaker/defaultnodes/basic/fastblur.qen %%QT_QMLDIR%%/QtQuickEffectMaker/defaultnodes/basic/gamma_adjust.qen +%%QT_QMLDIR%%/QtQuickEffectMaker/defaultnodes/basic/glow.qen %%QT_QMLDIR%%/QtQuickEffectMaker/defaultnodes/basic/innershadow.qen %%QT_QMLDIR%%/QtQuickEffectMaker/defaultnodes/basic/leveladjust.qen %%QT_QMLDIR%%/QtQuickEffectMaker/defaultnodes/basic/mipmapblur.qen @@ -25,10 +26,14 @@ %%QT_QMLDIR%%/QtQuickEffectMaker/defaultnodes/common/bluritems.vert.qsb %%QT_QMLDIR%%/QtQuickEffectMaker/defaultnodes/common/mathhelper.qen %%QT_QMLDIR%%/QtQuickEffectMaker/defaultnodes/common/noisehelper.qen +%%QT_QMLDIR%%/QtQuickEffectMaker/defaultnodes/extra/bars.qen %%QT_QMLDIR%%/QtQuickEffectMaker/defaultnodes/extra/bend.qen +%%QT_QMLDIR%%/QtQuickEffectMaker/defaultnodes/extra/circlebend.qen %%QT_QMLDIR%%/QtQuickEffectMaker/defaultnodes/extra/colorlut.qen %%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/spriteanimation.qen %%QT_QMLDIR%%/QtQuickEffectMaker/defaultnodes/extra/sunburst.qen %%QT_QMLDIR%%/QtQuickEffectMaker/defaultnodes/extra/swirl.qen %%QT_QMLDIR%%/QtQuickEffectMaker/defaultnodes/images/blackcircle.png @@ -82,6 +87,7 @@ %%QT_QMLDIR%%/QtQuickEffectMaker/defaultnodes/images/lut_512_warm.png %%QT_QMLDIR%%/QtQuickEffectMaker/defaultnodes/images/mask.png %%QT_QMLDIR%%/QtQuickEffectMaker/defaultnodes/images/mask2.png +%%QT_QMLDIR%%/QtQuickEffectMaker/defaultnodes/images/qt-logo-sheet.png %%QT_QMLDIR%%/QtQuickEffectMaker/defaultnodes/images/qt_logo_green_rgb.png %%QT_QMLDIR%%/QtQuickEffectMaker/defaultnodes/images/qt_logo_green_rgb_n.png %%QT_QMLDIR%%/QtQuickEffectMaker/defaultnodes/images/quit_logo.png @@ -99,3 +105,4 @@ %%QT_QMLDIR%%/QtQuickEffectMaker/defaultnodes/nature/snowing.qen %%QT_QMLDIR%%/QtQuickEffectMaker/defaultnodes/nature/thunder.qen %%QT_QMLDIR%%/QtQuickEffectMaker/defaultnodes/nature/water.qen +%%QT_SBOMDIR%%/qqeffectmaker-%%FULLVER%%.spdx diff --git a/graphics/qt6-svg/distinfo b/graphics/qt6-svg/distinfo index d0027ea6a409..7e0270b85675 100644 --- a/graphics/qt6-svg/distinfo +++ b/graphics/qt6-svg/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1727500292 -SHA256 (KDE/Qt/6.7.3/qtsvg-everywhere-src-6.7.3.tar.xz) = 40142cb71fb1e07ad612bc361b67f5d54cd9367f9979ae6b86124a064deda06b -SIZE (KDE/Qt/6.7.3/qtsvg-everywhere-src-6.7.3.tar.xz) = 1792980 +TIMESTAMP = 1733205027 +SHA256 (KDE/Qt/6.8.1/qtsvg-everywhere-src-6.8.1.tar.xz) = 3d0de73596e36b2daa7c48d77c4426bb091752856912fba720215f756c560dd0 +SIZE (KDE/Qt/6.8.1/qtsvg-everywhere-src-6.8.1.tar.xz) = 2006760 diff --git a/graphics/qt6-svg/pkg-plist b/graphics/qt6-svg/pkg-plist index 1860fea0b599..84f3f750ed3f 100644 --- a/graphics/qt6-svg/pkg-plist +++ b/graphics/qt6-svg/pkg-plist @@ -8,7 +8,6 @@ %%QT_INCDIR%%/QtSvg/%%FULLVER%%/QtSvg/private/qsvgstyle_p.h %%QT_INCDIR%%/QtSvg/%%FULLVER%%/QtSvg/private/qsvgtinydocument_p.h %%QT_INCDIR%%/QtSvg/%%FULLVER%%/QtSvg/private/qsvgvisitor_p.h -%%QT_INCDIR%%/QtSvg/%%FULLVER%%/QtSvg/private/qtsvgexports_p.h %%QT_INCDIR%%/QtSvg/%%FULLVER%%/QtSvg/private/qtsvgglobal_p.h %%QT_INCDIR%%/QtSvg/QSvgGenerator %%QT_INCDIR%%/QtSvg/QSvgRenderer @@ -50,6 +49,7 @@ lib/cmake/Qt6Svg/Qt6SvgConfigVersionImpl.cmake lib/cmake/Qt6Svg/Qt6SvgDependencies.cmake 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/Qt6SvgWidgets/Qt6SvgWidgetsAdditionalTargetInfo.cmake lib/cmake/Qt6SvgWidgets/Qt6SvgWidgetsConfig.cmake @@ -58,6 +58,7 @@ lib/cmake/Qt6SvgWidgets/Qt6SvgWidgetsConfigVersionImpl.cmake lib/cmake/Qt6SvgWidgets/Qt6SvgWidgetsDependencies.cmake lib/cmake/Qt6SvgWidgets/Qt6SvgWidgetsTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6SvgWidgets/Qt6SvgWidgetsTargets.cmake +lib/cmake/Qt6SvgWidgets/Qt6SvgWidgetsVersionlessAliasTargets.cmake lib/cmake/Qt6SvgWidgets/Qt6SvgWidgetsVersionlessTargets.cmake %%QT_LIBDIR%%/libQt6Svg.prl %%QT_LIBDIR%%/libQt6Svg.so @@ -75,6 +76,7 @@ lib/cmake/Qt6SvgWidgets/Qt6SvgWidgetsVersionlessTargets.cmake %%QT_MKSPECDIR%%/modules/qt_lib_svgwidgets_private.pri %%QT_PLUGINDIR%%/iconengines/libqsvgicon.so %%QT_PLUGINDIR%%/imageformats/libqsvg.so +%%QT_SBOMDIR%%/qtsvg-%%FULLVER%%.spdx libdata/pkgconfig/Qt6Svg.pc libdata/pkgconfig/Qt6SvgWidgets.pc %%QT_DATADIR%%/modules/Svg.json diff --git a/graphics/qt6-wayland/Makefile b/graphics/qt6-wayland/Makefile index 9d2aaf3fc0ef..430aef820fe7 100644 --- a/graphics/qt6-wayland/Makefile +++ b/graphics/qt6-wayland/Makefile @@ -3,9 +3,6 @@ DISTVERSION= ${QT6_VERSION} CATEGORIES= graphics wayland PKGNAMEPREFIX= qt6- -PATCH_SITES= https://github.com/qt/qtwayland/commit/ -PATCHFILES+= c2f61bc47baacf2e6a44c6c3c4e4cbf0abfa4095.patch:-p1 - MAINTAINER= kde@FreeBSD.org COMMENT= Qt6 wrapper for Wayland @@ -16,7 +13,7 @@ LIB_DEPENDS= libwayland-client.so:graphics/wayland \ USES= cmake compiler:c++17-lang gl pkgconfig \ qt-dist:6 USE_GL= opengl egl -USE_QT= base declarative +USE_QT= base declarative svg USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} .include diff --git a/graphics/qt6-wayland/distinfo b/graphics/qt6-wayland/distinfo index 623daccf6e1e..51c5e45f7426 100644 --- a/graphics/qt6-wayland/distinfo +++ b/graphics/qt6-wayland/distinfo @@ -1,5 +1,3 @@ -TIMESTAMP = 1727500695 -SHA256 (KDE/Qt/6.7.3/qtwayland-everywhere-src-6.7.3.tar.xz) = e326c7ceb628f503bfc20577d5d2df9690ee10db08eb940cb80c759a6972b2b5 -SIZE (KDE/Qt/6.7.3/qtwayland-everywhere-src-6.7.3.tar.xz) = 1123508 -SHA256 (KDE/Qt/6.7.3/c2f61bc47baacf2e6a44c6c3c4e4cbf0abfa4095.patch) = 6cdb9167b70382101fc40c4adf0485d8d37a7dec72a129013573e19b005196a7 -SIZE (KDE/Qt/6.7.3/c2f61bc47baacf2e6a44c6c3c4e4cbf0abfa4095.patch) = 22605 +TIMESTAMP = 1733205030 +SHA256 (KDE/Qt/6.8.1/qtwayland-everywhere-src-6.8.1.tar.xz) = 2226fbde4e2ddd12f8bf4b239c8f38fd706a54e789e63467dfddc77129eca203 +SIZE (KDE/Qt/6.8.1/qtwayland-everywhere-src-6.8.1.tar.xz) = 1134428 diff --git a/graphics/qt6-wayland/pkg-plist b/graphics/qt6-wayland/pkg-plist index 80cf5b266fdf..ea09b381daca 100644 --- a/graphics/qt6-wayland/pkg-plist +++ b/graphics/qt6-wayland/pkg-plist @@ -48,6 +48,7 @@ %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandinputmethodcontext_p.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandintegration_p.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandnativeinterface_p.h +%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandplatformservices_p.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandpointergestures_p.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandprimaryselectionv1_p.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandqtkey_p.h @@ -123,6 +124,7 @@ %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwayland-server-viewporter.h %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwayland-server-wayland.h %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwayland-server-xdg-decoration-unstable-v1.h +%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwayland-server-xdg-dialog-v1.h %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwayland-server-xdg-output-unstable-v1.h %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwayland-server-xdg-shell.h %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandcompositor_p.h @@ -151,6 +153,7 @@ %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandquicksurface_p.h %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandseat_p.h %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandshell_p.h +%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandshellsurface_p.h %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandsurface_p.h %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandtextinput_p.h %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandtextinputmanager_p.h @@ -163,6 +166,7 @@ %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandwlshell_p.h %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandwlshellintegration_p.h %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandxdgdecorationv1_p.h +%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandxdgdialogv1_p.h %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandxdgoutputv1_p.h %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandxdgshell_p.h %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandxdgshellintegration_p.h @@ -203,6 +207,7 @@ %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/wayland-viewporter-server-protocol.h %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/wayland-wayland-server-protocol.h %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/wayland-xdg-decoration-unstable-v1-server-protocol.h +%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/wayland-xdg-dialog-v1-server-protocol.h %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/wayland-xdg-output-unstable-v1-server-protocol.h %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/wayland-xdg-shell-server-protocol.h %%QT_INCDIR%%/QtWaylandCompositor/QWaylandBufferRef @@ -310,6 +315,26 @@ %%QT_INCDIR%%/QtWaylandCompositor/qwaylandxdgdecorationv1.h %%QT_INCDIR%%/QtWaylandCompositor/qwaylandxdgoutputv1.h %%QT_INCDIR%%/QtWaylandCompositor/qwaylandxdgshell.h +%%QT_INCDIR%%/QtWaylandCompositorIviapplication/%%FULLVER%%/QtWaylandCompositorIviapplication/private/qwaylandcompositoriviapplicationforeign_p.h +%%QT_INCDIR%%/QtWaylandCompositorIviapplication/QtWaylandCompositorIviapplication +%%QT_INCDIR%%/QtWaylandCompositorIviapplication/QtWaylandCompositorIviapplicationDepends +%%QT_INCDIR%%/QtWaylandCompositorIviapplication/QtWaylandCompositorIviapplicationVersion +%%QT_INCDIR%%/QtWaylandCompositorIviapplication/qtwaylandcompositoriviapplicationversion.h +%%QT_INCDIR%%/QtWaylandCompositorPresentationTime/%%FULLVER%%/QtWaylandCompositorPresentationTime/private/qwaylandcompositorpresentationtimeforeign_p.h +%%QT_INCDIR%%/QtWaylandCompositorPresentationTime/QtWaylandCompositorPresentationTime +%%QT_INCDIR%%/QtWaylandCompositorPresentationTime/QtWaylandCompositorPresentationTimeDepends +%%QT_INCDIR%%/QtWaylandCompositorPresentationTime/QtWaylandCompositorPresentationTimeVersion +%%QT_INCDIR%%/QtWaylandCompositorPresentationTime/qtwaylandcompositorpresentationtimeversion.h +%%QT_INCDIR%%/QtWaylandCompositorWLShell/%%FULLVER%%/QtWaylandCompositorWLShell/private/qwaylandcompositorwlshell_p.h +%%QT_INCDIR%%/QtWaylandCompositorWLShell/QtWaylandCompositorWLShell +%%QT_INCDIR%%/QtWaylandCompositorWLShell/QtWaylandCompositorWLShellDepends +%%QT_INCDIR%%/QtWaylandCompositorWLShell/QtWaylandCompositorWLShellVersion +%%QT_INCDIR%%/QtWaylandCompositorWLShell/qtwaylandcompositorwlshellversion.h +%%QT_INCDIR%%/QtWaylandCompositorXdgShell/%%FULLVER%%/QtWaylandCompositorXdgShell/private/qwaylandcompositorxdgshell_p.h +%%QT_INCDIR%%/QtWaylandCompositorXdgShell/QtWaylandCompositorXdgShell +%%QT_INCDIR%%/QtWaylandCompositorXdgShell/QtWaylandCompositorXdgShellDepends +%%QT_INCDIR%%/QtWaylandCompositorXdgShell/QtWaylandCompositorXdgShellVersion +%%QT_INCDIR%%/QtWaylandCompositorXdgShell/qtwaylandcompositorxdgshellversion.h %%QT_INCDIR%%/QtWaylandEglClientHwIntegration/%%FULLVER%%/QtWaylandEglClientHwIntegration/private/qwaylandeglclientbufferintegration_p.h %%QT_INCDIR%%/QtWaylandEglClientHwIntegration/%%FULLVER%%/QtWaylandEglClientHwIntegration/private/qwaylandeglinclude_p.h %%QT_INCDIR%%/QtWaylandEglClientHwIntegration/%%FULLVER%%/QtWaylandEglClientHwIntegration/private/qwaylandeglwindow_p.h @@ -351,36 +376,36 @@ lib/cmake/Qt6Gui/Qt6QWaylandIntegrationPluginConfigVersion.cmake lib/cmake/Qt6Gui/Qt6QWaylandIntegrationPluginConfigVersionImpl.cmake lib/cmake/Qt6Gui/Qt6QWaylandIntegrationPluginTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6Gui/Qt6QWaylandIntegrationPluginTargets.cmake -lib/cmake/Qt6Qml/QmlPlugins/Qt6WaylandCompositorIviapplicationAdditionalTargetInfo.cmake -lib/cmake/Qt6Qml/QmlPlugins/Qt6WaylandCompositorIviapplicationConfig.cmake -lib/cmake/Qt6Qml/QmlPlugins/Qt6WaylandCompositorIviapplicationConfigVersion.cmake -lib/cmake/Qt6Qml/QmlPlugins/Qt6WaylandCompositorIviapplicationConfigVersionImpl.cmake -lib/cmake/Qt6Qml/QmlPlugins/Qt6WaylandCompositorIviapplicationTargets-%%CMAKE_BUILD_TYPE%%.cmake -lib/cmake/Qt6Qml/QmlPlugins/Qt6WaylandCompositorIviapplicationTargets.cmake -lib/cmake/Qt6Qml/QmlPlugins/Qt6WaylandCompositorPresentationTimeAdditionalTargetInfo.cmake -lib/cmake/Qt6Qml/QmlPlugins/Qt6WaylandCompositorPresentationTimeConfig.cmake -lib/cmake/Qt6Qml/QmlPlugins/Qt6WaylandCompositorPresentationTimeConfigVersion.cmake -lib/cmake/Qt6Qml/QmlPlugins/Qt6WaylandCompositorPresentationTimeConfigVersionImpl.cmake -lib/cmake/Qt6Qml/QmlPlugins/Qt6WaylandCompositorPresentationTimeTargets-%%CMAKE_BUILD_TYPE%%.cmake -lib/cmake/Qt6Qml/QmlPlugins/Qt6WaylandCompositorPresentationTimeTargets.cmake +lib/cmake/Qt6Qml/QmlPlugins/Qt6WaylandCompositorIviapplicationpluginAdditionalTargetInfo.cmake +lib/cmake/Qt6Qml/QmlPlugins/Qt6WaylandCompositorIviapplicationpluginConfig.cmake +lib/cmake/Qt6Qml/QmlPlugins/Qt6WaylandCompositorIviapplicationpluginConfigVersion.cmake +lib/cmake/Qt6Qml/QmlPlugins/Qt6WaylandCompositorIviapplicationpluginConfigVersionImpl.cmake +lib/cmake/Qt6Qml/QmlPlugins/Qt6WaylandCompositorIviapplicationpluginTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/Qt6Qml/QmlPlugins/Qt6WaylandCompositorIviapplicationpluginTargets.cmake +lib/cmake/Qt6Qml/QmlPlugins/Qt6WaylandCompositorPresentationTimepluginAdditionalTargetInfo.cmake +lib/cmake/Qt6Qml/QmlPlugins/Qt6WaylandCompositorPresentationTimepluginConfig.cmake +lib/cmake/Qt6Qml/QmlPlugins/Qt6WaylandCompositorPresentationTimepluginConfigVersion.cmake +lib/cmake/Qt6Qml/QmlPlugins/Qt6WaylandCompositorPresentationTimepluginConfigVersionImpl.cmake +lib/cmake/Qt6Qml/QmlPlugins/Qt6WaylandCompositorPresentationTimepluginTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/Qt6Qml/QmlPlugins/Qt6WaylandCompositorPresentationTimepluginTargets.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6WaylandCompositorQtShellAdditionalTargetInfo.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6WaylandCompositorQtShellConfig.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6WaylandCompositorQtShellConfigVersion.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6WaylandCompositorQtShellConfigVersionImpl.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6WaylandCompositorQtShellTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6WaylandCompositorQtShellTargets.cmake -lib/cmake/Qt6Qml/QmlPlugins/Qt6WaylandCompositorWLShellAdditionalTargetInfo.cmake -lib/cmake/Qt6Qml/QmlPlugins/Qt6WaylandCompositorWLShellConfig.cmake -lib/cmake/Qt6Qml/QmlPlugins/Qt6WaylandCompositorWLShellConfigVersion.cmake -lib/cmake/Qt6Qml/QmlPlugins/Qt6WaylandCompositorWLShellConfigVersionImpl.cmake -lib/cmake/Qt6Qml/QmlPlugins/Qt6WaylandCompositorWLShellTargets-%%CMAKE_BUILD_TYPE%%.cmake -lib/cmake/Qt6Qml/QmlPlugins/Qt6WaylandCompositorWLShellTargets.cmake -lib/cmake/Qt6Qml/QmlPlugins/Qt6WaylandCompositorXdgShellAdditionalTargetInfo.cmake -lib/cmake/Qt6Qml/QmlPlugins/Qt6WaylandCompositorXdgShellConfig.cmake -lib/cmake/Qt6Qml/QmlPlugins/Qt6WaylandCompositorXdgShellConfigVersion.cmake -lib/cmake/Qt6Qml/QmlPlugins/Qt6WaylandCompositorXdgShellConfigVersionImpl.cmake -lib/cmake/Qt6Qml/QmlPlugins/Qt6WaylandCompositorXdgShellTargets-%%CMAKE_BUILD_TYPE%%.cmake -lib/cmake/Qt6Qml/QmlPlugins/Qt6WaylandCompositorXdgShellTargets.cmake +lib/cmake/Qt6Qml/QmlPlugins/Qt6WaylandCompositorWLShellpluginAdditionalTargetInfo.cmake +lib/cmake/Qt6Qml/QmlPlugins/Qt6WaylandCompositorWLShellpluginConfig.cmake +lib/cmake/Qt6Qml/QmlPlugins/Qt6WaylandCompositorWLShellpluginConfigVersion.cmake +lib/cmake/Qt6Qml/QmlPlugins/Qt6WaylandCompositorWLShellpluginConfigVersionImpl.cmake +lib/cmake/Qt6Qml/QmlPlugins/Qt6WaylandCompositorWLShellpluginTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/Qt6Qml/QmlPlugins/Qt6WaylandCompositorWLShellpluginTargets.cmake +lib/cmake/Qt6Qml/QmlPlugins/Qt6WaylandCompositorXdgShellpluginAdditionalTargetInfo.cmake +lib/cmake/Qt6Qml/QmlPlugins/Qt6WaylandCompositorXdgShellpluginConfig.cmake +lib/cmake/Qt6Qml/QmlPlugins/Qt6WaylandCompositorXdgShellpluginConfigVersion.cmake +lib/cmake/Qt6Qml/QmlPlugins/Qt6WaylandCompositorXdgShellpluginConfigVersionImpl.cmake +lib/cmake/Qt6Qml/QmlPlugins/Qt6WaylandCompositorXdgShellpluginTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/Qt6Qml/QmlPlugins/Qt6WaylandCompositorXdgShellpluginTargets.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6WaylandTextureSharingAdditionalTargetInfo.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6WaylandTextureSharingConfig.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6WaylandTextureSharingConfigVersion.cmake @@ -399,6 +424,12 @@ lib/cmake/Qt6Qml/QmlPlugins/Qt6qwaylandcompositorpluginConfigVersion.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6qwaylandcompositorpluginConfigVersionImpl.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6qwaylandcompositorpluginTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6qwaylandcompositorpluginTargets.cmake +lib/cmake/Qt6WaylandClient/Qt6QWaylandAdwaitaDecorationPluginAdditionalTargetInfo.cmake +lib/cmake/Qt6WaylandClient/Qt6QWaylandAdwaitaDecorationPluginConfig.cmake +lib/cmake/Qt6WaylandClient/Qt6QWaylandAdwaitaDecorationPluginConfigVersion.cmake +lib/cmake/Qt6WaylandClient/Qt6QWaylandAdwaitaDecorationPluginConfigVersionImpl.cmake +lib/cmake/Qt6WaylandClient/Qt6QWaylandAdwaitaDecorationPluginTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/Qt6WaylandClient/Qt6QWaylandAdwaitaDecorationPluginTargets.cmake lib/cmake/Qt6WaylandClient/Qt6QWaylandBradientDecorationPluginAdditionalTargetInfo.cmake lib/cmake/Qt6WaylandClient/Qt6QWaylandBradientDecorationPluginConfig.cmake lib/cmake/Qt6WaylandClient/Qt6QWaylandBradientDecorationPluginConfigVersion.cmake @@ -462,6 +493,7 @@ lib/cmake/Qt6WaylandClient/Qt6WaylandClientMacros.cmake lib/cmake/Qt6WaylandClient/Qt6WaylandClientPlugins.cmake 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/Qt6WaylandCompositor/Qt6QWaylandEglClientBufferIntegrationPluginAdditionalTargetInfo.cmake lib/cmake/Qt6WaylandCompositor/Qt6QWaylandEglClientBufferIntegrationPluginConfig.cmake @@ -496,7 +528,44 @@ lib/cmake/Qt6WaylandCompositor/Qt6WaylandCompositorMacros.cmake lib/cmake/Qt6WaylandCompositor/Qt6WaylandCompositorPlugins.cmake lib/cmake/Qt6WaylandCompositor/Qt6WaylandCompositorTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6WaylandCompositor/Qt6WaylandCompositorTargets.cmake +lib/cmake/Qt6WaylandCompositor/Qt6WaylandCompositorVersionlessAliasTargets.cmake lib/cmake/Qt6WaylandCompositor/Qt6WaylandCompositorVersionlessTargets.cmake +lib/cmake/Qt6WaylandCompositorIviapplication/Qt6WaylandCompositorIviapplicationAdditionalTargetInfo.cmake +lib/cmake/Qt6WaylandCompositorIviapplication/Qt6WaylandCompositorIviapplicationConfig.cmake +lib/cmake/Qt6WaylandCompositorIviapplication/Qt6WaylandCompositorIviapplicationConfigVersion.cmake +lib/cmake/Qt6WaylandCompositorIviapplication/Qt6WaylandCompositorIviapplicationConfigVersionImpl.cmake +lib/cmake/Qt6WaylandCompositorIviapplication/Qt6WaylandCompositorIviapplicationDependencies.cmake +lib/cmake/Qt6WaylandCompositorIviapplication/Qt6WaylandCompositorIviapplicationTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/Qt6WaylandCompositorIviapplication/Qt6WaylandCompositorIviapplicationTargets.cmake +lib/cmake/Qt6WaylandCompositorIviapplication/Qt6WaylandCompositorIviapplicationVersionlessAliasTargets.cmake +lib/cmake/Qt6WaylandCompositorIviapplication/Qt6WaylandCompositorIviapplicationVersionlessTargets.cmake +lib/cmake/Qt6WaylandCompositorPresentationTime/Qt6WaylandCompositorPresentationTimeAdditionalTargetInfo.cmake +lib/cmake/Qt6WaylandCompositorPresentationTime/Qt6WaylandCompositorPresentationTimeConfig.cmake +lib/cmake/Qt6WaylandCompositorPresentationTime/Qt6WaylandCompositorPresentationTimeConfigVersion.cmake +lib/cmake/Qt6WaylandCompositorPresentationTime/Qt6WaylandCompositorPresentationTimeConfigVersionImpl.cmake +lib/cmake/Qt6WaylandCompositorPresentationTime/Qt6WaylandCompositorPresentationTimeDependencies.cmake +lib/cmake/Qt6WaylandCompositorPresentationTime/Qt6WaylandCompositorPresentationTimeTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/Qt6WaylandCompositorPresentationTime/Qt6WaylandCompositorPresentationTimeTargets.cmake +lib/cmake/Qt6WaylandCompositorPresentationTime/Qt6WaylandCompositorPresentationTimeVersionlessAliasTargets.cmake +lib/cmake/Qt6WaylandCompositorPresentationTime/Qt6WaylandCompositorPresentationTimeVersionlessTargets.cmake +lib/cmake/Qt6WaylandCompositorWLShell/Qt6WaylandCompositorWLShellAdditionalTargetInfo.cmake +lib/cmake/Qt6WaylandCompositorWLShell/Qt6WaylandCompositorWLShellConfig.cmake +lib/cmake/Qt6WaylandCompositorWLShell/Qt6WaylandCompositorWLShellConfigVersion.cmake +lib/cmake/Qt6WaylandCompositorWLShell/Qt6WaylandCompositorWLShellConfigVersionImpl.cmake +lib/cmake/Qt6WaylandCompositorWLShell/Qt6WaylandCompositorWLShellDependencies.cmake +lib/cmake/Qt6WaylandCompositorWLShell/Qt6WaylandCompositorWLShellTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/Qt6WaylandCompositorWLShell/Qt6WaylandCompositorWLShellTargets.cmake +lib/cmake/Qt6WaylandCompositorWLShell/Qt6WaylandCompositorWLShellVersionlessAliasTargets.cmake +lib/cmake/Qt6WaylandCompositorWLShell/Qt6WaylandCompositorWLShellVersionlessTargets.cmake +lib/cmake/Qt6WaylandCompositorXdgShell/Qt6WaylandCompositorXdgShellAdditionalTargetInfo.cmake +lib/cmake/Qt6WaylandCompositorXdgShell/Qt6WaylandCompositorXdgShellConfig.cmake +lib/cmake/Qt6WaylandCompositorXdgShell/Qt6WaylandCompositorXdgShellConfigVersion.cmake +lib/cmake/Qt6WaylandCompositorXdgShell/Qt6WaylandCompositorXdgShellConfigVersionImpl.cmake +lib/cmake/Qt6WaylandCompositorXdgShell/Qt6WaylandCompositorXdgShellDependencies.cmake +lib/cmake/Qt6WaylandCompositorXdgShell/Qt6WaylandCompositorXdgShellTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/Qt6WaylandCompositorXdgShell/Qt6WaylandCompositorXdgShellTargets.cmake +lib/cmake/Qt6WaylandCompositorXdgShell/Qt6WaylandCompositorXdgShellVersionlessAliasTargets.cmake +lib/cmake/Qt6WaylandCompositorXdgShell/Qt6WaylandCompositorXdgShellVersionlessTargets.cmake lib/cmake/Qt6WaylandEglClientHwIntegrationPrivate/Qt6WaylandEglClientHwIntegrationPrivateAdditionalTargetInfo.cmake lib/cmake/Qt6WaylandEglClientHwIntegrationPrivate/Qt6WaylandEglClientHwIntegrationPrivateConfig.cmake lib/cmake/Qt6WaylandEglClientHwIntegrationPrivate/Qt6WaylandEglClientHwIntegrationPrivateConfigVersion.cmake @@ -504,6 +573,7 @@ lib/cmake/Qt6WaylandEglClientHwIntegrationPrivate/Qt6WaylandEglClientHwIntegrati lib/cmake/Qt6WaylandEglClientHwIntegrationPrivate/Qt6WaylandEglClientHwIntegrationPrivateDependencies.cmake lib/cmake/Qt6WaylandEglClientHwIntegrationPrivate/Qt6WaylandEglClientHwIntegrationPrivateTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6WaylandEglClientHwIntegrationPrivate/Qt6WaylandEglClientHwIntegrationPrivateTargets.cmake +lib/cmake/Qt6WaylandEglClientHwIntegrationPrivate/Qt6WaylandEglClientHwIntegrationPrivateVersionlessAliasTargets.cmake lib/cmake/Qt6WaylandEglClientHwIntegrationPrivate/Qt6WaylandEglClientHwIntegrationPrivateVersionlessTargets.cmake lib/cmake/Qt6WaylandEglCompositorHwIntegrationPrivate/Qt6WaylandEglCompositorHwIntegrationPrivateAdditionalTargetInfo.cmake lib/cmake/Qt6WaylandEglCompositorHwIntegrationPrivate/Qt6WaylandEglCompositorHwIntegrationPrivateConfig.cmake @@ -512,12 +582,14 @@ lib/cmake/Qt6WaylandEglCompositorHwIntegrationPrivate/Qt6WaylandEglCompositorHwI lib/cmake/Qt6WaylandEglCompositorHwIntegrationPrivate/Qt6WaylandEglCompositorHwIntegrationPrivateDependencies.cmake lib/cmake/Qt6WaylandEglCompositorHwIntegrationPrivate/Qt6WaylandEglCompositorHwIntegrationPrivateTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6WaylandEglCompositorHwIntegrationPrivate/Qt6WaylandEglCompositorHwIntegrationPrivateTargets.cmake +lib/cmake/Qt6WaylandEglCompositorHwIntegrationPrivate/Qt6WaylandEglCompositorHwIntegrationPrivateVersionlessAliasTargets.cmake lib/cmake/Qt6WaylandEglCompositorHwIntegrationPrivate/Qt6WaylandEglCompositorHwIntegrationPrivateVersionlessTargets.cmake lib/cmake/Qt6WaylandGlobalPrivate/Qt6WaylandGlobalPrivateAdditionalTargetInfo.cmake lib/cmake/Qt6WaylandGlobalPrivate/Qt6WaylandGlobalPrivateConfig.cmake lib/cmake/Qt6WaylandGlobalPrivate/Qt6WaylandGlobalPrivateConfigVersion.cmake lib/cmake/Qt6WaylandGlobalPrivate/Qt6WaylandGlobalPrivateConfigVersionImpl.cmake lib/cmake/Qt6WaylandGlobalPrivate/Qt6WaylandGlobalPrivateTargets.cmake +lib/cmake/Qt6WaylandGlobalPrivate/Qt6WaylandGlobalPrivateVersionlessAliasTargets.cmake lib/cmake/Qt6WaylandGlobalPrivate/Qt6WaylandGlobalPrivateVersionlessTargets.cmake lib/cmake/Qt6WaylandScannerTools/Qt6WaylandScannerToolsAdditionalTargetInfo.cmake lib/cmake/Qt6WaylandScannerTools/Qt6WaylandScannerToolsConfig.cmake @@ -534,6 +606,7 @@ lib/cmake/Qt6WlShellIntegrationPrivate/Qt6WlShellIntegrationPrivateConfigVersion lib/cmake/Qt6WlShellIntegrationPrivate/Qt6WlShellIntegrationPrivateDependencies.cmake lib/cmake/Qt6WlShellIntegrationPrivate/Qt6WlShellIntegrationPrivateTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6WlShellIntegrationPrivate/Qt6WlShellIntegrationPrivateTargets.cmake +lib/cmake/Qt6WlShellIntegrationPrivate/Qt6WlShellIntegrationPrivateVersionlessAliasTargets.cmake lib/cmake/Qt6WlShellIntegrationPrivate/Qt6WlShellIntegrationPrivateVersionlessTargets.cmake %%QT_LIBDIR%%/libQt6WaylandClient.prl %%QT_LIBDIR%%/libQt6WaylandClient.so @@ -543,6 +616,22 @@ lib/cmake/Qt6WlShellIntegrationPrivate/Qt6WlShellIntegrationPrivateVersionlessTa %%QT_LIBDIR%%/libQt6WaylandCompositor.so %%QT_LIBDIR%%/libQt6WaylandCompositor.so.6 %%QT_LIBDIR%%/libQt6WaylandCompositor.so.%%FULLVER%% +%%QT_LIBDIR%%/libQt6WaylandCompositorIviapplication.prl +%%QT_LIBDIR%%/libQt6WaylandCompositorIviapplication.so +%%QT_LIBDIR%%/libQt6WaylandCompositorIviapplication.so.6 +%%QT_LIBDIR%%/libQt6WaylandCompositorIviapplication.so.%%FULLVER%% +%%QT_LIBDIR%%/libQt6WaylandCompositorPresentationTime.prl +%%QT_LIBDIR%%/libQt6WaylandCompositorPresentationTime.so +%%QT_LIBDIR%%/libQt6WaylandCompositorPresentationTime.so.6 +%%QT_LIBDIR%%/libQt6WaylandCompositorPresentationTime.so.%%FULLVER%% +%%QT_LIBDIR%%/libQt6WaylandCompositorWLShell.prl +%%QT_LIBDIR%%/libQt6WaylandCompositorWLShell.so +%%QT_LIBDIR%%/libQt6WaylandCompositorWLShell.so.6 +%%QT_LIBDIR%%/libQt6WaylandCompositorWLShell.so.%%FULLVER%% +%%QT_LIBDIR%%/libQt6WaylandCompositorXdgShell.prl +%%QT_LIBDIR%%/libQt6WaylandCompositorXdgShell.so +%%QT_LIBDIR%%/libQt6WaylandCompositorXdgShell.so.6 +%%QT_LIBDIR%%/libQt6WaylandCompositorXdgShell.so.%%FULLVER%% %%QT_LIBDIR%%/libQt6WaylandEglClientHwIntegration.prl %%QT_LIBDIR%%/libQt6WaylandEglClientHwIntegration.so %%QT_LIBDIR%%/libQt6WaylandEglClientHwIntegration.so.6 @@ -557,6 +646,10 @@ lib/cmake/Qt6WlShellIntegrationPrivate/Qt6WlShellIntegrationPrivateVersionlessTa %%QT_LIBDIR%%/libQt6WlShellIntegration.so.%%FULLVER%% %%QT_LIBDIR%%/metatypes/qt6waylandclient_%%CMAKE_BUILD_TYPE%%_metatypes.json %%QT_LIBDIR%%/metatypes/qt6waylandcompositor_%%CMAKE_BUILD_TYPE%%_metatypes.json +%%QT_LIBDIR%%/metatypes/qt6waylandcompositoriviapplication_%%CMAKE_BUILD_TYPE%%_metatypes.json +%%QT_LIBDIR%%/metatypes/qt6waylandcompositorpresentationtime_%%CMAKE_BUILD_TYPE%%_metatypes.json +%%QT_LIBDIR%%/metatypes/qt6waylandcompositorwlshell_%%CMAKE_BUILD_TYPE%%_metatypes.json +%%QT_LIBDIR%%/metatypes/qt6waylandcompositorxdgshell_%%CMAKE_BUILD_TYPE%%_metatypes.json %%QT_LIBDIR%%/metatypes/qt6waylandeglclienthwintegrationprivate_%%CMAKE_BUILD_TYPE%%_metatypes.json %%QT_LIBDIR%%/metatypes/qt6waylandeglcompositorhwintegrationprivate_%%CMAKE_BUILD_TYPE%%_metatypes.json %%QT_LIBDIR%%/metatypes/qt6wlshellintegrationprivate_%%CMAKE_BUILD_TYPE%%_metatypes.json @@ -566,10 +659,19 @@ lib/cmake/Qt6WlShellIntegrationPrivate/Qt6WlShellIntegrationPrivateVersionlessTa %%QT_MKSPECDIR%%/modules/qt_lib_waylandclient_private.pri %%QT_MKSPECDIR%%/modules/qt_lib_waylandcompositor.pri %%QT_MKSPECDIR%%/modules/qt_lib_waylandcompositor_private.pri +%%QT_MKSPECDIR%%/modules/qt_lib_waylandcompositoriviapplication.pri +%%QT_MKSPECDIR%%/modules/qt_lib_waylandcompositoriviapplication_private.pri +%%QT_MKSPECDIR%%/modules/qt_lib_waylandcompositorpresentationtime.pri +%%QT_MKSPECDIR%%/modules/qt_lib_waylandcompositorpresentationtime_private.pri +%%QT_MKSPECDIR%%/modules/qt_lib_waylandcompositorwlshell.pri +%%QT_MKSPECDIR%%/modules/qt_lib_waylandcompositorwlshell_private.pri +%%QT_MKSPECDIR%%/modules/qt_lib_waylandcompositorxdgshell.pri +%%QT_MKSPECDIR%%/modules/qt_lib_waylandcompositorxdgshell_private.pri %%QT_MKSPECDIR%%/modules/qt_lib_waylandglobal_private.pri %%QT_MKSPECDIR%%/modules/qt_lib_wl_shell_integration_private.pri %%QT_PLUGINDIR%%/platforms/libqwayland-egl.so %%QT_PLUGINDIR%%/platforms/libqwayland-generic.so +%%QT_PLUGINDIR%%/wayland-decoration-client/libadwaita.so %%QT_PLUGINDIR%%/wayland-decoration-client/libbradient.so %%QT_PLUGINDIR%%/wayland-graphics-integration-client/libqt-plugin-wayland-egl.so %%QT_PLUGINDIR%%/wayland-graphics-integration-client/libshm-emulation-server.so @@ -589,6 +691,7 @@ lib/cmake/Qt6WlShellIntegrationPrivate/Qt6WlShellIntegrationPrivateVersionlessTa %%QT_QMLDIR%%/QtWayland/Compositor/IviApplication/plugins.qmltypes %%QT_QMLDIR%%/QtWayland/Compositor/IviApplication/qmldir %%QT_QMLDIR%%/QtWayland/Compositor/PresentationTime/libwaylandcompositorpresentationtimeplugin.so +%%QT_QMLDIR%%/QtWayland/Compositor/PresentationTime/plugins.qmltypes %%QT_QMLDIR%%/QtWayland/Compositor/PresentationTime/qmldir %%QT_QMLDIR%%/QtWayland/Compositor/QtShell/libwaylandcompositorqtshellplugin.so %%QT_QMLDIR%%/QtWayland/Compositor/QtShell/plugins.qmltypes @@ -606,11 +709,20 @@ lib/cmake/Qt6WlShellIntegrationPrivate/Qt6WlShellIntegrationPrivateVersionlessTa %%QT_QMLDIR%%/QtWayland/Compositor/qmldir %%QT_QMLDIR%%/QtWayland/Compositor/qmlfiles/WaylandCursorItem.qml %%QT_QMLDIR%%/QtWayland/Compositor/qmlfiles/WaylandOutputWindow.qml +%%QT_SBOMDIR%%/qtwayland-%%FULLVER%%.spdx libdata/pkgconfig/Qt6WaylandClient.pc libdata/pkgconfig/Qt6WaylandCompositor.pc +libdata/pkgconfig/Qt6WaylandCompositorIviapplication.pc +libdata/pkgconfig/Qt6WaylandCompositorPresentationTime.pc +libdata/pkgconfig/Qt6WaylandCompositorWLShell.pc +libdata/pkgconfig/Qt6WaylandCompositorXdgShell.pc %%QT_TOOLDIR%%/qtwaylandscanner %%QT_DATADIR%%/modules/WaylandClient.json %%QT_DATADIR%%/modules/WaylandCompositor.json +%%QT_DATADIR%%/modules/WaylandCompositorIviapplication.json +%%QT_DATADIR%%/modules/WaylandCompositorPresentationTime.json +%%QT_DATADIR%%/modules/WaylandCompositorWLShell.json +%%QT_DATADIR%%/modules/WaylandCompositorXdgShell.json %%QT_DATADIR%%/modules/WaylandEglClientHwIntegrationPrivate.json %%QT_DATADIR%%/modules/WaylandEglCompositorHwIntegrationPrivate.json %%QT_DATADIR%%/modules/WaylandGlobalPrivate.json diff --git a/misc/qt6-doc/distinfo b/misc/qt6-doc/distinfo index 4b8a4127bd4a..23b99e0adfd9 100644 --- a/misc/qt6-doc/distinfo +++ b/misc/qt6-doc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1727500295 -SHA256 (KDE/Qt/6.7.3/qtdoc-everywhere-src-6.7.3.tar.xz) = 530d2a261f13bb7ec940e1e51bc55657b61810f826ed5e04a1852b9675ce2304 -SIZE (KDE/Qt/6.7.3/qtdoc-everywhere-src-6.7.3.tar.xz) = 13983012 +TIMESTAMP = 1733205049 +SHA256 (KDE/Qt/6.8.1/qtdoc-everywhere-src-6.8.1.tar.xz) = 70a74663db3989913e547fa17130bdc8c2ccfa36441b5041db406c31eccd7bb2 +SIZE (KDE/Qt/6.8.1/qtdoc-everywhere-src-6.8.1.tar.xz) = 46007920 diff --git a/misc/qt6-doc/pkg-plist b/misc/qt6-doc/pkg-plist index 44cfc476591d..3a9e6a556cc3 100644 --- a/misc/qt6-doc/pkg-plist +++ b/misc/qt6-doc/pkg-plist @@ -25,7 +25,6 @@ %%QT_DOCDIR%%/qtcmake/qt-cmake-policies.html %%QT_DOCDIR%%/qtcmake/qtcmake.index %%QT_DOCDIR%%/qtcmake/qtcmake.qhp -%%QT_DOCDIR%%/qtcmake/qtcmake.qhp.sha1 %%QT_DOCDIR%%/qtcmake/style/offline-dark.css %%QT_DOCDIR%%/qtcmake/style/offline-simple.css %%QT_DOCDIR%%/qtcmake/style/offline.css @@ -49,11 +48,13 @@ %%QT_DOCDIR%%/qtdoc/android-publishing-to-googleplay.html %%QT_DOCDIR%%/qtdoc/android-runtime-licensing-notes.html %%QT_DOCDIR%%/qtdoc/android-services.html +%%QT_DOCDIR%%/qtdoc/android-supported-versions-selection-guidelines.html %%QT_DOCDIR%%/qtdoc/android.html %%QT_DOCDIR%%/qtdoc/annotated.html %%QT_DOCDIR%%/qtdoc/appicon.html %%QT_DOCDIR%%/qtdoc/best-practices.html %%QT_DOCDIR%%/qtdoc/bughowto.html +%%QT_DOCDIR%%/qtdoc/build-optimized-qt.html %%QT_DOCDIR%%/qtdoc/build-sources.html %%QT_DOCDIR%%/qtdoc/building-qt-for-qnx.html %%QT_DOCDIR%%/qtdoc/classes.html @@ -110,6 +111,7 @@ %%QT_DOCDIR%%/qtdoc/images/alarms3.png %%QT_DOCDIR%%/qtdoc/images/android-single-abis.png %%QT_DOCDIR%%/qtdoc/images/android-source-folder.png +%%QT_DOCDIR%%/qtdoc/images/android.webp %%QT_DOCDIR%%/qtdoc/images/animation-examples.png %%QT_DOCDIR%%/qtdoc/images/applicationwindow.png %%QT_DOCDIR%%/qtdoc/images/arrow_bc.png @@ -146,16 +148,15 @@ %%QT_DOCDIR%%/qtdoc/images/ico_note.png %%QT_DOCDIR%%/qtdoc/images/ico_note_attention.png %%QT_DOCDIR%%/qtdoc/images/ico_out.png -%%QT_DOCDIR%%/qtdoc/images/icon_QtCreator_78x78px.png -%%QT_DOCDIR%%/qtdoc/images/icon_Qt_78x78px.png -%%QT_DOCDIR%%/qtdoc/images/icon_Tools.png %%QT_DOCDIR%%/qtdoc/images/integrity-os.png +%%QT_DOCDIR%%/qtdoc/images/ios.webp %%QT_DOCDIR%%/qtdoc/images/layout-examples.png %%QT_DOCDIR%%/qtdoc/images/lightningviewer.jpg %%QT_DOCDIR%%/qtdoc/images/logo.png +%%QT_DOCDIR%%/qtdoc/images/macos.webp %%QT_DOCDIR%%/qtdoc/images/mainscreen.png %%QT_DOCDIR%%/qtdoc/images/maintenancetool.png -%%QT_DOCDIR%%/qtdoc/images/mediaplayer.png +%%QT_DOCDIR%%/qtdoc/images/mediaplayerapp.png %%QT_DOCDIR%%/qtdoc/images/mobile_dark.png %%QT_DOCDIR%%/qtdoc/images/mobile_light.png %%QT_DOCDIR%%/qtdoc/images/nmvurCcsWos.jpg @@ -215,6 +216,8 @@ %%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 @@ -233,11 +236,13 @@ %%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 +%%QT_DOCDIR%%/qtdoc/images/windows.webp %%QT_DOCDIR%%/qtdoc/images/wiring1.png %%QT_DOCDIR%%/qtdoc/images/wiring2.png +%%QT_DOCDIR%%/qtdoc/images/x11.webp %%QT_DOCDIR%%/qtdoc/images/xNIz78IPBu0.jpg %%QT_DOCDIR%%/qtdoc/images/xml-examples.png -%%QT_DOCDIR%%/qtdoc/images/yIv0vO8B7tQ.jpg +%%QT_DOCDIR%%/qtdoc/images/xr_physicsbase_teleportation.jpg %%QT_DOCDIR%%/qtdoc/index.html %%QT_DOCDIR%%/qtdoc/inputs-linux-device.html %%QT_DOCDIR%%/qtdoc/install-qt-design-studio.html @@ -255,7 +260,7 @@ %%QT_DOCDIR%%/qtdoc/ios-building-from-source.html %%QT_DOCDIR%%/qtdoc/ios-platform-notes.html %%QT_DOCDIR%%/qtdoc/ios.html -%%QT_DOCDIR%%/qtdoc/ipc.html +%%QT_DOCDIR%%/qtdoc/ipc-overview.html %%QT_DOCDIR%%/qtdoc/known-issues.html %%QT_DOCDIR%%/qtdoc/lgpl.html %%QT_DOCDIR%%/qtdoc/license-changes.html @@ -286,6 +291,7 @@ %%QT_DOCDIR%%/qtdoc/newclasses65.html %%QT_DOCDIR%%/qtdoc/newclasses66.html %%QT_DOCDIR%%/qtdoc/newclasses67.html +%%QT_DOCDIR%%/qtdoc/newclasses68.html %%QT_DOCDIR%%/qtdoc/obsoleteclasses.html %%QT_DOCDIR%%/qtdoc/obsoleteqmltypes.html %%QT_DOCDIR%%/qtdoc/overviews-main.html @@ -324,8 +330,6 @@ %%QT_DOCDIR%%/qtdoc/qt-online-installation.html %%QT_DOCDIR%%/qtdoc/qt-releases.html %%QT_DOCDIR%%/qtdoc/qt6-buildsystem.html -%%QT_DOCDIR%%/qtdoc/qtconcurrent-mtexamples.html -%%QT_DOCDIR%%/qtdoc/qtconcurrentexamples.html %%QT_DOCDIR%%/qtdoc/qtdoc-attribution-colorpaletteclient.html %%QT_DOCDIR%%/qtdoc/qtdoc-attribution-dice-roundcarpet.html %%QT_DOCDIR%%/qtdoc/qtdoc-attribution-dice-table.html @@ -352,10 +356,11 @@ %%QT_DOCDIR%%/qtdoc/qtdoc-demos-stocqt-example.html %%QT_DOCDIR%%/qtdoc/qtdoc-demos-thermostat-example.html %%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-tutorials-alarms-example.html %%QT_DOCDIR%%/qtdoc/qtdoc.index %%QT_DOCDIR%%/qtdoc/qtdoc.qhp -%%QT_DOCDIR%%/qtdoc/qtdoc.qhp.sha1 %%QT_DOCDIR%%/qtdoc/qtentrypoint.html %%QT_DOCDIR%%/qtdoc/qtexamples.html %%QT_DOCDIR%%/qtdoc/qtexamplesandtutorials.html @@ -368,6 +373,7 @@ %%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 @@ -381,13 +387,13 @@ %%QT_DOCDIR%%/qtdoc/rcc.html %%QT_DOCDIR%%/qtdoc/reference-overview.html %%QT_DOCDIR%%/qtdoc/restoring-geometry.html +%%QT_DOCDIR%%/qtdoc/sbom.html %%QT_DOCDIR%%/qtdoc/scalability.html %%QT_DOCDIR%%/qtdoc/session.html %%QT_DOCDIR%%/qtdoc/sharedlibrary.html %%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/sql-examples.html %%QT_DOCDIR%%/qtdoc/string-processing.html %%QT_DOCDIR%%/qtdoc/style/offline-dark.css %%QT_DOCDIR%%/qtdoc/style/offline-simple.css @@ -430,6 +436,7 @@ %%QT_DOCDIR%%/qtdoc/whatsnew65.html %%QT_DOCDIR%%/qtdoc/whatsnew66.html %%QT_DOCDIR%%/qtdoc/whatsnew67.html +%%QT_DOCDIR%%/qtdoc/whatsnew68.html %%QT_DOCDIR%%/qtdoc/whatsnewqt6.html %%QT_DOCDIR%%/qtdoc/why-moc.html %%QT_DOCDIR%%/qtdoc/windows-building.html @@ -437,7 +444,6 @@ %%QT_DOCDIR%%/qtdoc/windows-graphics.html %%QT_DOCDIR%%/qtdoc/windows-issues.html %%QT_DOCDIR%%/qtdoc/windows.html -%%QT_DOCDIR%%/qtdoc/xml-examples.html %%QT_DOCDIR%%/qtdoc/xml-processing.html %%QT_DOCDIR%%/qtplatformintegration.qch %%QT_DOCDIR%%/qtplatformintegration/images/arrow_bc.png @@ -458,7 +464,6 @@ %%QT_DOCDIR%%/qtplatformintegration/qpa.html %%QT_DOCDIR%%/qtplatformintegration/qtplatformintegration.index %%QT_DOCDIR%%/qtplatformintegration/qtplatformintegration.qhp -%%QT_DOCDIR%%/qtplatformintegration/qtplatformintegration.qhp.sha1 %%QT_DOCDIR%%/qtplatformintegration/style/offline-dark.css %%QT_DOCDIR%%/qtplatformintegration/style/offline-simple.css %%QT_DOCDIR%%/qtplatformintegration/style/offline.css diff --git a/misc/qt6-examples/distinfo b/misc/qt6-examples/distinfo index 05db4eff8e2f..e4b809381357 100644 --- a/misc/qt6-examples/distinfo +++ b/misc/qt6-examples/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1727500686 -SHA256 (KDE/Qt/6.7.3/qt-everywhere-src-6.7.3.tar.xz) = a3f1d257cbb14c6536585ffccf7c203ce7017418e1a0c2ed7c316c20c729c801 -SIZE (KDE/Qt/6.7.3/qt-everywhere-src-6.7.3.tar.xz) = 936198060 +TIMESTAMP = 1733205471 +SHA256 (KDE/Qt/6.8.1/qt-everywhere-src-6.8.1.tar.xz) = 45e3a9f6d33c92ffe65a1fde1a8eba5b228112df675f7f9026eaa332b2e2edff +SIZE (KDE/Qt/6.8.1/qt-everywhere-src-6.8.1.tar.xz) = 994139816 diff --git a/misc/qt6-examples/pkg-plist b/misc/qt6-examples/pkg-plist index 7e8076b34e58..054b8e00cf9d 100644 --- a/misc/qt6-examples/pkg-plist +++ b/misc/qt6-examples/pkg-plist @@ -38,6 +38,7 @@ %%QT_EXAMPLEDIR%%/aggregate/examples.pro %%QT_EXAMPLEDIR%%/assistant/CMakeLists.txt %%QT_EXAMPLEDIR%%/assistant/assistant.pro +%%QT_EXAMPLEDIR%%/assistant/doc/images/remotecontrol-example.png %%QT_EXAMPLEDIR%%/assistant/doc/images/simpletextviewer-example.png %%QT_EXAMPLEDIR%%/assistant/doc/images/simpletextviewer-findfiledialog.png %%QT_EXAMPLEDIR%%/assistant/doc/images/simpletextviewer-mainwindow.png @@ -1006,63 +1007,40 @@ %%QT_EXAMPLEDIR%%/demos/car-configurator/CMakeLists.txt %%QT_EXAMPLEDIR%%/demos/car-configurator/CarRendering.qmlproject %%QT_EXAMPLEDIR%%/demos/car-configurator/CarRendering.qmlproject.qtds -%%QT_EXAMPLEDIR%%/demos/car-configurator/CarRendering.qrc %%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/CMakeLists.txt -%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/ComponentBundles/MaterialBundle/CMakeLists.txt -%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/ComponentBundles/MaterialBundle/CarPaintMaterial.qml -%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/ComponentBundles/MaterialBundle/_asset_ref.json -%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/ComponentBundles/MaterialBundle/designer/carpaint.metainfo -%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/ComponentBundles/MaterialBundle/designer/images/material.png -%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/ComponentBundles/MaterialBundle/designer/images/material16.png -%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/ComponentBundles/MaterialBundle/designer/images/material@2x.png -%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/ComponentBundles/MaterialBundle/images/LDR_RGB1_3.png -%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/ComponentBundles/MaterialBundle/qmldir -%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/ComponentBundles/MaterialBundle/shaders/carmat_simple_nf.frag -%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/ComponentBundles/MaterialBundle/shaders/carmat_simple_nf.vert %%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/Quick3DAssets/CMakeLists.txt %%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/Quick3DAssets/EV_SportsCar_low/CMakeLists.txt -%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/Quick3DAssets/EV_SportsCar_low/Ev_SportsCar_low.hints %%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/Quick3DAssets/EV_SportsCar_low/Ev_SportsCar_low.qml +%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/Quick3DAssets/EV_SportsCar_low/Hood.qml +%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/Quick3DAssets/EV_SportsCar_low/MyDoorLeft.qml +%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/Quick3DAssets/EV_SportsCar_low/MyDoorRight.qml +%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/Quick3DAssets/EV_SportsCar_low/TrunkLid.qml %%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/Quick3DAssets/EV_SportsCar_low/qmldir -%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/Quick3DAssets/Uk5ofde_LOD0/CMakeLists.txt -%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/Quick3DAssets/Uk5ofde_LOD0/Uk5ofde_LOD0.hints -%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/Quick3DAssets/Uk5ofde_LOD0/Uk5ofde_LOD0.qml -%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/Quick3DAssets/Uk5ofde_LOD0/_icons/Uk5ofde_LOD0_libicon -%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/Quick3DAssets/Uk5ofde_LOD0/_icons/Uk5ofde_LOD0_libicon@2x -%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/Quick3DAssets/Uk5ofde_LOD0/qmldir -%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/Quick3DAssets/Uk5pebv_LOD0/CMakeLists.txt -%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/Quick3DAssets/Uk5pebv_LOD0/Uk5pebv_LOD0.hints -%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/Quick3DAssets/Uk5pebv_LOD0/Uk5pebv_LOD0.qml -%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/Quick3DAssets/Uk5pebv_LOD0/_icons/Uk5pebv_LOD0_libicon -%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/Quick3DAssets/Uk5pebv_LOD0/_icons/Uk5pebv_LOD0_libicon@2x -%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/Quick3DAssets/Uk5pebv_LOD0/qmldir -%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/Quick3DAssets/Ulbrbdt_LOD0/CMakeLists.txt -%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/Quick3DAssets/Ulbrbdt_LOD0/Ulbrbdt_LOD0.hints -%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/Quick3DAssets/Ulbrbdt_LOD0/Ulbrbdt_LOD0.qml -%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/Quick3DAssets/Ulbrbdt_LOD0/_icons/Ulbrbdt_LOD0_libicon -%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/Quick3DAssets/Ulbrbdt_LOD0/_icons/Ulbrbdt_LOD0_libicon@2x -%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/Quick3DAssets/Ulbrbdt_LOD0/qmldir +%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/Quick3DAssets/InteriorShadow/CMakeLists.txt +%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/Quick3DAssets/InteriorShadow/InteriorShadow.qml +%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/Quick3DAssets/InteriorShadow/qmldir +%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/Quick3DAssets/LightDecal/CMakeLists.txt +%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/Quick3DAssets/LightDecal/LightDecal.qml +%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/Quick3DAssets/LightDecal/qmldir +%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/Quick3DAssets/Pebbles/CMakeLists.txt +%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/Quick3DAssets/Pebbles/Pebbles.qml +%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/Quick3DAssets/Pebbles/qmldir +%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/Quick3DAssets/ShadowPlane/CMakeLists.txt +%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/Quick3DAssets/ShadowPlane/ShadowPlane.qml +%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/Quick3DAssets/ShadowPlane/qmldir %%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/Quick3DAssets/Venodhb_LOD0/CMakeLists.txt -%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/Quick3DAssets/Venodhb_LOD0/Venodhb_LOD0.hints %%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/Quick3DAssets/Venodhb_LOD0/Venodhb_LOD0.qml -%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/Quick3DAssets/Venodhb_LOD0/_icons/Venodhb_LOD0_libicon -%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/Quick3DAssets/Venodhb_LOD0/_icons/Venodhb_LOD0_libicon@2x %%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/Quick3DAssets/Venodhb_LOD0/qmldir %%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/Quick3DAssets/Ventdee_LOD0/CMakeLists.txt -%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/Quick3DAssets/Ventdee_LOD0/Ventdee_LOD0.hints %%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/Quick3DAssets/Ventdee_LOD0/Ventdee_LOD0.qml -%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/Quick3DAssets/Ventdee_LOD0/_icons/Ventdee_LOD0_libicon -%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/Quick3DAssets/Ventdee_LOD0/_icons/Ventdee_LOD0_libicon@2x %%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/Quick3DAssets/Ventdee_LOD0/qmldir -%%QT_EXAMPLEDIR%%/demos/car-configurator/assets/assets_download.json %%QT_EXAMPLEDIR%%/demos/car-configurator/content/App.qml %%QT_EXAMPLEDIR%%/demos/car-configurator/content/CMakeLists.txt %%QT_EXAMPLEDIR%%/demos/car-configurator/content/CameraReset.qml %%QT_EXAMPLEDIR%%/demos/car-configurator/content/DebugBox.ui.qml -%%QT_EXAMPLEDIR%%/demos/car-configurator/content/FigmaExportCarConfig/Icons.ui.qml -%%QT_EXAMPLEDIR%%/demos/car-configurator/content/FigmaExportCarConfig/Logo.ui.qml -%%QT_EXAMPLEDIR%%/demos/car-configurator/content/FigmaExportCarConfig/SvgPathItem.qml +%%QT_EXAMPLEDIR%%/demos/car-configurator/content/DoorButton.qml %%QT_EXAMPLEDIR%%/demos/car-configurator/content/Headlights.ui.qml +%%QT_EXAMPLEDIR%%/demos/car-configurator/content/InteriorPointLight.qml %%QT_EXAMPLEDIR%%/demos/car-configurator/content/KissButton.qml %%QT_EXAMPLEDIR%%/demos/car-configurator/content/KissButtonSeparator.qml %%QT_EXAMPLEDIR%%/demos/car-configurator/content/MouseRotatorAndWASD.qml @@ -1071,17 +1049,19 @@ %%QT_EXAMPLEDIR%%/demos/car-configurator/content/WallEffect1/WallEffect1.qml %%QT_EXAMPLEDIR%%/demos/car-configurator/content/WallEffect2/WallEffect2.qml %%QT_EXAMPLEDIR%%/demos/car-configurator/content/WallEffect3/WallEffect3.qml +%%QT_EXAMPLEDIR%%/demos/car-configurator/content/assets/assets_download.json +%%QT_EXAMPLEDIR%%/demos/car-configurator/content/doorIcon/Door_button.ui.qml +%%QT_EXAMPLEDIR%%/demos/car-configurator/content/doorIcon/Icons.ui.qml +%%QT_EXAMPLEDIR%%/demos/car-configurator/content/doorIcon/Logo.ui.qml %%QT_EXAMPLEDIR%%/demos/car-configurator/content/images/builtWithQt.png %%QT_EXAMPLEDIR%%/demos/car-configurator/doc/images/car_configurator_overview.png %%QT_EXAMPLEDIR%%/demos/car-configurator/doc/src/car_configurator.qdoc -%%QT_EXAMPLEDIR%%/demos/car-configurator/hdr.qrc -%%QT_EXAMPLEDIR%%/demos/car-configurator/hdr_low.qrc %%QT_EXAMPLEDIR%%/demos/car-configurator/imports/CMakeLists.txt %%QT_EXAMPLEDIR%%/demos/car-configurator/imports/CarRendering/CMakeLists.txt %%QT_EXAMPLEDIR%%/demos/car-configurator/imports/CarRendering/Constants.qml -%%QT_EXAMPLEDIR%%/demos/car-configurator/imports/CarRendering/assetdownloader.cpp -%%QT_EXAMPLEDIR%%/demos/car-configurator/imports/CarRendering/assetdownloader.h +%%QT_EXAMPLEDIR%%/demos/car-configurator/imports/CarRendering/DirectoryFontLoader.qml %%QT_EXAMPLEDIR%%/demos/car-configurator/imports/CarRendering/qmldir +%%QT_EXAMPLEDIR%%/demos/car-configurator/qmlcomponents.cmake %%QT_EXAMPLEDIR%%/demos/car-configurator/qmlmodules.cmake %%QT_EXAMPLEDIR%%/demos/car-configurator/qtquickcontrols2.conf %%QT_EXAMPLEDIR%%/demos/car-configurator/src/app_environment.h @@ -1089,23 +1069,24 @@ %%QT_EXAMPLEDIR%%/demos/car-configurator/src/import_qml_plugins.h %%QT_EXAMPLEDIR%%/demos/car-configurator/src/main.cpp %%QT_EXAMPLEDIR%%/demos/clocks/CMakeLists.txt +%%QT_EXAMPLEDIR%%/demos/clocks/Clock.qml +%%QT_EXAMPLEDIR%%/demos/clocks/Main.qml %%QT_EXAMPLEDIR%%/demos/clocks/clocks.pro -%%QT_EXAMPLEDIR%%/demos/clocks/clocks.qml %%QT_EXAMPLEDIR%%/demos/clocks/clocks.qmlproject %%QT_EXAMPLEDIR%%/demos/clocks/clocks.qrc -%%QT_EXAMPLEDIR%%/demos/clocks/content/Clock.qml -%%QT_EXAMPLEDIR%%/demos/clocks/content/arrow.png -%%QT_EXAMPLEDIR%%/demos/clocks/content/background.png -%%QT_EXAMPLEDIR%%/demos/clocks/content/center.png -%%QT_EXAMPLEDIR%%/demos/clocks/content/clock-night.png -%%QT_EXAMPLEDIR%%/demos/clocks/content/clock.png -%%QT_EXAMPLEDIR%%/demos/clocks/content/hour.png -%%QT_EXAMPLEDIR%%/demos/clocks/content/minute.png -%%QT_EXAMPLEDIR%%/demos/clocks/content/quit.png -%%QT_EXAMPLEDIR%%/demos/clocks/content/second.png %%QT_EXAMPLEDIR%%/demos/clocks/doc/images/qtquick-demo-clocks-small.png %%QT_EXAMPLEDIR%%/demos/clocks/doc/src/clocks.qdoc +%%QT_EXAMPLEDIR%%/demos/clocks/images/arrow.png +%%QT_EXAMPLEDIR%%/demos/clocks/images/background.png +%%QT_EXAMPLEDIR%%/demos/clocks/images/center.png +%%QT_EXAMPLEDIR%%/demos/clocks/images/clock-night.png +%%QT_EXAMPLEDIR%%/demos/clocks/images/clock.png +%%QT_EXAMPLEDIR%%/demos/clocks/images/hour.png +%%QT_EXAMPLEDIR%%/demos/clocks/images/minute.png +%%QT_EXAMPLEDIR%%/demos/clocks/images/quit.png +%%QT_EXAMPLEDIR%%/demos/clocks/images/second.png %%QT_EXAMPLEDIR%%/demos/clocks/main.cpp +%%QT_EXAMPLEDIR%%/demos/clocks/qmldir %%QT_EXAMPLEDIR%%/demos/coffee/ApplicationFlow.qml %%QT_EXAMPLEDIR%%/demos/coffee/ApplicationFlowForm.ui.qml %%QT_EXAMPLEDIR%%/demos/coffee/CMakeLists.txt @@ -1212,6 +1193,7 @@ %%QT_EXAMPLEDIR%%/demos/colorpaletteclient/doc/images/colorpalette_urlselection.png %%QT_EXAMPLEDIR%%/demos/colorpaletteclient/doc/images/colorpalette_userlisting.png %%QT_EXAMPLEDIR%%/demos/colorpaletteclient/doc/src/colorpaletteclient.qdoc +%%QT_EXAMPLEDIR%%/demos/colorpaletteclient/icons/REUSE.toml %%QT_EXAMPLEDIR%%/demos/colorpaletteclient/icons/close.svg %%QT_EXAMPLEDIR%%/demos/colorpaletteclient/icons/delete.svg %%QT_EXAMPLEDIR%%/demos/colorpaletteclient/icons/dots.svg @@ -1236,9 +1218,11 @@ %%QT_EXAMPLEDIR%%/demos/dice/Carpet.qml %%QT_EXAMPLEDIR%%/demos/dice/DiceSpawner.qml %%QT_EXAMPLEDIR%%/demos/dice/Dice_low.qml +%%QT_EXAMPLEDIR%%/demos/dice/Main.qml %%QT_EXAMPLEDIR%%/demos/dice/Menu_Icon.svg %%QT_EXAMPLEDIR%%/demos/dice/PhysicalDie.qml %%QT_EXAMPLEDIR%%/demos/dice/PhysicalTable.qml +%%QT_EXAMPLEDIR%%/demos/dice/REUSE.toml %%QT_EXAMPLEDIR%%/demos/dice/RoundTable.qml %%QT_EXAMPLEDIR%%/demos/dice/Scene.qml %%QT_EXAMPLEDIR%%/demos/dice/android/AndroidManifest.xml @@ -1256,7 +1240,6 @@ %%QT_EXAMPLEDIR%%/demos/dice/license_carpet.txt %%QT_EXAMPLEDIR%%/demos/dice/license_table.txt %%QT_EXAMPLEDIR%%/demos/dice/main.cpp -%%QT_EXAMPLEDIR%%/demos/dice/main.qml %%QT_EXAMPLEDIR%%/demos/dice/maps/M_Side_Table_Natural_Wenge_Wood_4K_baseColor_small.jpg %%QT_EXAMPLEDIR%%/demos/dice/maps/M_Side_Table_Natural_Wenge_Wood_4K_metallicRoughness_small.png %%QT_EXAMPLEDIR%%/demos/dice/maps/M_Side_Table_Natural_Wenge_Wood_4K_normal_small.png @@ -1265,6 +1248,7 @@ %%QT_EXAMPLEDIR%%/demos/dice/meshes/object_2.mesh %%QT_EXAMPLEDIR%%/demos/dice/meshes/object_3.mesh %%QT_EXAMPLEDIR%%/demos/dice/meshes/side_Table_Pine_LOD0_M_Side_Table_Natural_Wenge_Wood_4K_0.mesh +%%QT_EXAMPLEDIR%%/demos/dice/qmldir %%QT_EXAMPLEDIR%%/demos/dice/qt_attribution.json %%QT_EXAMPLEDIR%%/demos/dice/sounds/onedice.wav %%QT_EXAMPLEDIR%%/demos/dice/sounds/rolling.wav @@ -1340,11 +1324,11 @@ %%QT_EXAMPLEDIR%%/demos/documentviewer/plugins/pdfviewer/zoomselector.cpp %%QT_EXAMPLEDIR%%/demos/documentviewer/plugins/pdfviewer/zoomselector.h %%QT_EXAMPLEDIR%%/demos/documentviewer/plugins/q3dviewer/CMakeLists.txt +%%QT_EXAMPLEDIR%%/demos/documentviewer/plugins/q3dviewer/QueryMimeTypes.qml +%%QT_EXAMPLEDIR%%/demos/documentviewer/plugins/q3dviewer/Viewer.qml %%QT_EXAMPLEDIR%%/demos/documentviewer/plugins/q3dviewer/q3dviewer.cpp %%QT_EXAMPLEDIR%%/demos/documentviewer/plugins/q3dviewer/q3dviewer.h %%QT_EXAMPLEDIR%%/demos/documentviewer/plugins/q3dviewer/q3dviewer.json -%%QT_EXAMPLEDIR%%/demos/documentviewer/plugins/q3dviewer/q3dviewer.qml -%%QT_EXAMPLEDIR%%/demos/documentviewer/plugins/q3dviewer/queryMimeTypes.qml %%QT_EXAMPLEDIR%%/demos/documentviewer/plugins/txtviewer/CMakeLists.txt %%QT_EXAMPLEDIR%%/demos/documentviewer/plugins/txtviewer/txtviewer.cpp %%QT_EXAMPLEDIR%%/demos/documentviewer/plugins/txtviewer/txtviewer.h @@ -1375,6 +1359,7 @@ %%QT_EXAMPLEDIR%%/demos/hangman/purchasing/android/src/org/qtproject/qt/android/purchasing/Base64.java %%QT_EXAMPLEDIR%%/demos/hangman/purchasing/android/src/org/qtproject/qt/android/purchasing/Base64DecoderException.java %%QT_EXAMPLEDIR%%/demos/hangman/purchasing/android/src/org/qtproject/qt/android/purchasing/InAppPurchase.java +%%QT_EXAMPLEDIR%%/demos/hangman/purchasing/android/src/org/qtproject/qt/android/purchasing/REUSE.toml %%QT_EXAMPLEDIR%%/demos/hangman/purchasing/android/src/org/qtproject/qt/android/purchasing/Security.java %%QT_EXAMPLEDIR%%/demos/hangman/purchasing/inapp/inappproduct.cpp %%QT_EXAMPLEDIR%%/demos/hangman/purchasing/inapp/inappproduct.h @@ -1548,12 +1533,12 @@ %%QT_EXAMPLEDIR%%/demos/lightningviewer/doc/src/lightningviewer.qdoc %%QT_EXAMPLEDIR%%/demos/lightningviewer/main.cpp %%QT_EXAMPLEDIR%%/demos/maroon/CMakeLists.txt +%%QT_EXAMPLEDIR%%/demos/maroon/Main.qml %%QT_EXAMPLEDIR%%/demos/maroon/content/BuildButton.qml %%QT_EXAMPLEDIR%%/demos/maroon/content/GameCanvas.qml %%QT_EXAMPLEDIR%%/demos/maroon/content/GameOverScreen.qml %%QT_EXAMPLEDIR%%/demos/maroon/content/InfoBar.qml %%QT_EXAMPLEDIR%%/demos/maroon/content/NewGameScreen.qml -%%QT_EXAMPLEDIR%%/demos/maroon/content/SoundEffect.qml %%QT_EXAMPLEDIR%%/demos/maroon/content/audio/bomb-action.wav %%QT_EXAMPLEDIR%%/demos/maroon/content/audio/catch-action.wav %%QT_EXAMPLEDIR%%/demos/maroon/content/audio/catch.wav @@ -1623,9 +1608,8 @@ %%QT_EXAMPLEDIR%%/demos/maroon/doc/src/maroon.qdoc %%QT_EXAMPLEDIR%%/demos/maroon/main.cpp %%QT_EXAMPLEDIR%%/demos/maroon/maroon.pro -%%QT_EXAMPLEDIR%%/demos/maroon/maroon.qml -%%QT_EXAMPLEDIR%%/demos/maroon/maroon.qmlproject %%QT_EXAMPLEDIR%%/demos/maroon/maroon.qrc +%%QT_EXAMPLEDIR%%/demos/maroon/qmldir %%QT_EXAMPLEDIR%%/demos/mediaplayer/CMakeLists.txt %%QT_EXAMPLEDIR%%/demos/mediaplayer/Config/CMakeLists.txt %%QT_EXAMPLEDIR%%/demos/mediaplayer/Config/Config.qml @@ -1700,7 +1684,7 @@ %%QT_EXAMPLEDIR%%/demos/mediaplayer/MediaPlayer/icons/Warning_Icon.svg %%QT_EXAMPLEDIR%%/demos/mediaplayer/MediaPlayer/qmldir %%QT_EXAMPLEDIR%%/demos/mediaplayer/doc/images/controls.png -%%QT_EXAMPLEDIR%%/demos/mediaplayer/doc/images/mediaplayer.png +%%QT_EXAMPLEDIR%%/demos/mediaplayer/doc/images/mediaplayerapp.png %%QT_EXAMPLEDIR%%/demos/mediaplayer/doc/images/playlist.png %%QT_EXAMPLEDIR%%/demos/mediaplayer/doc/images/project_structure.png %%QT_EXAMPLEDIR%%/demos/mediaplayer/doc/images/theme_info.png @@ -1710,6 +1694,7 @@ %%QT_EXAMPLEDIR%%/demos/mediaplayer/main.cpp %%QT_EXAMPLEDIR%%/demos/mediaplayer/mediaplayer.py %%QT_EXAMPLEDIR%%/demos/mediaplayer/mediaplayer.pyproject +%%QT_EXAMPLEDIR%%/demos/osmbuildings/3rdparty/mapbox/REUSE.toml %%QT_EXAMPLEDIR%%/demos/osmbuildings/3rdparty/mapbox/earcut.h %%QT_EXAMPLEDIR%%/demos/osmbuildings/CMakeLists.txt %%QT_EXAMPLEDIR%%/demos/osmbuildings/Main.qml @@ -1786,6 +1771,7 @@ %%QT_EXAMPLEDIR%%/demos/robotarm/src/import_qml_plugins.h %%QT_EXAMPLEDIR%%/demos/robotarm/src/main.cpp %%QT_EXAMPLEDIR%%/demos/rssnews/CMakeLists.txt +%%QT_EXAMPLEDIR%%/demos/rssnews/Main.qml %%QT_EXAMPLEDIR%%/demos/rssnews/content/BusyIndicator.qml %%QT_EXAMPLEDIR%%/demos/rssnews/content/CategoryDelegate.qml %%QT_EXAMPLEDIR%%/demos/rssnews/content/NewsDelegate.qml @@ -1809,11 +1795,12 @@ %%QT_EXAMPLEDIR%%/demos/rssnews/doc/images/qtquick-demo-rssnews-small.png %%QT_EXAMPLEDIR%%/demos/rssnews/doc/src/rssnews.qdoc %%QT_EXAMPLEDIR%%/demos/rssnews/main.cpp +%%QT_EXAMPLEDIR%%/demos/rssnews/qmldir %%QT_EXAMPLEDIR%%/demos/rssnews/rssnews.pro -%%QT_EXAMPLEDIR%%/demos/rssnews/rssnews.qml %%QT_EXAMPLEDIR%%/demos/rssnews/rssnews.qmlproject %%QT_EXAMPLEDIR%%/demos/rssnews/rssnews.qrc %%QT_EXAMPLEDIR%%/demos/samegame/CMakeLists.txt +%%QT_EXAMPLEDIR%%/demos/samegame/Main.qml %%QT_EXAMPLEDIR%%/demos/samegame/content/Block.qml %%QT_EXAMPLEDIR%%/demos/samegame/content/BlockEmitter.qml %%QT_EXAMPLEDIR%%/demos/samegame/content/Button.qml @@ -1880,14 +1867,13 @@ %%QT_EXAMPLEDIR%%/demos/samegame/content/levels/level7.qml %%QT_EXAMPLEDIR%%/demos/samegame/content/levels/level8.qml %%QT_EXAMPLEDIR%%/demos/samegame/content/levels/level9.qml -%%QT_EXAMPLEDIR%%/demos/samegame/content/qmldir %%QT_EXAMPLEDIR%%/demos/samegame/content/samegame.js %%QT_EXAMPLEDIR%%/demos/samegame/doc/images/qtquick-demo-samegame-med-1.png %%QT_EXAMPLEDIR%%/demos/samegame/doc/images/qtquick-demo-samegame-med-2.png %%QT_EXAMPLEDIR%%/demos/samegame/doc/src/samegame.qdoc %%QT_EXAMPLEDIR%%/demos/samegame/main.cpp +%%QT_EXAMPLEDIR%%/demos/samegame/qmldir %%QT_EXAMPLEDIR%%/demos/samegame/samegame.pro -%%QT_EXAMPLEDIR%%/demos/samegame/samegame.qml %%QT_EXAMPLEDIR%%/demos/samegame/samegame.qmlproject %%QT_EXAMPLEDIR%%/demos/samegame/samegame.qrc %%QT_EXAMPLEDIR%%/demos/stocqt/CMakeLists.txt @@ -2159,6 +2145,7 @@ %%QT_EXAMPLEDIR%%/demos/stocqt/src/timeformatter.h %%QT_EXAMPLEDIR%%/demos/thermostat/CMakeLists.txt %%QT_EXAMPLEDIR%%/demos/thermostat/Main.qml +%%QT_EXAMPLEDIR%%/demos/thermostat/REUSE.toml %%QT_EXAMPLEDIR%%/demos/thermostat/Thermostat.qmlproject %%QT_EXAMPLEDIR%%/demos/thermostat/content/App.qml %%QT_EXAMPLEDIR%%/demos/thermostat/content/BottomBar.qml @@ -2286,6 +2273,7 @@ %%QT_EXAMPLEDIR%%/demos/thermostat/src/main.cpp %%QT_EXAMPLEDIR%%/demos/todolist/CMakeLists.txt %%QT_EXAMPLEDIR%%/demos/todolist/Main.qml +%%QT_EXAMPLEDIR%%/demos/todolist/REUSE.toml %%QT_EXAMPLEDIR%%/demos/todolist/ToDoList.qmlproject %%QT_EXAMPLEDIR%%/demos/todolist/content/App.qml %%QT_EXAMPLEDIR%%/demos/todolist/content/CMakeLists.txt @@ -2400,6 +2388,137 @@ %%QT_EXAMPLEDIR%%/demos/todolist/src/app_environment.h %%QT_EXAMPLEDIR%%/demos/todolist/src/import_qml_plugins.h %%QT_EXAMPLEDIR%%/demos/todolist/src/main.cpp +%%QT_EXAMPLEDIR%%/demos/windowembedding/CMakeLists.txt +%%QT_EXAMPLEDIR%%/demos/windowembedding/Main.qml +%%QT_EXAMPLEDIR%%/demos/windowembedding/doc/images/android.webp +%%QT_EXAMPLEDIR%%/demos/windowembedding/doc/images/ios.webp +%%QT_EXAMPLEDIR%%/demos/windowembedding/doc/images/macos.webp +%%QT_EXAMPLEDIR%%/demos/windowembedding/doc/images/windows.webp +%%QT_EXAMPLEDIR%%/demos/windowembedding/doc/images/x11.webp +%%QT_EXAMPLEDIR%%/demos/windowembedding/doc/src/windowembedding.qdoc +%%QT_EXAMPLEDIR%%/demos/windowembedding/main.cpp +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/BeamModel.qml +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/CMakeLists.txt +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/Campfire.qml +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/CampfireMaterial.qml +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/Chair.qml +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/CommonResources.qml +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/Fence.qml +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/Fire.qml +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/FireResources.qml +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/Firewood.qml +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/Grass.qml +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/Ground.qml +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/House.qml +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/InvisibleMaterial.qml +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/Main.qml +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/ParticleResources.qml +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/PhysicsbaseTeleporter.qml +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/Prompter.qml +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/Smoke.qml +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/Stands.qml +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/Table.qml +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/TargetIndicator.qml +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/Torch.qml +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/TorchGripper.qml +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/ValueFader.qml +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/android/AndroidManifest.xml +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/doc/images/xr_physicsbase_teleportation.jpg +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/doc/src/xr_physicsbase_teleportation.qdoc +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/main.cpp +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/meshes/block/defaultMaterial_mesh.mesh +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/meshes/block/license.txt +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/meshes/block_instances.xml +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/meshes/block_instances.xml.bin +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/meshes/campfire/cube21_low_campfire_0_mesh.mesh +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/meshes/campfire/cube_0012_low_campfire_0_mesh.mesh +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/meshes/campfire/cube_0022_low_campfire_0_mesh.mesh +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/meshes/campfire/cube_0032_low_campfire_0_mesh.mesh +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/meshes/campfire/cube_003_low_campfire_0_mesh.mesh +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/meshes/campfire/cube_004_low_campfire_0_mesh.mesh +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/meshes/campfire/cube_005_low_campfire_0_mesh.mesh +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/meshes/campfire/cube_006_low_campfire_0_mesh.mesh +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/meshes/campfire/cube_007_low_campfire_0_mesh.mesh +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/meshes/campfire/cube_low_campfire_0_mesh.mesh +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/meshes/campfire/cylinder_002_low_campfire_0_mesh.mesh +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/meshes/campfire/cylinder_low_campfire_0_mesh.mesh +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/meshes/campfire/license.txt +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/meshes/chair/defaultMaterial_mesh13.mesh +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/meshes/chair/defaultMaterial_mesh16.mesh +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/meshes/chair/defaultMaterial_mesh19.mesh +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/meshes/chair/defaultMaterial_mesh5.mesh +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/meshes/chair/license.txt +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/meshes/cylinder_invert.mesh +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/meshes/fence_instances.xml +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/meshes/fence_instances.xml.bin +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/meshes/firewood/license.txt +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/meshes/firewood/plane_mesh.mesh +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/meshes/firewood_instances.xml +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/meshes/firewood_instances.xml.bin +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/meshes/house/cube_004_mesh.mesh +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/meshes/house/cube_006_mesh.mesh +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/meshes/house/cube_007_mesh.mesh +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/meshes/house/cube_009_mesh.mesh +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/meshes/house/cube_010_mesh.mesh +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/meshes/house/cube_012_mesh.mesh +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/meshes/house/cube_014_mesh.mesh +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/meshes/house/cube_016_mesh.mesh +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/meshes/house/cube_019_mesh.mesh +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/meshes/house/cube_020_mesh.mesh +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/meshes/table/defaultMaterial_mesh17.mesh +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/meshes/table/defaultMaterial_mesh20.mesh +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/meshes/table/defaultMaterial_mesh23.mesh +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/meshes/table/defaultMaterial_mesh26.mesh +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/meshes/table/defaultMaterial_mesh27.mesh +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/meshes/table/defaultMaterial_mesh7.mesh +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/meshes/table/license.txt +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/meshes/torch/license.txt +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/meshes/torch/object_1_mesh.mesh +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/shaders/fire.frag +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/shaders/fire.vert +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/shaders/grass.frag +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/shaders/grass.vert +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/shaders/invisible.frag +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/shaders/invisible.vert +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/shaders/target_indicator.frag +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/shaders/target_indicator.vert +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/textures/OpenfootageNET_lowerAustria01-1024.hdr +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/textures/bark_bc.jpg +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/textures/bark_n.jpg +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/textures/block/block_bc.jpg +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/textures/block/block_mr.jpg +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/textures/block/block_n.jpg +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/textures/campfire/campfire_bc.jpg +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/textures/campfire/campfire_mr.jpg +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/textures/campfire/campfire_n.jpg +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/textures/chair/chair_bc.jpg +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/textures/chair/chair_mr.jpg +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/textures/chair/chair_n.jpg +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/textures/fire.mp4 +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/textures/firewood/firewood_a.jpg +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/textures/firewood/firewood_bc.jpg +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/textures/firewood/firewood_n.jpg +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/textures/firewood/firewood_r.jpg +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/textures/grass_bc.jpg +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/textures/ground_bc.jpg +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/textures/ground_n.jpg +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/textures/ground_r.jpg +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/textures/house/rock_bc.jpg +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/textures/house/rock_n.jpg +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/textures/house/rock_r.jpg +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/textures/house/wood_bc.jpg +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/textures/house/wood_n.jpg +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/textures/house/wood_r.jpg +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/textures/perlin.jpg +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/textures/smoke_sprite.png +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/textures/table/table_bc.jpg +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/textures/table/table_mr.jpg +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/textures/table/table_n.jpg +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/textures/torch/torch_bc.jpg +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/textures/torch/torch_n.jpg +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/textures/torch/torch_r.jpg +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/media/textures/turbulence.png +%%QT_EXAMPLEDIR%%/demos/xr_physicsbase_teleportation/qml.qrc %%QT_EXAMPLEDIR%%/designer/CMakeLists.txt %%QT_EXAMPLEDIR%%/designer/README %%QT_EXAMPLEDIR%%/designer/calculatorbuilder/CMakeLists.txt @@ -2465,6 +2584,22 @@ %%QT_EXAMPLEDIR%%/examples.pro %%QT_EXAMPLEDIR%%/graphs/2d/2d.pro %%QT_EXAMPLEDIR%%/graphs/2d/CMakeLists.txt +%%QT_EXAMPLEDIR%%/graphs/2d/cockpit/CMakeLists.txt +%%QT_EXAMPLEDIR%%/graphs/2d/cockpit/cockpit.pro +%%QT_EXAMPLEDIR%%/graphs/2d/cockpit/doc/images/cockpit-example.png +%%QT_EXAMPLEDIR%%/graphs/2d/cockpit/doc/src/cockpit.qdoc +%%QT_EXAMPLEDIR%%/graphs/2d/cockpit/main.cpp +%%QT_EXAMPLEDIR%%/graphs/2d/cockpit/qml/cockpit/ArtificialHorizon.qml +%%QT_EXAMPLEDIR%%/graphs/2d/cockpit/qml/cockpit/ControlPanel.qml +%%QT_EXAMPLEDIR%%/graphs/2d/cockpit/qml/cockpit/Map.qml +%%QT_EXAMPLEDIR%%/graphs/2d/cockpit/qml/cockpit/Speedometer.qml +%%QT_EXAMPLEDIR%%/graphs/2d/cockpit/qml/cockpit/VibrationSensor.qml +%%QT_EXAMPLEDIR%%/graphs/2d/cockpit/qml/cockpit/airplane-ico.png +%%QT_EXAMPLEDIR%%/graphs/2d/cockpit/qml/cockpit/bar.frag +%%QT_EXAMPLEDIR%%/graphs/2d/cockpit/qml/cockpit/circleMarker.frag +%%QT_EXAMPLEDIR%%/graphs/2d/cockpit/qml/cockpit/main.qml +%%QT_EXAMPLEDIR%%/graphs/2d/cockpit/qml/cockpit/pitchbar.frag +%%QT_EXAMPLEDIR%%/graphs/2d/cockpit/qml/cockpit/plane-fro.png %%QT_EXAMPLEDIR%%/graphs/2d/examples.pri %%QT_EXAMPLEDIR%%/graphs/2d/hellographs/CMakeLists.txt %%QT_EXAMPLEDIR%%/graphs/2d/hellographs/doc/images/hellographs-example.png @@ -2499,6 +2634,15 @@ %%QT_EXAMPLEDIR%%/graphs/3d/bars/qml/bars/Axes.qml %%QT_EXAMPLEDIR%%/graphs/3d/bars/qml/bars/Data.qml %%QT_EXAMPLEDIR%%/graphs/3d/bars/qml/bars/main.qml +%%QT_EXAMPLEDIR%%/graphs/3d/equation/CMakeLists.txt +%%QT_EXAMPLEDIR%%/graphs/3d/equation/doc/images/equation-example.png +%%QT_EXAMPLEDIR%%/graphs/3d/equation/doc/src/equation.qdoc +%%QT_EXAMPLEDIR%%/graphs/3d/equation/equation.pro +%%QT_EXAMPLEDIR%%/graphs/3d/equation/equation.qrc +%%QT_EXAMPLEDIR%%/graphs/3d/equation/images/opacitymap.png +%%QT_EXAMPLEDIR%%/graphs/3d/equation/main.cpp +%%QT_EXAMPLEDIR%%/graphs/3d/equation/qml/equation/Main.qml +%%QT_EXAMPLEDIR%%/graphs/3d/equation/qml/equation/calculator.js %%QT_EXAMPLEDIR%%/graphs/3d/examples.pri %%QT_EXAMPLEDIR%%/graphs/3d/scatter/CMakeLists.txt %%QT_EXAMPLEDIR%%/graphs/3d/scatter/doc/images/scatter-example.png @@ -2534,12 +2678,8 @@ %%QT_EXAMPLEDIR%%/graphs/3d/surfacegallery/surfacegallery.pro %%QT_EXAMPLEDIR%%/graphs/3d/surfacegallery/surfacegallery.qrc %%QT_EXAMPLEDIR%%/graphs/3d/widgetgraphgallery/CMakeLists.txt -%%QT_EXAMPLEDIR%%/graphs/3d/widgetgraphgallery/axesinputhandler.cpp -%%QT_EXAMPLEDIR%%/graphs/3d/widgetgraphgallery/axesinputhandler.h %%QT_EXAMPLEDIR%%/graphs/3d/widgetgraphgallery/bargraph.cpp %%QT_EXAMPLEDIR%%/graphs/3d/widgetgraphgallery/bargraph.h -%%QT_EXAMPLEDIR%%/graphs/3d/widgetgraphgallery/custominputhandler.cpp -%%QT_EXAMPLEDIR%%/graphs/3d/widgetgraphgallery/custominputhandler.h %%QT_EXAMPLEDIR%%/graphs/3d/widgetgraphgallery/data/layer_1.png %%QT_EXAMPLEDIR%%/graphs/3d/widgetgraphgallery/data/layer_2.png %%QT_EXAMPLEDIR%%/graphs/3d/widgetgraphgallery/data/layer_3.png @@ -2565,10 +2705,14 @@ %%QT_EXAMPLEDIR%%/graphs/3d/widgetgraphgallery/scatterdatamodifier.h %%QT_EXAMPLEDIR%%/graphs/3d/widgetgraphgallery/scattergraph.cpp %%QT_EXAMPLEDIR%%/graphs/3d/widgetgraphgallery/scattergraph.h +%%QT_EXAMPLEDIR%%/graphs/3d/widgetgraphgallery/scattergraphwidget.cpp +%%QT_EXAMPLEDIR%%/graphs/3d/widgetgraphgallery/scattergraphwidget.h %%QT_EXAMPLEDIR%%/graphs/3d/widgetgraphgallery/surfacegraph.cpp %%QT_EXAMPLEDIR%%/graphs/3d/widgetgraphgallery/surfacegraph.h %%QT_EXAMPLEDIR%%/graphs/3d/widgetgraphgallery/surfacegraphmodifier.cpp %%QT_EXAMPLEDIR%%/graphs/3d/widgetgraphgallery/surfacegraphmodifier.h +%%QT_EXAMPLEDIR%%/graphs/3d/widgetgraphgallery/surfacegraphwidget.cpp +%%QT_EXAMPLEDIR%%/graphs/3d/widgetgraphgallery/surfacegraphwidget.h %%QT_EXAMPLEDIR%%/graphs/3d/widgetgraphgallery/topographicseries.cpp %%QT_EXAMPLEDIR%%/graphs/3d/widgetgraphgallery/topographicseries.h %%QT_EXAMPLEDIR%%/graphs/3d/widgetgraphgallery/variantbardatamapping.cpp @@ -2637,6 +2781,7 @@ %%QT_EXAMPLEDIR%%/help/contextsensitivehelp/wateringconfigdialog.cpp %%QT_EXAMPLEDIR%%/help/contextsensitivehelp/wateringconfigdialog.h %%QT_EXAMPLEDIR%%/help/contextsensitivehelp/wateringconfigdialog.ui +%%QT_EXAMPLEDIR%%/help/doc/images/context-sensitive-help-example.png %%QT_EXAMPLEDIR%%/help/doc/src/contextsensitivehelp.qdoc %%QT_EXAMPLEDIR%%/help/help.pro %%QT_EXAMPLEDIR%%/httpserver/CMakeLists.txt @@ -2674,6 +2819,7 @@ %%QT_EXAMPLEDIR%%/linguist/arrowpad/arrowpad.cpp %%QT_EXAMPLEDIR%%/linguist/arrowpad/arrowpad.h %%QT_EXAMPLEDIR%%/linguist/arrowpad/arrowpad.pro +%%QT_EXAMPLEDIR%%/linguist/arrowpad/arrowpad_en.ts %%QT_EXAMPLEDIR%%/linguist/arrowpad/arrowpad_fr.ts %%QT_EXAMPLEDIR%%/linguist/arrowpad/arrowpad_nl.ts %%QT_EXAMPLEDIR%%/linguist/arrowpad/main.cpp @@ -2700,6 +2846,7 @@ %%QT_EXAMPLEDIR%%/linguist/doc/src/trollprint.qdoc %%QT_EXAMPLEDIR%%/linguist/hellotr/CMakeLists.txt %%QT_EXAMPLEDIR%%/linguist/hellotr/hellotr.pro +%%QT_EXAMPLEDIR%%/linguist/hellotr/hellotr_en.ts %%QT_EXAMPLEDIR%%/linguist/hellotr/hellotr_la.ts %%QT_EXAMPLEDIR%%/linguist/hellotr/main.cpp %%QT_EXAMPLEDIR%%/linguist/i18n/CMakeLists.txt @@ -2731,6 +2878,7 @@ %%QT_EXAMPLEDIR%%/linguist/trollprint/printpanel.cpp %%QT_EXAMPLEDIR%%/linguist/trollprint/printpanel.h %%QT_EXAMPLEDIR%%/linguist/trollprint/trollprint.pro +%%QT_EXAMPLEDIR%%/linguist/trollprint/trollprint_en.ts %%QT_EXAMPLEDIR%%/linguist/trollprint/trollprint_pt.ts %%QT_EXAMPLEDIR%%/mqtt/CMakeLists.txt %%QT_EXAMPLEDIR%%/mqtt/doc/examples.qdoc @@ -2877,6 +3025,7 @@ %%QT_EXAMPLEDIR%%/multimedia/declarative-camera/images/camera_white_balance_sunny.png %%QT_EXAMPLEDIR%%/multimedia/declarative-camera/images/toolbutton.png %%QT_EXAMPLEDIR%%/multimedia/declarative-camera/images/toolbutton.sci +%%QT_EXAMPLEDIR%%/multimedia/declarative-camera/permission-denied.qml %%QT_EXAMPLEDIR%%/multimedia/declarative-camera/qmlcamera.cpp %%QT_EXAMPLEDIR%%/multimedia/multimedia.pro %%QT_EXAMPLEDIR%%/multimedia/player/CMakeLists.txt @@ -3427,8 +3576,6 @@ %%QT_EXAMPLEDIR%%/oauth/redditclient/redditclient.pro %%QT_EXAMPLEDIR%%/oauth/redditclient/redditmodel.cpp %%QT_EXAMPLEDIR%%/oauth/redditclient/redditmodel.h -%%QT_EXAMPLEDIR%%/oauth/redditclient/redditwrapper.cpp -%%QT_EXAMPLEDIR%%/oauth/redditclient/redditwrapper.h %%QT_EXAMPLEDIR%%/opcua/CMakeLists.txt %%QT_EXAMPLEDIR%%/opcua/doc/qtopcua-examples.qdoc %%QT_EXAMPLEDIR%%/opcua/opcua.pro @@ -3665,80 +3812,182 @@ %%QT_EXAMPLEDIR%%/platforms/CMakeLists.txt %%QT_EXAMPLEDIR%%/platforms/android/CMakeLists.txt %%QT_EXAMPLEDIR%%/platforms/android/doc/images/portrait_java.png -%%QT_EXAMPLEDIR%%/platforms/android/doc/src/qml_in_android_studio_projects.qdoc -%%QT_EXAMPLEDIR%%/platforms/android/qml_in_android_view/CMakeLists.txt -%%QT_EXAMPLEDIR%%/platforms/android/qml_in_android_view/main.cpp -%%QT_EXAMPLEDIR%%/platforms/android/qml_in_android_view/main.qml -%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/CMakeLists.txt -%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/build.gradle -%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/AndroidManifest.xml -%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/java/com/example/qml_in_java_based_android_project/Colors.java -%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/java/com/example/qml_in_java_based_android_project/MainActivity.java -%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/drawable/ic_launcher_background.xml -%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/drawable/ic_launcher_foreground.xml -%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/layout/activity_main.xml -%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml -%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml -%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/mipmap-hdpi/ic_launcher.webp -%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp -%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp -%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/mipmap-mdpi/ic_launcher.webp -%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp -%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp -%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/mipmap-xhdpi/ic_launcher.webp -%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp -%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp -%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp -%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp -%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp -%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp -%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp -%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp -%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/values/colors.xml -%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/values/strings.xml -%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/values/styles.xml -%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/values/themes.xml -%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/xml/backup_rules.xml -%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/xml/data_extraction_rules.xml -%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/build.gradle -%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/gradle.properties -%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/gradle/wrapper/gradle-wrapper.properties -%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/settings.gradle -%%QT_EXAMPLEDIR%%/platforms/android/qml_in_kotlin_based_android_project/CMakeLists.txt -%%QT_EXAMPLEDIR%%/platforms/android/qml_in_kotlin_based_android_project/app/build.gradle -%%QT_EXAMPLEDIR%%/platforms/android/qml_in_kotlin_based_android_project/app/src/main/AndroidManifest.xml -%%QT_EXAMPLEDIR%%/platforms/android/qml_in_kotlin_based_android_project/app/src/main/java/com/example/qml_in_kotlin_based_android_project/Colors.kt -%%QT_EXAMPLEDIR%%/platforms/android/qml_in_kotlin_based_android_project/app/src/main/java/com/example/qml_in_kotlin_based_android_project/MainActivity.kt -%%QT_EXAMPLEDIR%%/platforms/android/qml_in_kotlin_based_android_project/app/src/main/res/drawable/ic_launcher_background.xml -%%QT_EXAMPLEDIR%%/platforms/android/qml_in_kotlin_based_android_project/app/src/main/res/drawable/ic_launcher_foreground.xml -%%QT_EXAMPLEDIR%%/platforms/android/qml_in_kotlin_based_android_project/app/src/main/res/layout/activity_main.xml -%%QT_EXAMPLEDIR%%/platforms/android/qml_in_kotlin_based_android_project/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml -%%QT_EXAMPLEDIR%%/platforms/android/qml_in_kotlin_based_android_project/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml -%%QT_EXAMPLEDIR%%/platforms/android/qml_in_kotlin_based_android_project/app/src/main/res/mipmap-hdpi/ic_launcher.webp -%%QT_EXAMPLEDIR%%/platforms/android/qml_in_kotlin_based_android_project/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp -%%QT_EXAMPLEDIR%%/platforms/android/qml_in_kotlin_based_android_project/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp -%%QT_EXAMPLEDIR%%/platforms/android/qml_in_kotlin_based_android_project/app/src/main/res/mipmap-mdpi/ic_launcher.webp -%%QT_EXAMPLEDIR%%/platforms/android/qml_in_kotlin_based_android_project/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp -%%QT_EXAMPLEDIR%%/platforms/android/qml_in_kotlin_based_android_project/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp -%%QT_EXAMPLEDIR%%/platforms/android/qml_in_kotlin_based_android_project/app/src/main/res/mipmap-xhdpi/ic_launcher.webp -%%QT_EXAMPLEDIR%%/platforms/android/qml_in_kotlin_based_android_project/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp -%%QT_EXAMPLEDIR%%/platforms/android/qml_in_kotlin_based_android_project/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp -%%QT_EXAMPLEDIR%%/platforms/android/qml_in_kotlin_based_android_project/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp -%%QT_EXAMPLEDIR%%/platforms/android/qml_in_kotlin_based_android_project/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp -%%QT_EXAMPLEDIR%%/platforms/android/qml_in_kotlin_based_android_project/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp -%%QT_EXAMPLEDIR%%/platforms/android/qml_in_kotlin_based_android_project/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp -%%QT_EXAMPLEDIR%%/platforms/android/qml_in_kotlin_based_android_project/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp -%%QT_EXAMPLEDIR%%/platforms/android/qml_in_kotlin_based_android_project/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp -%%QT_EXAMPLEDIR%%/platforms/android/qml_in_kotlin_based_android_project/app/src/main/res/values/colors.xml -%%QT_EXAMPLEDIR%%/platforms/android/qml_in_kotlin_based_android_project/app/src/main/res/values/strings.xml -%%QT_EXAMPLEDIR%%/platforms/android/qml_in_kotlin_based_android_project/app/src/main/res/values/styles.xml -%%QT_EXAMPLEDIR%%/platforms/android/qml_in_kotlin_based_android_project/app/src/main/res/values/themes.xml -%%QT_EXAMPLEDIR%%/platforms/android/qml_in_kotlin_based_android_project/app/src/main/res/xml/backup_rules.xml -%%QT_EXAMPLEDIR%%/platforms/android/qml_in_kotlin_based_android_project/app/src/main/res/xml/data_extraction_rules.xml -%%QT_EXAMPLEDIR%%/platforms/android/qml_in_kotlin_based_android_project/build.gradle -%%QT_EXAMPLEDIR%%/platforms/android/qml_in_kotlin_based_android_project/gradle.properties -%%QT_EXAMPLEDIR%%/platforms/android/qml_in_kotlin_based_android_project/gradle/wrapper/gradle-wrapper.properties -%%QT_EXAMPLEDIR%%/platforms/android/qml_in_kotlin_based_android_project/settings.gradle +%%QT_EXAMPLEDIR%%/platforms/android/doc/images/qtabstractitemmodel_portrait.png +%%QT_EXAMPLEDIR%%/platforms/android/doc/images/qtabstractlistmodel_portrait.png +%%QT_EXAMPLEDIR%%/platforms/android/doc/src/qtabstractitemmodel_in_android_studio_projects.qdoc +%%QT_EXAMPLEDIR%%/platforms/android/doc/src/qtabstractlistmodel_kotlin_example.qdoc +%%QT_EXAMPLEDIR%%/platforms/android/doc/src/qtquick_for_android_studio_projects.qdoc +%%QT_EXAMPLEDIR%%/platforms/android/models/qtabstractitemmodel/CMakeLists.txt +%%QT_EXAMPLEDIR%%/platforms/android/models/qtabstractitemmodel/Main.qml +%%QT_EXAMPLEDIR%%/platforms/android/models/qtabstractitemmodel/main.cpp +%%QT_EXAMPLEDIR%%/platforms/android/models/qtabstractitemmodel_java/app/build.gradle +%%QT_EXAMPLEDIR%%/platforms/android/models/qtabstractitemmodel_java/app/src/main/AndroidManifest.xml +%%QT_EXAMPLEDIR%%/platforms/android/models/qtabstractitemmodel_java/app/src/main/java/com/example/qtabstractitemmodel_java/MainActivity.java +%%QT_EXAMPLEDIR%%/platforms/android/models/qtabstractitemmodel_java/app/src/main/java/com/example/qtabstractitemmodel_java/MyDataModel.java +%%QT_EXAMPLEDIR%%/platforms/android/models/qtabstractitemmodel_java/app/src/main/res/drawable/ic_launcher_background.xml +%%QT_EXAMPLEDIR%%/platforms/android/models/qtabstractitemmodel_java/app/src/main/res/drawable/ic_launcher_foreground.xml +%%QT_EXAMPLEDIR%%/platforms/android/models/qtabstractitemmodel_java/app/src/main/res/layout/activity_main.xml +%%QT_EXAMPLEDIR%%/platforms/android/models/qtabstractitemmodel_java/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +%%QT_EXAMPLEDIR%%/platforms/android/models/qtabstractitemmodel_java/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +%%QT_EXAMPLEDIR%%/platforms/android/models/qtabstractitemmodel_java/app/src/main/res/mipmap-hdpi/ic_launcher.webp +%%QT_EXAMPLEDIR%%/platforms/android/models/qtabstractitemmodel_java/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp +%%QT_EXAMPLEDIR%%/platforms/android/models/qtabstractitemmodel_java/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp +%%QT_EXAMPLEDIR%%/platforms/android/models/qtabstractitemmodel_java/app/src/main/res/mipmap-mdpi/ic_launcher.webp +%%QT_EXAMPLEDIR%%/platforms/android/models/qtabstractitemmodel_java/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp +%%QT_EXAMPLEDIR%%/platforms/android/models/qtabstractitemmodel_java/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp +%%QT_EXAMPLEDIR%%/platforms/android/models/qtabstractitemmodel_java/app/src/main/res/mipmap-xhdpi/ic_launcher.webp +%%QT_EXAMPLEDIR%%/platforms/android/models/qtabstractitemmodel_java/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp +%%QT_EXAMPLEDIR%%/platforms/android/models/qtabstractitemmodel_java/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp +%%QT_EXAMPLEDIR%%/platforms/android/models/qtabstractitemmodel_java/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp +%%QT_EXAMPLEDIR%%/platforms/android/models/qtabstractitemmodel_java/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp +%%QT_EXAMPLEDIR%%/platforms/android/models/qtabstractitemmodel_java/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp +%%QT_EXAMPLEDIR%%/platforms/android/models/qtabstractitemmodel_java/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp +%%QT_EXAMPLEDIR%%/platforms/android/models/qtabstractitemmodel_java/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp +%%QT_EXAMPLEDIR%%/platforms/android/models/qtabstractitemmodel_java/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp +%%QT_EXAMPLEDIR%%/platforms/android/models/qtabstractitemmodel_java/app/src/main/res/values-hdpi/dimens.xml +%%QT_EXAMPLEDIR%%/platforms/android/models/qtabstractitemmodel_java/app/src/main/res/values-ldpi/dimens.xml +%%QT_EXAMPLEDIR%%/platforms/android/models/qtabstractitemmodel_java/app/src/main/res/values-mdpi/dimens.xml +%%QT_EXAMPLEDIR%%/platforms/android/models/qtabstractitemmodel_java/app/src/main/res/values-night/themes.xml +%%QT_EXAMPLEDIR%%/platforms/android/models/qtabstractitemmodel_java/app/src/main/res/values-xhdpi/dimens.xml +%%QT_EXAMPLEDIR%%/platforms/android/models/qtabstractitemmodel_java/app/src/main/res/values-xxhdpi/dimens.xml +%%QT_EXAMPLEDIR%%/platforms/android/models/qtabstractitemmodel_java/app/src/main/res/values/colors.xml +%%QT_EXAMPLEDIR%%/platforms/android/models/qtabstractitemmodel_java/app/src/main/res/values/strings.xml +%%QT_EXAMPLEDIR%%/platforms/android/models/qtabstractitemmodel_java/app/src/main/res/values/themes.xml +%%QT_EXAMPLEDIR%%/platforms/android/models/qtabstractitemmodel_java/app/src/main/res/xml/backup_rules.xml +%%QT_EXAMPLEDIR%%/platforms/android/models/qtabstractitemmodel_java/app/src/main/res/xml/data_extraction_rules.xml +%%QT_EXAMPLEDIR%%/platforms/android/models/qtabstractitemmodel_java/build.gradle +%%QT_EXAMPLEDIR%%/platforms/android/models/qtabstractitemmodel_java/gradle.properties +%%QT_EXAMPLEDIR%%/platforms/android/models/qtabstractitemmodel_java/gradle/wrapper/gradle-wrapper.properties +%%QT_EXAMPLEDIR%%/platforms/android/models/qtabstractitemmodel_java/settings.gradle +%%QT_EXAMPLEDIR%%/platforms/android/models/qtabstractlistmodel/CMakeLists.txt +%%QT_EXAMPLEDIR%%/platforms/android/models/qtabstractlistmodel/Main.qml +%%QT_EXAMPLEDIR%%/platforms/android/models/qtabstractlistmodel/main.cpp +%%QT_EXAMPLEDIR%%/platforms/android/models/qtabstractlistmodel_kotlin/app/build.gradle.kts +%%QT_EXAMPLEDIR%%/platforms/android/models/qtabstractlistmodel_kotlin/app/src/main/AndroidManifest.xml +%%QT_EXAMPLEDIR%%/platforms/android/models/qtabstractlistmodel_kotlin/app/src/main/java/com/example/qtabstractlistmodel_kotlin/MainActivity.kt +%%QT_EXAMPLEDIR%%/platforms/android/models/qtabstractlistmodel_kotlin/app/src/main/java/com/example/qtabstractlistmodel_kotlin/MyListModel.kt +%%QT_EXAMPLEDIR%%/platforms/android/models/qtabstractlistmodel_kotlin/app/src/main/res/drawable/ic_launcher_background.xml +%%QT_EXAMPLEDIR%%/platforms/android/models/qtabstractlistmodel_kotlin/app/src/main/res/drawable/ic_launcher_foreground.xml +%%QT_EXAMPLEDIR%%/platforms/android/models/qtabstractlistmodel_kotlin/app/src/main/res/layout/activity_main.xml +%%QT_EXAMPLEDIR%%/platforms/android/models/qtabstractlistmodel_kotlin/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +%%QT_EXAMPLEDIR%%/platforms/android/models/qtabstractlistmodel_kotlin/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +%%QT_EXAMPLEDIR%%/platforms/android/models/qtabstractlistmodel_kotlin/app/src/main/res/mipmap-hdpi/ic_launcher.webp +%%QT_EXAMPLEDIR%%/platforms/android/models/qtabstractlistmodel_kotlin/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp +%%QT_EXAMPLEDIR%%/platforms/android/models/qtabstractlistmodel_kotlin/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp +%%QT_EXAMPLEDIR%%/platforms/android/models/qtabstractlistmodel_kotlin/app/src/main/res/mipmap-mdpi/ic_launcher.webp +%%QT_EXAMPLEDIR%%/platforms/android/models/qtabstractlistmodel_kotlin/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp +%%QT_EXAMPLEDIR%%/platforms/android/models/qtabstractlistmodel_kotlin/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp +%%QT_EXAMPLEDIR%%/platforms/android/models/qtabstractlistmodel_kotlin/app/src/main/res/mipmap-xhdpi/ic_launcher.webp +%%QT_EXAMPLEDIR%%/platforms/android/models/qtabstractlistmodel_kotlin/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp +%%QT_EXAMPLEDIR%%/platforms/android/models/qtabstractlistmodel_kotlin/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp +%%QT_EXAMPLEDIR%%/platforms/android/models/qtabstractlistmodel_kotlin/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp +%%QT_EXAMPLEDIR%%/platforms/android/models/qtabstractlistmodel_kotlin/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp +%%QT_EXAMPLEDIR%%/platforms/android/models/qtabstractlistmodel_kotlin/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp +%%QT_EXAMPLEDIR%%/platforms/android/models/qtabstractlistmodel_kotlin/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp +%%QT_EXAMPLEDIR%%/platforms/android/models/qtabstractlistmodel_kotlin/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp +%%QT_EXAMPLEDIR%%/platforms/android/models/qtabstractlistmodel_kotlin/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp +%%QT_EXAMPLEDIR%%/platforms/android/models/qtabstractlistmodel_kotlin/app/src/main/res/values-hdpi/dimens.xml +%%QT_EXAMPLEDIR%%/platforms/android/models/qtabstractlistmodel_kotlin/app/src/main/res/values-ldpi/dimens.xml +%%QT_EXAMPLEDIR%%/platforms/android/models/qtabstractlistmodel_kotlin/app/src/main/res/values-mdpi/dimens.xml +%%QT_EXAMPLEDIR%%/platforms/android/models/qtabstractlistmodel_kotlin/app/src/main/res/values-xhdpi/dimens.xml +%%QT_EXAMPLEDIR%%/platforms/android/models/qtabstractlistmodel_kotlin/app/src/main/res/values-xxhdpi/dimens.xml +%%QT_EXAMPLEDIR%%/platforms/android/models/qtabstractlistmodel_kotlin/app/src/main/res/values/colors.xml +%%QT_EXAMPLEDIR%%/platforms/android/models/qtabstractlistmodel_kotlin/app/src/main/res/values/strings.xml +%%QT_EXAMPLEDIR%%/platforms/android/models/qtabstractlistmodel_kotlin/app/src/main/res/values/themes.xml +%%QT_EXAMPLEDIR%%/platforms/android/models/qtabstractlistmodel_kotlin/app/src/main/res/xml/backup_rules.xml +%%QT_EXAMPLEDIR%%/platforms/android/models/qtabstractlistmodel_kotlin/app/src/main/res/xml/data_extraction_rules.xml +%%QT_EXAMPLEDIR%%/platforms/android/models/qtabstractlistmodel_kotlin/build.gradle.kts +%%QT_EXAMPLEDIR%%/platforms/android/models/qtabstractlistmodel_kotlin/gradle.properties +%%QT_EXAMPLEDIR%%/platforms/android/models/qtabstractlistmodel_kotlin/gradle/wrapper/gradle-wrapper.properties +%%QT_EXAMPLEDIR%%/platforms/android/models/qtabstractlistmodel_kotlin/settings.gradle.kts +%%QT_EXAMPLEDIR%%/platforms/android/qtquickview/CMakeLists.txt +%%QT_EXAMPLEDIR%%/platforms/android/qtquickview/Main.qml +%%QT_EXAMPLEDIR%%/platforms/android/qtquickview/Second.qml +%%QT_EXAMPLEDIR%%/platforms/android/qtquickview/main.cpp +%%QT_EXAMPLEDIR%%/platforms/android/qtquickview_java/CMakeLists.txt +%%QT_EXAMPLEDIR%%/platforms/android/qtquickview_java/app/build.gradle +%%QT_EXAMPLEDIR%%/platforms/android/qtquickview_java/app/src/main/AndroidManifest.xml +%%QT_EXAMPLEDIR%%/platforms/android/qtquickview_java/app/src/main/java/com/example/qtquickview_java/Colors.java +%%QT_EXAMPLEDIR%%/platforms/android/qtquickview_java/app/src/main/java/com/example/qtquickview_java/MainActivity.java +%%QT_EXAMPLEDIR%%/platforms/android/qtquickview_java/app/src/main/res/drawable/ic_launcher_background.xml +%%QT_EXAMPLEDIR%%/platforms/android/qtquickview_java/app/src/main/res/drawable/ic_launcher_foreground.xml +%%QT_EXAMPLEDIR%%/platforms/android/qtquickview_java/app/src/main/res/drawable/switch_thumb.xml +%%QT_EXAMPLEDIR%%/platforms/android/qtquickview_java/app/src/main/res/drawable/switch_track.xml +%%QT_EXAMPLEDIR%%/platforms/android/qtquickview_java/app/src/main/res/layout/activity_main.xml +%%QT_EXAMPLEDIR%%/platforms/android/qtquickview_java/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +%%QT_EXAMPLEDIR%%/platforms/android/qtquickview_java/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +%%QT_EXAMPLEDIR%%/platforms/android/qtquickview_java/app/src/main/res/mipmap-hdpi/ic_launcher.webp +%%QT_EXAMPLEDIR%%/platforms/android/qtquickview_java/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp +%%QT_EXAMPLEDIR%%/platforms/android/qtquickview_java/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp +%%QT_EXAMPLEDIR%%/platforms/android/qtquickview_java/app/src/main/res/mipmap-mdpi/ic_launcher.webp +%%QT_EXAMPLEDIR%%/platforms/android/qtquickview_java/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp +%%QT_EXAMPLEDIR%%/platforms/android/qtquickview_java/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp +%%QT_EXAMPLEDIR%%/platforms/android/qtquickview_java/app/src/main/res/mipmap-xhdpi/ic_launcher.webp +%%QT_EXAMPLEDIR%%/platforms/android/qtquickview_java/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp +%%QT_EXAMPLEDIR%%/platforms/android/qtquickview_java/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp +%%QT_EXAMPLEDIR%%/platforms/android/qtquickview_java/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp +%%QT_EXAMPLEDIR%%/platforms/android/qtquickview_java/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp +%%QT_EXAMPLEDIR%%/platforms/android/qtquickview_java/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp +%%QT_EXAMPLEDIR%%/platforms/android/qtquickview_java/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp +%%QT_EXAMPLEDIR%%/platforms/android/qtquickview_java/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp +%%QT_EXAMPLEDIR%%/platforms/android/qtquickview_java/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp +%%QT_EXAMPLEDIR%%/platforms/android/qtquickview_java/app/src/main/res/values-hdpi/dimens.xml +%%QT_EXAMPLEDIR%%/platforms/android/qtquickview_java/app/src/main/res/values-ldpi/dimens.xml +%%QT_EXAMPLEDIR%%/platforms/android/qtquickview_java/app/src/main/res/values-xhdpi/dimens.xml +%%QT_EXAMPLEDIR%%/platforms/android/qtquickview_java/app/src/main/res/values-xxhdpi/dimens.xml +%%QT_EXAMPLEDIR%%/platforms/android/qtquickview_java/app/src/main/res/values/colors.xml +%%QT_EXAMPLEDIR%%/platforms/android/qtquickview_java/app/src/main/res/values/dimens.xml +%%QT_EXAMPLEDIR%%/platforms/android/qtquickview_java/app/src/main/res/values/strings.xml +%%QT_EXAMPLEDIR%%/platforms/android/qtquickview_java/app/src/main/res/values/styles.xml +%%QT_EXAMPLEDIR%%/platforms/android/qtquickview_java/app/src/main/res/values/themes.xml +%%QT_EXAMPLEDIR%%/platforms/android/qtquickview_java/app/src/main/res/xml/backup_rules.xml +%%QT_EXAMPLEDIR%%/platforms/android/qtquickview_java/app/src/main/res/xml/data_extraction_rules.xml +%%QT_EXAMPLEDIR%%/platforms/android/qtquickview_java/build.gradle +%%QT_EXAMPLEDIR%%/platforms/android/qtquickview_java/gradle.properties +%%QT_EXAMPLEDIR%%/platforms/android/qtquickview_java/gradle/wrapper/gradle-wrapper.properties +%%QT_EXAMPLEDIR%%/platforms/android/qtquickview_java/settings.gradle +%%QT_EXAMPLEDIR%%/platforms/android/qtquickview_kotlin/CMakeLists.txt +%%QT_EXAMPLEDIR%%/platforms/android/qtquickview_kotlin/app/build.gradle.kts +%%QT_EXAMPLEDIR%%/platforms/android/qtquickview_kotlin/app/src/main/AndroidManifest.xml +%%QT_EXAMPLEDIR%%/platforms/android/qtquickview_kotlin/app/src/main/java/com/example/qtquickview_kotlin/Colors.kt +%%QT_EXAMPLEDIR%%/platforms/android/qtquickview_kotlin/app/src/main/java/com/example/qtquickview_kotlin/MainActivity.kt +%%QT_EXAMPLEDIR%%/platforms/android/qtquickview_kotlin/app/src/main/res/drawable/ic_launcher_background.xml +%%QT_EXAMPLEDIR%%/platforms/android/qtquickview_kotlin/app/src/main/res/drawable/ic_launcher_foreground.xml +%%QT_EXAMPLEDIR%%/platforms/android/qtquickview_kotlin/app/src/main/res/drawable/switch_thumb.xml +%%QT_EXAMPLEDIR%%/platforms/android/qtquickview_kotlin/app/src/main/res/drawable/switch_track.xml +%%QT_EXAMPLEDIR%%/platforms/android/qtquickview_kotlin/app/src/main/res/layout/activity_main.xml +%%QT_EXAMPLEDIR%%/platforms/android/qtquickview_kotlin/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +%%QT_EXAMPLEDIR%%/platforms/android/qtquickview_kotlin/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +%%QT_EXAMPLEDIR%%/platforms/android/qtquickview_kotlin/app/src/main/res/mipmap-hdpi/ic_launcher.webp +%%QT_EXAMPLEDIR%%/platforms/android/qtquickview_kotlin/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp +%%QT_EXAMPLEDIR%%/platforms/android/qtquickview_kotlin/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp +%%QT_EXAMPLEDIR%%/platforms/android/qtquickview_kotlin/app/src/main/res/mipmap-mdpi/ic_launcher.webp +%%QT_EXAMPLEDIR%%/platforms/android/qtquickview_kotlin/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp +%%QT_EXAMPLEDIR%%/platforms/android/qtquickview_kotlin/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp +%%QT_EXAMPLEDIR%%/platforms/android/qtquickview_kotlin/app/src/main/res/mipmap-xhdpi/ic_launcher.webp +%%QT_EXAMPLEDIR%%/platforms/android/qtquickview_kotlin/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp +%%QT_EXAMPLEDIR%%/platforms/android/qtquickview_kotlin/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp +%%QT_EXAMPLEDIR%%/platforms/android/qtquickview_kotlin/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp +%%QT_EXAMPLEDIR%%/platforms/android/qtquickview_kotlin/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp +%%QT_EXAMPLEDIR%%/platforms/android/qtquickview_kotlin/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp +%%QT_EXAMPLEDIR%%/platforms/android/qtquickview_kotlin/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp +%%QT_EXAMPLEDIR%%/platforms/android/qtquickview_kotlin/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp +%%QT_EXAMPLEDIR%%/platforms/android/qtquickview_kotlin/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp +%%QT_EXAMPLEDIR%%/platforms/android/qtquickview_kotlin/app/src/main/res/values-hdpi/dimens.xml +%%QT_EXAMPLEDIR%%/platforms/android/qtquickview_kotlin/app/src/main/res/values-ldpi/dimens.xml +%%QT_EXAMPLEDIR%%/platforms/android/qtquickview_kotlin/app/src/main/res/values-xhdpi/dimens.xml +%%QT_EXAMPLEDIR%%/platforms/android/qtquickview_kotlin/app/src/main/res/values-xxhdpi/dimens.xml +%%QT_EXAMPLEDIR%%/platforms/android/qtquickview_kotlin/app/src/main/res/values/colors.xml +%%QT_EXAMPLEDIR%%/platforms/android/qtquickview_kotlin/app/src/main/res/values/dimens.xml +%%QT_EXAMPLEDIR%%/platforms/android/qtquickview_kotlin/app/src/main/res/values/strings.xml +%%QT_EXAMPLEDIR%%/platforms/android/qtquickview_kotlin/app/src/main/res/values/styles.xml +%%QT_EXAMPLEDIR%%/platforms/android/qtquickview_kotlin/app/src/main/res/values/themes.xml +%%QT_EXAMPLEDIR%%/platforms/android/qtquickview_kotlin/app/src/main/res/xml/backup_rules.xml +%%QT_EXAMPLEDIR%%/platforms/android/qtquickview_kotlin/app/src/main/res/xml/data_extraction_rules.xml +%%QT_EXAMPLEDIR%%/platforms/android/qtquickview_kotlin/build.gradle.kts +%%QT_EXAMPLEDIR%%/platforms/android/qtquickview_kotlin/gradle.properties +%%QT_EXAMPLEDIR%%/platforms/android/qtquickview_kotlin/gradle/wrapper/gradle-wrapper.properties +%%QT_EXAMPLEDIR%%/platforms/android/qtquickview_kotlin/settings.gradle.kts %%QT_EXAMPLEDIR%%/positioning/CMakeLists.txt %%QT_EXAMPLEDIR%%/positioning/logfilepositionsource/CMakeLists.txt %%QT_EXAMPLEDIR%%/positioning/logfilepositionsource/clientapplication.cpp @@ -3770,9 +4019,11 @@ %%QT_EXAMPLEDIR%%/positioning/satelliteinfo/doc/images/rssiview_settings.webp %%QT_EXAMPLEDIR%%/positioning/satelliteinfo/doc/images/skyview_tableview.webp %%QT_EXAMPLEDIR%%/positioning/satelliteinfo/doc/src/satelliteinfo.qdoc +%%QT_EXAMPLEDIR%%/positioning/satelliteinfo/fonts/REUSE.toml %%QT_EXAMPLEDIR%%/positioning/satelliteinfo/fonts/TitilliumWeb-Regular.ttf %%QT_EXAMPLEDIR%%/positioning/satelliteinfo/fonts/TitilliumWeb-SemiBold.ttf %%QT_EXAMPLEDIR%%/positioning/satelliteinfo/fonts/qt_attribution.json +%%QT_EXAMPLEDIR%%/positioning/satelliteinfo/icons/REUSE.toml %%QT_EXAMPLEDIR%%/positioning/satelliteinfo/icons/checkbox.svg %%QT_EXAMPLEDIR%%/positioning/satelliteinfo/icons/checkbox_blank.svg %%QT_EXAMPLEDIR%%/positioning/satelliteinfo/icons/darkmode.svg @@ -3855,6 +4106,7 @@ %%QT_EXAMPLEDIR%%/qmake/tutorial/main.cpp %%QT_EXAMPLEDIR%%/qml/CMakeLists.txt %%QT_EXAMPLEDIR%%/qml/qml-i18n/CMakeLists.txt +%%QT_EXAMPLEDIR%%/qml/qml-i18n/Main.qml %%QT_EXAMPLEDIR%%/qml/qml-i18n/doc/images/qml-i18n-example.png %%QT_EXAMPLEDIR%%/qml/qml-i18n/doc/src/i18n.qdoc %%QT_EXAMPLEDIR%%/qml/qml-i18n/i18n/base.ts @@ -3863,9 +4115,9 @@ %%QT_EXAMPLEDIR%%/qml/qml-i18n/i18n/qml_fr.ts %%QT_EXAMPLEDIR%%/qml/qml-i18n/main.cpp %%QT_EXAMPLEDIR%%/qml/qml-i18n/qml-i18n.pro -%%QT_EXAMPLEDIR%%/qml/qml-i18n/qml-i18n.qml %%QT_EXAMPLEDIR%%/qml/qml-i18n/qml-i18n.qmlproject %%QT_EXAMPLEDIR%%/qml/qml-i18n/qml-i18n.qrc +%%QT_EXAMPLEDIR%%/qml/qml-i18n/qmldir %%QT_EXAMPLEDIR%%/qml/qml.pro %%QT_EXAMPLEDIR%%/qml/tutorials/CMakeLists.txt %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml-advanced/CMakeLists.txt @@ -4225,7 +4477,17 @@ %%QT_EXAMPLEDIR%%/qtestlib/tutorial5/benchmarking.cpp %%QT_EXAMPLEDIR%%/qtestlib/tutorial5/tutorial5.pro %%QT_EXAMPLEDIR%%/quick/CMakeLists.txt +%%QT_EXAMPLEDIR%%/quick/advancedtext/CMakeLists.txt +%%QT_EXAMPLEDIR%%/quick/advancedtext/Main.qml +%%QT_EXAMPLEDIR%%/quick/advancedtext/TextSample.qml +%%QT_EXAMPLEDIR%%/quick/advancedtext/doc/images/qml-advancedtext-example-wrong.png +%%QT_EXAMPLEDIR%%/quick/advancedtext/doc/images/qml-advancedtext-example.png +%%QT_EXAMPLEDIR%%/quick/advancedtext/doc/src/advancedtext.qdoc +%%QT_EXAMPLEDIR%%/quick/advancedtext/fonts/Georama-VariableFont_wdth,wght.ttf +%%QT_EXAMPLEDIR%%/quick/advancedtext/main.cpp +%%QT_EXAMPLEDIR%%/quick/advancedtext/qt_attribution.json %%QT_EXAMPLEDIR%%/quick/animation/CMakeLists.txt +%%QT_EXAMPLEDIR%%/quick/animation/CMakeLists.txt.shared %%QT_EXAMPLEDIR%%/quick/animation/animation.pro %%QT_EXAMPLEDIR%%/quick/animation/animation.qml %%QT_EXAMPLEDIR%%/quick/animation/animation.qmlproject @@ -4253,6 +4515,7 @@ %%QT_EXAMPLEDIR%%/quick/animation/states/states.qml %%QT_EXAMPLEDIR%%/quick/animation/states/transitions.qml %%QT_EXAMPLEDIR%%/quick/canvas/CMakeLists.txt +%%QT_EXAMPLEDIR%%/quick/canvas/CMakeLists.txt.shared %%QT_EXAMPLEDIR%%/quick/canvas/LabeledSlider.qml %%QT_EXAMPLEDIR%%/quick/canvas/bezierCurve/bezierCurve.qml %%QT_EXAMPLEDIR%%/quick/canvas/canvas.pro @@ -4315,6 +4578,7 @@ %%QT_EXAMPLEDIR%%/quick/customitems/painteditem/textballoons.qml %%QT_EXAMPLEDIR%%/quick/customitems/painteditem/textballoonuser.pro %%QT_EXAMPLEDIR%%/quick/draganddrop/CMakeLists.txt +%%QT_EXAMPLEDIR%%/quick/draganddrop/CMakeLists.txt.shared %%QT_EXAMPLEDIR%%/quick/draganddrop/doc/images/qml-draganddrop-example.png %%QT_EXAMPLEDIR%%/quick/draganddrop/doc/src/draganddrop.qdoc %%QT_EXAMPLEDIR%%/quick/draganddrop/draganddrop.pro @@ -4339,6 +4603,7 @@ %%QT_EXAMPLEDIR%%/quick/embeddedinwidgets/reflect.frag.qsb %%QT_EXAMPLEDIR%%/quick/imageelements/BorderImageSelector.qml %%QT_EXAMPLEDIR%%/quick/imageelements/CMakeLists.txt +%%QT_EXAMPLEDIR%%/quick/imageelements/CMakeLists.txt.shared %%QT_EXAMPLEDIR%%/quick/imageelements/ImageCell.qml %%QT_EXAMPLEDIR%%/quick/imageelements/MyBorderImage.qml %%QT_EXAMPLEDIR%%/quick/imageelements/ShadowRectangle.qml @@ -4461,6 +4726,7 @@ %%QT_EXAMPLEDIR%%/quick/mousearea/mousearea.qrc %%QT_EXAMPLEDIR%%/quick/multieffect/CMakeLists.txt %%QT_EXAMPLEDIR%%/quick/multieffect/itemswitcher/CMakeLists.txt +%%QT_EXAMPLEDIR%%/quick/multieffect/itemswitcher/CMakeLists.txt.shared %%QT_EXAMPLEDIR%%/quick/multieffect/itemswitcher/doc/images/qml-multieffectitemswitcher-example.jpg %%QT_EXAMPLEDIR%%/quick/multieffect/itemswitcher/doc/src/itemswitcher.qdoc %%QT_EXAMPLEDIR%%/quick/multieffect/itemswitcher/itemswitcher.pro @@ -4491,6 +4757,7 @@ %%QT_EXAMPLEDIR%%/quick/multieffect/itemswitcher/qml/main.qml %%QT_EXAMPLEDIR%%/quick/multieffect/multieffect.pro %%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 %%QT_EXAMPLEDIR%%/quick/multieffect/testbed/doc/src/testbed.qdoc %%QT_EXAMPLEDIR%%/quick/multieffect/testbed/main.cpp @@ -4526,6 +4793,7 @@ %%QT_EXAMPLEDIR%%/quick/multieffect/testbed/testbed.pro %%QT_EXAMPLEDIR%%/quick/particles/CMakeLists.txt %%QT_EXAMPLEDIR%%/quick/particles/affectors/CMakeLists.txt +%%QT_EXAMPLEDIR%%/quick/particles/affectors/CMakeLists.txt.shared %%QT_EXAMPLEDIR%%/quick/particles/affectors/GreyButton.qml %%QT_EXAMPLEDIR%%/quick/particles/affectors/affectors.pro %%QT_EXAMPLEDIR%%/quick/particles/affectors/affectors.qml @@ -4560,6 +4828,7 @@ %%QT_EXAMPLEDIR%%/quick/particles/affectors/turbulence.qml %%QT_EXAMPLEDIR%%/quick/particles/affectors/wander.qml %%QT_EXAMPLEDIR%%/quick/particles/emitters/CMakeLists.txt +%%QT_EXAMPLEDIR%%/quick/particles/emitters/CMakeLists.txt.shared %%QT_EXAMPLEDIR%%/quick/particles/emitters/burstandpulse.qml %%QT_EXAMPLEDIR%%/quick/particles/emitters/customemitter.qml %%QT_EXAMPLEDIR%%/quick/particles/emitters/doc/images/qml-emitters-example.png @@ -4577,6 +4846,7 @@ %%QT_EXAMPLEDIR%%/quick/particles/emitters/trailemitter.qml %%QT_EXAMPLEDIR%%/quick/particles/emitters/velocityfrommotion.qml %%QT_EXAMPLEDIR%%/quick/particles/imageparticle/CMakeLists.txt +%%QT_EXAMPLEDIR%%/quick/particles/imageparticle/CMakeLists.txt.shared %%QT_EXAMPLEDIR%%/quick/particles/imageparticle/allatonce.qml %%QT_EXAMPLEDIR%%/quick/particles/imageparticle/colored.qml %%QT_EXAMPLEDIR%%/quick/particles/imageparticle/colortable.qml @@ -4601,6 +4871,7 @@ %%QT_EXAMPLEDIR%%/quick/particles/imageparticle/sprites.qml %%QT_EXAMPLEDIR%%/quick/particles/particles.pro %%QT_EXAMPLEDIR%%/quick/particles/system/CMakeLists.txt +%%QT_EXAMPLEDIR%%/quick/particles/system/CMakeLists.txt.shared %%QT_EXAMPLEDIR%%/quick/particles/system/doc/images/qml-system-example.png %%QT_EXAMPLEDIR%%/quick/particles/system/doc/src/system.qdoc %%QT_EXAMPLEDIR%%/quick/particles/system/dynamiccomparison.qml @@ -4617,6 +4888,7 @@ %%QT_EXAMPLEDIR%%/quick/particles/system/system.qrc %%QT_EXAMPLEDIR%%/quick/particles/system/timedgroupchanges.qml %%QT_EXAMPLEDIR%%/quick/pointerhandlers/CMakeLists.txt +%%QT_EXAMPLEDIR%%/quick/pointerhandlers/CMakeLists.txt.shared %%QT_EXAMPLEDIR%%/quick/pointerhandlers/components/Button.qml %%QT_EXAMPLEDIR%%/quick/pointerhandlers/components/CheckBox.qml %%QT_EXAMPLEDIR%%/quick/pointerhandlers/components/CorkPanel.qml @@ -4684,6 +4956,7 @@ %%QT_EXAMPLEDIR%%/quick/pointerhandlers/tapHandler.qml %%QT_EXAMPLEDIR%%/quick/pointerhandlers/tapWithModifiers.qml %%QT_EXAMPLEDIR%%/quick/positioners/CMakeLists.txt +%%QT_EXAMPLEDIR%%/quick/positioners/CMakeLists.txt.shared %%QT_EXAMPLEDIR%%/quick/positioners/doc/images/qml-positioners-example.png %%QT_EXAMPLEDIR%%/quick/positioners/doc/src/positioners.qdoc %%QT_EXAMPLEDIR%%/quick/positioners/main.cpp @@ -4707,6 +4980,7 @@ %%QT_EXAMPLEDIR%%/quick/quickshapes/CMakeLists.txt %%QT_EXAMPLEDIR%%/quick/quickshapes/quickshapes.pro %%QT_EXAMPLEDIR%%/quick/quickshapes/shapes/CMakeLists.txt +%%QT_EXAMPLEDIR%%/quick/quickshapes/shapes/CMakeLists.txt.shared %%QT_EXAMPLEDIR%%/quick/quickshapes/shapes/arcDirection.qml %%QT_EXAMPLEDIR%%/quick/quickshapes/shapes/arcRotation.qml %%QT_EXAMPLEDIR%%/quick/quickshapes/shapes/capStyles.qml @@ -4716,7 +4990,9 @@ %%QT_EXAMPLEDIR%%/quick/quickshapes/shapes/doc/images/qml-shapes-example.png %%QT_EXAMPLEDIR%%/quick/quickshapes/shapes/doc/src/shapes.qdoc %%QT_EXAMPLEDIR%%/quick/quickshapes/shapes/ellipticalArcs.qml +%%QT_EXAMPLEDIR%%/quick/quickshapes/shapes/fillItem.qml %%QT_EXAMPLEDIR%%/quick/quickshapes/shapes/fillRules.qml +%%QT_EXAMPLEDIR%%/quick/quickshapes/shapes/fillTransform.qml %%QT_EXAMPLEDIR%%/quick/quickshapes/shapes/gradientSpreadModes.qml %%QT_EXAMPLEDIR%%/quick/quickshapes/shapes/interactive.qml %%QT_EXAMPLEDIR%%/quick/quickshapes/shapes/joinStyles.qml @@ -4726,6 +5002,7 @@ %%QT_EXAMPLEDIR%%/quick/quickshapes/shapes/main.qml %%QT_EXAMPLEDIR%%/quick/quickshapes/shapes/quadraticCurve.qml %%QT_EXAMPLEDIR%%/quick/quickshapes/shapes/radialGradient.qml +%%QT_EXAMPLEDIR%%/quick/quickshapes/shapes/rectangle.qml %%QT_EXAMPLEDIR%%/quick/quickshapes/shapes/sampling.qml %%QT_EXAMPLEDIR%%/quick/quickshapes/shapes/shapegallery.qml %%QT_EXAMPLEDIR%%/quick/quickshapes/shapes/shapes.pro @@ -4738,6 +5015,7 @@ %%QT_EXAMPLEDIR%%/quick/quickshapes/shapes/zoomtiger.qml %%QT_EXAMPLEDIR%%/quick/quickshapes/weatherforecast/BouncyShape.qml %%QT_EXAMPLEDIR%%/quick/quickshapes/weatherforecast/CMakeLists.txt +%%QT_EXAMPLEDIR%%/quick/quickshapes/weatherforecast/CMakeLists.txt.shared %%QT_EXAMPLEDIR%%/quick/quickshapes/weatherforecast/Cloud.qml %%QT_EXAMPLEDIR%%/quick/quickshapes/weatherforecast/CloudWithLightning.qml %%QT_EXAMPLEDIR%%/quick/quickshapes/weatherforecast/CloudWithLightningAndRain_generated.qml @@ -4753,6 +5031,7 @@ %%QT_EXAMPLEDIR%%/quick/quickshapes/weatherforecast/Gear.qml %%QT_EXAMPLEDIR%%/quick/quickshapes/weatherforecast/Gear_generated.qml %%QT_EXAMPLEDIR%%/quick/quickshapes/weatherforecast/MapLabel.qml +%%QT_EXAMPLEDIR%%/quick/quickshapes/weatherforecast/REUSE.toml %%QT_EXAMPLEDIR%%/quick/quickshapes/weatherforecast/SettingsDrawer.qml %%QT_EXAMPLEDIR%%/quick/quickshapes/weatherforecast/Sun.qml %%QT_EXAMPLEDIR%%/quick/quickshapes/weatherforecast/SunBehindCloud.qml @@ -4774,6 +5053,7 @@ %%QT_EXAMPLEDIR%%/quick/quickshapes/weatherforecast/assets/cloud-with-rain-svgrepo-com.svg %%QT_EXAMPLEDIR%%/quick/quickshapes/weatherforecast/assets/cloud-with-snow-svgrepo-com.svg %%QT_EXAMPLEDIR%%/quick/quickshapes/weatherforecast/assets/gear-alt-stroke.svg +%%QT_EXAMPLEDIR%%/quick/quickshapes/weatherforecast/assets/generate.bat %%QT_EXAMPLEDIR%%/quick/quickshapes/weatherforecast/assets/sun-behind-cloud-svgrepo-com.svg %%QT_EXAMPLEDIR%%/quick/quickshapes/weatherforecast/assets/sun-behind-large-cloud-svgrepo-com.svg %%QT_EXAMPLEDIR%%/quick/quickshapes/weatherforecast/assets/sun-behind-rain-cloud-svgrepo-com.svg @@ -4790,6 +5070,32 @@ %%QT_EXAMPLEDIR%%/quick/quickshapes/weatherforecast/weatherforecast.pro %%QT_EXAMPLEDIR%%/quick/quickshapes/weatherforecast/weatherforecast.qrc %%QT_EXAMPLEDIR%%/quick/quickwidgets/CMakeLists.txt +%%QT_EXAMPLEDIR%%/quick/quickwidgets/qmlpreviewer/CMakeLists.txt +%%QT_EXAMPLEDIR%%/quick/quickwidgets/qmlpreviewer/doc/images/qmlpreviewer-example.png +%%QT_EXAMPLEDIR%%/quick/quickwidgets/qmlpreviewer/doc/src/qmlpreviewer.qdoc +%%QT_EXAMPLEDIR%%/quick/quickwidgets/qmlpreviewer/main.cpp +%%QT_EXAMPLEDIR%%/quick/quickwidgets/qmlpreviewer/models/errorlistmodel.cpp +%%QT_EXAMPLEDIR%%/quick/quickwidgets/qmlpreviewer/models/errorlistmodel.h +%%QT_EXAMPLEDIR%%/quick/quickwidgets/qmlpreviewer/resources.cmake +%%QT_EXAMPLEDIR%%/quick/quickwidgets/qmlpreviewer/resources/ErrorListView.qml +%%QT_EXAMPLEDIR%%/quick/quickwidgets/qmlpreviewer/resources/default.qml +%%QT_EXAMPLEDIR%%/quick/quickwidgets/qmlpreviewer/resources/logo.png +%%QT_EXAMPLEDIR%%/quick/quickwidgets/qmlpreviewer/states/statecontroller.cpp +%%QT_EXAMPLEDIR%%/quick/quickwidgets/qmlpreviewer/states/statecontroller.h +%%QT_EXAMPLEDIR%%/quick/quickwidgets/qmlpreviewer/utility/syntaxhighlighter.cpp +%%QT_EXAMPLEDIR%%/quick/quickwidgets/qmlpreviewer/utility/syntaxhighlighter.h +%%QT_EXAMPLEDIR%%/quick/quickwidgets/qmlpreviewer/widgets/codeeditor.cpp +%%QT_EXAMPLEDIR%%/quick/quickwidgets/qmlpreviewer/widgets/codeeditor.h +%%QT_EXAMPLEDIR%%/quick/quickwidgets/qmlpreviewer/widgets/editorwidget.cpp +%%QT_EXAMPLEDIR%%/quick/quickwidgets/qmlpreviewer/widgets/editorwidget.h +%%QT_EXAMPLEDIR%%/quick/quickwidgets/qmlpreviewer/widgets/linenumberarea.cpp +%%QT_EXAMPLEDIR%%/quick/quickwidgets/qmlpreviewer/widgets/linenumberarea.h +%%QT_EXAMPLEDIR%%/quick/quickwidgets/qmlpreviewer/widgets/mainwindow.cpp +%%QT_EXAMPLEDIR%%/quick/quickwidgets/qmlpreviewer/widgets/mainwindow.h +%%QT_EXAMPLEDIR%%/quick/quickwidgets/qmlpreviewer/widgets/patheditwidget.cpp +%%QT_EXAMPLEDIR%%/quick/quickwidgets/qmlpreviewer/widgets/patheditwidget.h +%%QT_EXAMPLEDIR%%/quick/quickwidgets/qmlpreviewer/widgets/previewwidget.cpp +%%QT_EXAMPLEDIR%%/quick/quickwidgets/qmlpreviewer/widgets/previewwidget.h %%QT_EXAMPLEDIR%%/quick/quickwidgets/qquickwidgetversuswindow_opengl/CMakeLists.txt %%QT_EXAMPLEDIR%%/quick/quickwidgets/qquickwidgetversuswindow_opengl/doc/images/qquickwidgetversuswindow-opengl-example.jpg %%QT_EXAMPLEDIR%%/quick/quickwidgets/qquickwidgetversuswindow_opengl/doc/src/qquickwidgetversuswindow_opengl.qdoc @@ -4958,6 +5264,7 @@ %%QT_EXAMPLEDIR%%/quick/scenegraph/openglunderqml/squircle.cpp %%QT_EXAMPLEDIR%%/quick/scenegraph/openglunderqml/squircle.h %%QT_EXAMPLEDIR%%/quick/scenegraph/rhitextureitem/CMakeLists.txt +%%QT_EXAMPLEDIR%%/quick/scenegraph/rhitextureitem/CMakeLists.txt.shared %%QT_EXAMPLEDIR%%/quick/scenegraph/rhitextureitem/SettingsDrawer.qml %%QT_EXAMPLEDIR%%/quick/scenegraph/rhitextureitem/doc/images/rhitextureitem-example.jpg %%QT_EXAMPLEDIR%%/quick/scenegraph/rhitextureitem/doc/src/rhitextureitem.qdoc @@ -4978,6 +5285,7 @@ %%QT_EXAMPLEDIR%%/quick/scenegraph/rhitextureitem/shaders/color.frag %%QT_EXAMPLEDIR%%/quick/scenegraph/rhitextureitem/shaders/color.vert %%QT_EXAMPLEDIR%%/quick/scenegraph/rhiunderqml/CMakeLists.txt +%%QT_EXAMPLEDIR%%/quick/scenegraph/rhiunderqml/CMakeLists.txt.shared %%QT_EXAMPLEDIR%%/quick/scenegraph/rhiunderqml/doc/images/rhiunderqml-example.jpg %%QT_EXAMPLEDIR%%/quick/scenegraph/rhiunderqml/doc/src/rhiunderqml.qdoc %%QT_EXAMPLEDIR%%/quick/scenegraph/rhiunderqml/main.cpp @@ -5102,6 +5410,7 @@ %%QT_EXAMPLEDIR%%/quick/tableview/pixelator/qt.png %%QT_EXAMPLEDIR%%/quick/tableview/tableview.pro %%QT_EXAMPLEDIR%%/quick/text/CMakeLists.txt +%%QT_EXAMPLEDIR%%/quick/text/CMakeLists.txt.shared %%QT_EXAMPLEDIR%%/quick/text/doc/images/qml-text-example.png %%QT_EXAMPLEDIR%%/quick/text/doc/src/text.qdoc %%QT_EXAMPLEDIR%%/quick/text/fonts/availableFonts.qml @@ -5216,7 +5525,16 @@ %%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame4/samegame4.qmlproject %%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame4/samegame4.qrc %%QT_EXAMPLEDIR%%/quick/tutorials/tutorials.pro +%%QT_EXAMPLEDIR%%/quick/vectorimage/CMakeLists.txt +%%QT_EXAMPLEDIR%%/quick/vectorimage/Heart.qml +%%QT_EXAMPLEDIR%%/quick/vectorimage/Main.qml +%%QT_EXAMPLEDIR%%/quick/vectorimage/doc/images/qml-vectorimage-example.png +%%QT_EXAMPLEDIR%%/quick/vectorimage/doc/src/vectorimage.qdoc +%%QT_EXAMPLEDIR%%/quick/vectorimage/generate.bat +%%QT_EXAMPLEDIR%%/quick/vectorimage/heart.svg +%%QT_EXAMPLEDIR%%/quick/vectorimage/main.cpp %%QT_EXAMPLEDIR%%/quick/views/CMakeLists.txt +%%QT_EXAMPLEDIR%%/quick/views/CMakeLists.txt.shared %%QT_EXAMPLEDIR%%/quick/views/delegatemodel/dragselection.qml %%QT_EXAMPLEDIR%%/quick/views/doc/images/qml-modelviews-example.png %%QT_EXAMPLEDIR%%/quick/views/doc/src/views.qdoc @@ -5270,6 +5588,7 @@ %%QT_EXAMPLEDIR%%/quick/views/views.qrc %%QT_EXAMPLEDIR%%/quick/window/AllScreens.qml %%QT_EXAMPLEDIR%%/quick/window/CMakeLists.txt +%%QT_EXAMPLEDIR%%/quick/window/CMakeLists.txt.shared %%QT_EXAMPLEDIR%%/quick/window/CurrentScreen.qml %%QT_EXAMPLEDIR%%/quick/window/Splash.qml %%QT_EXAMPLEDIR%%/quick/window/doc/images/qml-window-example.png @@ -5444,10 +5763,10 @@ %%QT_EXAMPLEDIR%%/quick3d/intro/qml.qrc %%QT_EXAMPLEDIR%%/quick3d/lights/+windows/qtquickcontrols2.conf %%QT_EXAMPLEDIR%%/quick3d/lights/CMakeLists.txt -%%QT_EXAMPLEDIR%%/quick3d/lights/RotatingTeaPot.qml +%%QT_EXAMPLEDIR%%/quick3d/lights/RotatingLogo.qml %%QT_EXAMPLEDIR%%/quick3d/lights/SettingsDrawer.qml %%QT_EXAMPLEDIR%%/quick3d/lights/custom.vert -%%QT_EXAMPLEDIR%%/quick3d/lights/doc/images/lights-example.jpg +%%QT_EXAMPLEDIR%%/quick3d/lights/doc/images/lights-example.webp %%QT_EXAMPLEDIR%%/quick3d/lights/doc/src/qtquick3d-examples-lights.qdoc %%QT_EXAMPLEDIR%%/quick3d/lights/icon_settings.png %%QT_EXAMPLEDIR%%/quick3d/lights/icon_settings@2x.png @@ -5457,8 +5776,8 @@ %%QT_EXAMPLEDIR%%/quick3d/lights/main.cpp %%QT_EXAMPLEDIR%%/quick3d/lights/main.qml %%QT_EXAMPLEDIR%%/quick3d/lights/qml.qrc +%%QT_EXAMPLEDIR%%/quick3d/lights/qtlogo.mesh %%QT_EXAMPLEDIR%%/quick3d/lights/qtquickcontrols2.conf -%%QT_EXAMPLEDIR%%/quick3d/lights/teapot.mesh %%QT_EXAMPLEDIR%%/quick3d/lodhelper/CMakeLists.txt %%QT_EXAMPLEDIR%%/quick3d/lodhelper/doc/images/lodhelper-example.jpg %%QT_EXAMPLEDIR%%/quick3d/lodhelper/doc/src/qtquick3d-example-lodhelper.qdoc @@ -5591,6 +5910,8 @@ %%QT_EXAMPLEDIR%%/quick3d/principledmaterial/RefractionPane.qml %%QT_EXAMPLEDIR%%/quick3d/principledmaterial/SpecialPane.qml %%QT_EXAMPLEDIR%%/quick3d/principledmaterial/TextureSourceControl.qml +%%QT_EXAMPLEDIR%%/quick3d/principledmaterial/VertexColorMaskFlagsControl.qml +%%QT_EXAMPLEDIR%%/quick3d/principledmaterial/VertexColorPane.qml %%QT_EXAMPLEDIR%%/quick3d/principledmaterial/VerticalSectionSeparator.qml %%QT_EXAMPLEDIR%%/quick3d/principledmaterial/assets.qrc %%QT_EXAMPLEDIR%%/quick3d/principledmaterial/doc/images/principledmaterial-example.png @@ -5759,6 +6080,7 @@ %%QT_EXAMPLEDIR%%/quick3d/view3d/view3d.pro %%QT_EXAMPLEDIR%%/quick3d/virtualassistant/CMakeLists.txt %%QT_EXAMPLEDIR%%/quick3d/virtualassistant/Main.qml +%%QT_EXAMPLEDIR%%/quick3d/virtualassistant/REUSE.toml %%QT_EXAMPLEDIR%%/quick3d/virtualassistant/VirtualAssistant.qmlproject %%QT_EXAMPLEDIR%%/quick3d/virtualassistant/asset_imports/CMakeLists.txt %%QT_EXAMPLEDIR%%/quick3d/virtualassistant/asset_imports/Quick3DAssets/CMakeLists.txt @@ -5817,6 +6139,70 @@ %%QT_EXAMPLEDIR%%/quick3d/volumeraycaster/volumeraycaster.pro %%QT_EXAMPLEDIR%%/quick3d/volumeraycaster/volumetexturedata.cpp %%QT_EXAMPLEDIR%%/quick3d/volumeraycaster/volumetexturedata.h +%%QT_EXAMPLEDIR%%/quick3d/xr_anchors/CMakeLists.txt +%%QT_EXAMPLEDIR%%/quick3d/xr_anchors/android/AndroidManifest.xml +%%QT_EXAMPLEDIR%%/quick3d/xr_anchors/doc/images/xranchors-example.jpg +%%QT_EXAMPLEDIR%%/quick3d/xr_anchors/doc/src/qtquick3d-examples-xranchors.qdoc +%%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 +%%QT_EXAMPLEDIR%%/quick3d/xr_freeformteleportation/doc/src/qtquick3d-examples-xrfreeformteleportation.qdoc +%%QT_EXAMPLEDIR%%/quick3d/xr_freeformteleportation/main.cpp +%%QT_EXAMPLEDIR%%/quick3d/xr_freeformteleportation/main.qml +%%QT_EXAMPLEDIR%%/quick3d/xr_freeformteleportation/maps/Attribution.txt +%%QT_EXAMPLEDIR%%/quick3d/xr_freeformteleportation/maps/Tape001_1K_Color.jpg +%%QT_EXAMPLEDIR%%/quick3d/xr_freeformteleportation/maps/Tape001_1K_NormalGL.jpg +%%QT_EXAMPLEDIR%%/quick3d/xr_freeformteleportation/maps/Tape001_1K_Roughness.jpg +%%QT_EXAMPLEDIR%%/quick3d/xr_freeformteleportation/maps/Tiles107_1K_Color.jpg +%%QT_EXAMPLEDIR%%/quick3d/xr_freeformteleportation/maps/Tiles107_1K_NormalGL.jpg +%%QT_EXAMPLEDIR%%/quick3d/xr_freeformteleportation/maps/Tiles107_1K_Roughness.jpg +%%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_input/CMakeLists.txt +%%QT_EXAMPLEDIR%%/quick3d/xr_input/ColorView.qml +%%QT_EXAMPLEDIR%%/quick3d/xr_input/ExampleButton.qml +%%QT_EXAMPLEDIR%%/quick3d/xr_input/Teacup.qml +%%QT_EXAMPLEDIR%%/quick3d/xr_input/android/AndroidManifest.xml +%%QT_EXAMPLEDIR%%/quick3d/xr_input/attribution.txt +%%QT_EXAMPLEDIR%%/quick3d/xr_input/doc/images/xrinput-example.jpg +%%QT_EXAMPLEDIR%%/quick3d/xr_input/doc/src/qtquick3d-examples-xrinput.qdoc +%%QT_EXAMPLEDIR%%/quick3d/xr_input/main.cpp +%%QT_EXAMPLEDIR%%/quick3d/xr_input/main.qml +%%QT_EXAMPLEDIR%%/quick3d/xr_input/meshes/cup.mesh +%%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_simple/CMakeLists.txt +%%QT_EXAMPLEDIR%%/quick3d/xr_simple/android/AndroidManifest.xml +%%QT_EXAMPLEDIR%%/quick3d/xr_simple/doc/images/xrsimple-example.jpg +%%QT_EXAMPLEDIR%%/quick3d/xr_simple/doc/src/qtquick3d-examples-xrsimple.qdoc +%%QT_EXAMPLEDIR%%/quick3d/xr_simple/main.cpp +%%QT_EXAMPLEDIR%%/quick3d/xr_simple/main.qml +%%QT_EXAMPLEDIR%%/quick3d/xr_simple/visionos/MacOSXBundleInfo.plist.in +%%QT_EXAMPLEDIR%%/quick3d/xr_touch/CMakeLists.txt +%%QT_EXAMPLEDIR%%/quick3d/xr_touch/ExampleButton.qml +%%QT_EXAMPLEDIR%%/quick3d/xr_touch/Monitor.qml +%%QT_EXAMPLEDIR%%/quick3d/xr_touch/ScreenContent.qml +%%QT_EXAMPLEDIR%%/quick3d/xr_touch/android/AndroidManifest.xml +%%QT_EXAMPLEDIR%%/quick3d/xr_touch/assets/monitor.gltf +%%QT_EXAMPLEDIR%%/quick3d/xr_touch/doc/images/xrtouch-example.jpg +%%QT_EXAMPLEDIR%%/quick3d/xr_touch/doc/src/qtquick3d-examples-xrtouch.qdoc +%%QT_EXAMPLEDIR%%/quick3d/xr_touch/main.cpp +%%QT_EXAMPLEDIR%%/quick3d/xr_touch/main.qml +%%QT_EXAMPLEDIR%%/quick3d/xr_touch/meshes/monitor_mesh.mesh +%%QT_EXAMPLEDIR%%/quick3d/xr_touch/visionos/MacOSXBundleInfo.plist.in %%QT_EXAMPLEDIR%%/quick3dphysics/CMakeLists.txt %%QT_EXAMPLEDIR%%/quick3dphysics/cannon/Box.qml %%QT_EXAMPLEDIR%%/quick3dphysics/cannon/CMakeLists.txt @@ -5942,11 +6328,13 @@ %%QT_EXAMPLEDIR%%/quickcontrols/attachedstyleproperties/doc/src/qtquickcontrols-attachedstyleproperties.qdoc %%QT_EXAMPLEDIR%%/quickcontrols/chattutorial/CMakeLists.txt %%QT_EXAMPLEDIR%%/quickcontrols/chattutorial/chapter1/CMakeLists.txt +%%QT_EXAMPLEDIR%%/quickcontrols/chattutorial/chapter1/Main.qml %%QT_EXAMPLEDIR%%/quickcontrols/chattutorial/chapter1/chapter1.pro %%QT_EXAMPLEDIR%%/quickcontrols/chattutorial/chapter1/main.cpp -%%QT_EXAMPLEDIR%%/quickcontrols/chattutorial/chapter1/main.qml +%%QT_EXAMPLEDIR%%/quickcontrols/chattutorial/chapter1/qmldir %%QT_EXAMPLEDIR%%/quickcontrols/chattutorial/chapter1/qtquickcontrols2.conf %%QT_EXAMPLEDIR%%/quickcontrols/chattutorial/chapter2/CMakeLists.txt +%%QT_EXAMPLEDIR%%/quickcontrols/chattutorial/chapter2/Main.qml %%QT_EXAMPLEDIR%%/quickcontrols/chattutorial/chapter2/chapter2.pro %%QT_EXAMPLEDIR%%/quickcontrols/chattutorial/chapter2/images/Albert_Einstein.png %%QT_EXAMPLEDIR%%/quickcontrols/chattutorial/chapter2/images/Albert_Einstein@2x.png @@ -5962,11 +6350,12 @@ %%QT_EXAMPLEDIR%%/quickcontrols/chattutorial/chapter2/images/Hans_Gude@4x.png %%QT_EXAMPLEDIR%%/quickcontrols/chattutorial/chapter2/images/images.qrc %%QT_EXAMPLEDIR%%/quickcontrols/chattutorial/chapter2/main.cpp -%%QT_EXAMPLEDIR%%/quickcontrols/chattutorial/chapter2/main.qml +%%QT_EXAMPLEDIR%%/quickcontrols/chattutorial/chapter2/qmldir %%QT_EXAMPLEDIR%%/quickcontrols/chattutorial/chapter2/qtquickcontrols2.conf %%QT_EXAMPLEDIR%%/quickcontrols/chattutorial/chapter3/CMakeLists.txt %%QT_EXAMPLEDIR%%/quickcontrols/chattutorial/chapter3/ContactPage.qml %%QT_EXAMPLEDIR%%/quickcontrols/chattutorial/chapter3/ConversationPage.qml +%%QT_EXAMPLEDIR%%/quickcontrols/chattutorial/chapter3/Main.qml %%QT_EXAMPLEDIR%%/quickcontrols/chattutorial/chapter3/chapter3.pro %%QT_EXAMPLEDIR%%/quickcontrols/chattutorial/chapter3/images/Albert_Einstein.png %%QT_EXAMPLEDIR%%/quickcontrols/chattutorial/chapter3/images/Albert_Einstein@2x.png @@ -5982,11 +6371,12 @@ %%QT_EXAMPLEDIR%%/quickcontrols/chattutorial/chapter3/images/Hans_Gude@4x.png %%QT_EXAMPLEDIR%%/quickcontrols/chattutorial/chapter3/images/images.qrc %%QT_EXAMPLEDIR%%/quickcontrols/chattutorial/chapter3/main.cpp -%%QT_EXAMPLEDIR%%/quickcontrols/chattutorial/chapter3/main.qml +%%QT_EXAMPLEDIR%%/quickcontrols/chattutorial/chapter3/qmldir %%QT_EXAMPLEDIR%%/quickcontrols/chattutorial/chapter3/qtquickcontrols2.conf %%QT_EXAMPLEDIR%%/quickcontrols/chattutorial/chapter4/CMakeLists.txt %%QT_EXAMPLEDIR%%/quickcontrols/chattutorial/chapter4/ContactPage.qml %%QT_EXAMPLEDIR%%/quickcontrols/chattutorial/chapter4/ConversationPage.qml +%%QT_EXAMPLEDIR%%/quickcontrols/chattutorial/chapter4/Main.qml %%QT_EXAMPLEDIR%%/quickcontrols/chattutorial/chapter4/chapter4.pro %%QT_EXAMPLEDIR%%/quickcontrols/chattutorial/chapter4/images/Albert_Einstein.png %%QT_EXAMPLEDIR%%/quickcontrols/chattutorial/chapter4/images/Albert_Einstein@2x.png @@ -6002,7 +6392,7 @@ %%QT_EXAMPLEDIR%%/quickcontrols/chattutorial/chapter4/images/Hans_Gude@4x.png %%QT_EXAMPLEDIR%%/quickcontrols/chattutorial/chapter4/images/images.qrc %%QT_EXAMPLEDIR%%/quickcontrols/chattutorial/chapter4/main.cpp -%%QT_EXAMPLEDIR%%/quickcontrols/chattutorial/chapter4/main.qml +%%QT_EXAMPLEDIR%%/quickcontrols/chattutorial/chapter4/qmldir %%QT_EXAMPLEDIR%%/quickcontrols/chattutorial/chapter4/qtquickcontrols2.conf %%QT_EXAMPLEDIR%%/quickcontrols/chattutorial/chapter4/sqlcontactmodel.cpp %%QT_EXAMPLEDIR%%/quickcontrols/chattutorial/chapter4/sqlcontactmodel.h @@ -6013,6 +6403,7 @@ %%QT_EXAMPLEDIR%%/quickcontrols/chattutorial/chapter5/ChatToolBar.qml %%QT_EXAMPLEDIR%%/quickcontrols/chattutorial/chapter5/ContactPage.qml %%QT_EXAMPLEDIR%%/quickcontrols/chattutorial/chapter5/ConversationPage.qml +%%QT_EXAMPLEDIR%%/quickcontrols/chattutorial/chapter5/Main.qml %%QT_EXAMPLEDIR%%/quickcontrols/chattutorial/chapter5/chapter5.pro %%QT_EXAMPLEDIR%%/quickcontrols/chattutorial/chapter5/images/Albert_Einstein.png %%QT_EXAMPLEDIR%%/quickcontrols/chattutorial/chapter5/images/Albert_Einstein@2x.png @@ -6028,7 +6419,7 @@ %%QT_EXAMPLEDIR%%/quickcontrols/chattutorial/chapter5/images/Hans_Gude@4x.png %%QT_EXAMPLEDIR%%/quickcontrols/chattutorial/chapter5/images/images.qrc %%QT_EXAMPLEDIR%%/quickcontrols/chattutorial/chapter5/main.cpp -%%QT_EXAMPLEDIR%%/quickcontrols/chattutorial/chapter5/main.qml +%%QT_EXAMPLEDIR%%/quickcontrols/chattutorial/chapter5/qmldir %%QT_EXAMPLEDIR%%/quickcontrols/chattutorial/chapter5/qtquickcontrols2.conf %%QT_EXAMPLEDIR%%/quickcontrols/chattutorial/chapter5/sqlcontactmodel.cpp %%QT_EXAMPLEDIR%%/quickcontrols/chattutorial/chapter5/sqlcontactmodel.h @@ -6346,6 +6737,55 @@ %%QT_EXAMPLEDIR%%/quickcontrols/ios/todolist/src/main.cpp %%QT_EXAMPLEDIR%%/quickcontrols/ios/todolist/todolist.pro %%QT_EXAMPLEDIR%%/quickcontrols/quickcontrols.pro +%%QT_EXAMPLEDIR%%/quickcontrols/spreadsheets/CMakeLists.txt +%%QT_EXAMPLEDIR%%/quickcontrols/spreadsheets/Spreadsheets/CMakeLists.txt +%%QT_EXAMPLEDIR%%/quickcontrols/spreadsheets/Spreadsheets/ColumnHeaderView.qml +%%QT_EXAMPLEDIR%%/quickcontrols/spreadsheets/Spreadsheets/HeaderToolBar.qml +%%QT_EXAMPLEDIR%%/quickcontrols/spreadsheets/Spreadsheets/HeaderViewTapHandler.qml +%%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 +%%QT_EXAMPLEDIR%%/quickcontrols/spreadsheets/Spreadsheets/icons/cut.svg +%%QT_EXAMPLEDIR%%/quickcontrols/spreadsheets/Spreadsheets/icons/help.svg +%%QT_EXAMPLEDIR%%/quickcontrols/spreadsheets/Spreadsheets/icons/hide.svg +%%QT_EXAMPLEDIR%%/quickcontrols/spreadsheets/Spreadsheets/icons/insert_column_left.svg +%%QT_EXAMPLEDIR%%/quickcontrols/spreadsheets/Spreadsheets/icons/insert_column_right.svg +%%QT_EXAMPLEDIR%%/quickcontrols/spreadsheets/Spreadsheets/icons/insert_row_above.svg +%%QT_EXAMPLEDIR%%/quickcontrols/spreadsheets/Spreadsheets/icons/insert_row_below.svg +%%QT_EXAMPLEDIR%%/quickcontrols/spreadsheets/Spreadsheets/icons/paste.svg +%%QT_EXAMPLEDIR%%/quickcontrols/spreadsheets/Spreadsheets/icons/remove_column.svg +%%QT_EXAMPLEDIR%%/quickcontrols/spreadsheets/Spreadsheets/icons/remove_row.svg +%%QT_EXAMPLEDIR%%/quickcontrols/spreadsheets/Spreadsheets/icons/reset_reordering.svg +%%QT_EXAMPLEDIR%%/quickcontrols/spreadsheets/Spreadsheets/icons/show.svg +%%QT_EXAMPLEDIR%%/quickcontrols/spreadsheets/Spreadsheets/spreadcell.cpp +%%QT_EXAMPLEDIR%%/quickcontrols/spreadsheets/Spreadsheets/spreadcell.h +%%QT_EXAMPLEDIR%%/quickcontrols/spreadsheets/Spreadsheets/spreadformula.cpp +%%QT_EXAMPLEDIR%%/quickcontrols/spreadsheets/Spreadsheets/spreadformula.h +%%QT_EXAMPLEDIR%%/quickcontrols/spreadsheets/Spreadsheets/spreadkey.h +%%QT_EXAMPLEDIR%%/quickcontrols/spreadsheets/Spreadsheets/spreadmimedataprovider.cpp +%%QT_EXAMPLEDIR%%/quickcontrols/spreadsheets/Spreadsheets/spreadmimedataprovider.h +%%QT_EXAMPLEDIR%%/quickcontrols/spreadsheets/Spreadsheets/spreadmodel.cpp +%%QT_EXAMPLEDIR%%/quickcontrols/spreadsheets/Spreadsheets/spreadmodel.h +%%QT_EXAMPLEDIR%%/quickcontrols/spreadsheets/Spreadsheets/spreadrole.h +%%QT_EXAMPLEDIR%%/quickcontrols/spreadsheets/doc/images/spreadsheets-example.png +%%QT_EXAMPLEDIR%%/quickcontrols/spreadsheets/doc/src/spreadsheets.qdoc +%%QT_EXAMPLEDIR%%/quickcontrols/spreadsheets/main.cpp +%%QT_EXAMPLEDIR%%/quickcontrols/spreadsheets/spreadsheet.svg +%%QT_EXAMPLEDIR%%/quickcontrols/tableofcontents/CMakeLists.txt +%%QT_EXAMPLEDIR%%/quickcontrols/tableofcontents/Main.qml +%%QT_EXAMPLEDIR%%/quickcontrols/tableofcontents/arrow_icon.png +%%QT_EXAMPLEDIR%%/quickcontrols/tableofcontents/content.txt +%%QT_EXAMPLEDIR%%/quickcontrols/tableofcontents/doc/images/qtquickcontrols-tableofcontents.png +%%QT_EXAMPLEDIR%%/quickcontrols/tableofcontents/doc/src/qtquickcontrols-tableofcontents.qdoc +%%QT_EXAMPLEDIR%%/quickcontrols/tableofcontents/main.cpp +%%QT_EXAMPLEDIR%%/quickcontrols/tableofcontents/treeitem.cpp +%%QT_EXAMPLEDIR%%/quickcontrols/tableofcontents/treeitem.h +%%QT_EXAMPLEDIR%%/quickcontrols/tableofcontents/treemodel.cpp +%%QT_EXAMPLEDIR%%/quickcontrols/tableofcontents/treemodel.h %%QT_EXAMPLEDIR%%/quickcontrols/texteditor/+touch/texteditor.html %%QT_EXAMPLEDIR%%/quickcontrols/texteditor/CMakeLists.txt %%QT_EXAMPLEDIR%%/quickcontrols/texteditor/creatorKateHighlighter.png @@ -7064,7 +7504,6 @@ %%QT_EXAMPLEDIR%%/svg/embedded/fluidlauncher/screenshots/spectrum.png %%QT_EXAMPLEDIR%%/svg/embedded/fluidlauncher/screenshots/styledemo.png %%QT_EXAMPLEDIR%%/svg/embedded/fluidlauncher/screenshots/styledemo_s60.png -%%QT_EXAMPLEDIR%%/svg/embedded/fluidlauncher/screenshots/weatherinfo.png %%QT_EXAMPLEDIR%%/svg/embedded/fluidlauncher/screenshots/wiggly.png %%QT_EXAMPLEDIR%%/svg/embedded/fluidlauncher/screenshots/wiggly_s60.png %%QT_EXAMPLEDIR%%/svg/embedded/fluidlauncher/slides/demo_1.png @@ -7075,23 +7514,6 @@ %%QT_EXAMPLEDIR%%/svg/embedded/fluidlauncher/slides/demo_6.png %%QT_EXAMPLEDIR%%/svg/embedded/fluidlauncher/slideshow.cpp %%QT_EXAMPLEDIR%%/svg/embedded/fluidlauncher/slideshow.h -%%QT_EXAMPLEDIR%%/svg/embedded/weatherinfo/CMakeLists.txt -%%QT_EXAMPLEDIR%%/svg/embedded/weatherinfo/icons/README.txt -%%QT_EXAMPLEDIR%%/svg/embedded/weatherinfo/icons/weather-few-clouds.svg -%%QT_EXAMPLEDIR%%/svg/embedded/weatherinfo/icons/weather-fog.svg -%%QT_EXAMPLEDIR%%/svg/embedded/weatherinfo/icons/weather-haze.svg -%%QT_EXAMPLEDIR%%/svg/embedded/weatherinfo/icons/weather-icy.svg -%%QT_EXAMPLEDIR%%/svg/embedded/weatherinfo/icons/weather-overcast.svg -%%QT_EXAMPLEDIR%%/svg/embedded/weatherinfo/icons/weather-showers.svg -%%QT_EXAMPLEDIR%%/svg/embedded/weatherinfo/icons/weather-sleet.svg -%%QT_EXAMPLEDIR%%/svg/embedded/weatherinfo/icons/weather-snow.svg -%%QT_EXAMPLEDIR%%/svg/embedded/weatherinfo/icons/weather-storm.svg -%%QT_EXAMPLEDIR%%/svg/embedded/weatherinfo/icons/weather-sunny-very-few-clouds.svg -%%QT_EXAMPLEDIR%%/svg/embedded/weatherinfo/icons/weather-sunny.svg -%%QT_EXAMPLEDIR%%/svg/embedded/weatherinfo/icons/weather-thundershower.svg -%%QT_EXAMPLEDIR%%/svg/embedded/weatherinfo/weatherinfo.cpp -%%QT_EXAMPLEDIR%%/svg/embedded/weatherinfo/weatherinfo.pro -%%QT_EXAMPLEDIR%%/svg/embedded/weatherinfo/weatherinfo.qrc %%QT_EXAMPLEDIR%%/svg/embeddedsvgviewer/CMakeLists.txt %%QT_EXAMPLEDIR%%/svg/embeddedsvgviewer/embeddedsvgviewer.cpp %%QT_EXAMPLEDIR%%/svg/embeddedsvgviewer/embeddedsvgviewer.h @@ -7123,6 +7545,12 @@ %%QT_EXAMPLEDIR%%/svg/svgviewer/svgview.h %%QT_EXAMPLEDIR%%/svg/svgviewer/svgviewer.pro %%QT_EXAMPLEDIR%%/svg/svgviewer/svgviewer.qrc +%%QT_EXAMPLEDIR%%/svg/svgwidget/CMakeLists.txt +%%QT_EXAMPLEDIR%%/svg/svgwidget/files/bubbles.svg +%%QT_EXAMPLEDIR%%/svg/svgwidget/files/spheres.svg +%%QT_EXAMPLEDIR%%/svg/svgwidget/main.cpp +%%QT_EXAMPLEDIR%%/svg/svgwidget/svgwidget.pro +%%QT_EXAMPLEDIR%%/svg/svgwidget/svgwidget.qrc %%QT_EXAMPLEDIR%%/svg/textobject/CMakeLists.txt %%QT_EXAMPLEDIR%%/svg/textobject/files/heart.svg %%QT_EXAMPLEDIR%%/svg/textobject/main.cpp @@ -7137,12 +7565,13 @@ %%QT_EXAMPLEDIR%%/tutorials/alarms/AlarmDialog.qml %%QT_EXAMPLEDIR%%/tutorials/alarms/AlarmModel.qml %%QT_EXAMPLEDIR%%/tutorials/alarms/CMakeLists.txt +%%QT_EXAMPLEDIR%%/tutorials/alarms/Main.qml %%QT_EXAMPLEDIR%%/tutorials/alarms/TumblerDelegate.qml %%QT_EXAMPLEDIR%%/tutorials/alarms/alarms.pro %%QT_EXAMPLEDIR%%/tutorials/alarms/controls_conf.qrc %%QT_EXAMPLEDIR%%/tutorials/alarms/main.cpp -%%QT_EXAMPLEDIR%%/tutorials/alarms/main.qml %%QT_EXAMPLEDIR%%/tutorials/alarms/qml.qrc +%%QT_EXAMPLEDIR%%/tutorials/alarms/qmldir %%QT_EXAMPLEDIR%%/tutorials/alarms/qtquickcontrols2.conf %%QT_EXAMPLEDIR%%/tutorials/tutorials.pro %%QT_EXAMPLEDIR%%/uitools/CMakeLists.txt @@ -7510,6 +7939,25 @@ %%QT_EXAMPLEDIR%%/webenginewidgets/notifications/main.cpp %%QT_EXAMPLEDIR%%/webenginewidgets/notifications/notificationpopup.h %%QT_EXAMPLEDIR%%/webenginewidgets/notifications/notifications.pro +%%QT_EXAMPLEDIR%%/webenginewidgets/permissionbrowser/CMakeLists.txt +%%QT_EXAMPLEDIR%%/webenginewidgets/permissionbrowser/Info.cmake.macos.plist +%%QT_EXAMPLEDIR%%/webenginewidgets/permissionbrowser/doc/images/permissionbrowser-example.png +%%QT_EXAMPLEDIR%%/webenginewidgets/permissionbrowser/doc/src/permissionbrowser.qdoc +%%QT_EXAMPLEDIR%%/webenginewidgets/permissionbrowser/main.cpp +%%QT_EXAMPLEDIR%%/webenginewidgets/permissionbrowser/mainwindow.cpp +%%QT_EXAMPLEDIR%%/webenginewidgets/permissionbrowser/mainwindow.h +%%QT_EXAMPLEDIR%%/webenginewidgets/permissionbrowser/mainwindow.ui +%%QT_EXAMPLEDIR%%/webenginewidgets/permissionbrowser/permissionbrowser.exe.manifest +%%QT_EXAMPLEDIR%%/webenginewidgets/permissionbrowser/permissionbrowser.qrc +%%QT_EXAMPLEDIR%%/webenginewidgets/permissionbrowser/permissiondialog.ui +%%QT_EXAMPLEDIR%%/webenginewidgets/permissionbrowser/permissionwidget.ui +%%QT_EXAMPLEDIR%%/webenginewidgets/permissionbrowser/resources/3rdparty/COPYING +%%QT_EXAMPLEDIR%%/webenginewidgets/permissionbrowser/resources/3rdparty/go-next.png +%%QT_EXAMPLEDIR%%/webenginewidgets/permissionbrowser/resources/3rdparty/go-previous.png +%%QT_EXAMPLEDIR%%/webenginewidgets/permissionbrowser/resources/3rdparty/qt_attribution.json +%%QT_EXAMPLEDIR%%/webenginewidgets/permissionbrowser/resources/3rdparty/view-refresh.png +%%QT_EXAMPLEDIR%%/webenginewidgets/permissionbrowser/resources/AppLogoColor.png +%%QT_EXAMPLEDIR%%/webenginewidgets/permissionbrowser/resources/landing.html %%QT_EXAMPLEDIR%%/webenginewidgets/printme/CMakeLists.txt %%QT_EXAMPLEDIR%%/webenginewidgets/printme/data/data.qrc %%QT_EXAMPLEDIR%%/webenginewidgets/printme/data/index.html @@ -7785,7 +8233,6 @@ %%QT_EXAMPLEDIR%%/widgets/dialogs/trivialwizard/CMakeLists.txt %%QT_EXAMPLEDIR%%/widgets/dialogs/trivialwizard/trivialwizard.cpp %%QT_EXAMPLEDIR%%/widgets/dialogs/trivialwizard/trivialwizard.pro -%%QT_EXAMPLEDIR%%/widgets/doc/dropsite.qdoc %%QT_EXAMPLEDIR%%/widgets/doc/images/addressbook-adddialog.png %%QT_EXAMPLEDIR%%/widgets/doc/images/addressbook-classes.png %%QT_EXAMPLEDIR%%/widgets/doc/images/addressbook-editdialog.png @@ -7804,15 +8251,6 @@ %%QT_EXAMPLEDIR%%/widgets/doc/images/dropsite-example.png %%QT_EXAMPLEDIR%%/widgets/doc/images/geometry.png %%QT_EXAMPLEDIR%%/widgets/doc/images/graphicssimpleanchorlayout-example.png -%%QT_EXAMPLEDIR%%/widgets/doc/images/icons_monkey.png -%%QT_EXAMPLEDIR%%/widgets/doc/images/icons_monkey_mess.png -%%QT_EXAMPLEDIR%%/widgets/doc/images/icons_qt_extended_16x16.png -%%QT_EXAMPLEDIR%%/widgets/doc/images/icons_qt_extended_17x17.png -%%QT_EXAMPLEDIR%%/widgets/doc/images/icons_qt_extended_32x32.png -%%QT_EXAMPLEDIR%%/widgets/doc/images/icons_qt_extended_33x33.png -%%QT_EXAMPLEDIR%%/widgets/doc/images/icons_qt_extended_48x48.png -%%QT_EXAMPLEDIR%%/widgets/doc/images/icons_qt_extended_64x64.png -%%QT_EXAMPLEDIR%%/widgets/doc/images/icons_qt_extended_8x8.png %%QT_EXAMPLEDIR%%/widgets/doc/images/imagegestures-example.png %%QT_EXAMPLEDIR%%/widgets/doc/images/itemviews-editabletreemodel-indexes.png %%QT_EXAMPLEDIR%%/widgets/doc/images/itemviews-editabletreemodel-items.png @@ -7821,17 +8259,12 @@ %%QT_EXAMPLEDIR%%/widgets/doc/images/itemviews-editabletreemodel.png %%QT_EXAMPLEDIR%%/widgets/doc/images/layout1.png %%QT_EXAMPLEDIR%%/widgets/doc/images/layout2.png -%%QT_EXAMPLEDIR%%/widgets/doc/images/notepad.png %%QT_EXAMPLEDIR%%/widgets/doc/images/notepad1.png %%QT_EXAMPLEDIR%%/widgets/doc/images/notepad2.png %%QT_EXAMPLEDIR%%/widgets/doc/images/notepad3.png %%QT_EXAMPLEDIR%%/widgets/doc/images/notepad4.png -%%QT_EXAMPLEDIR%%/widgets/doc/images/notepad_menu.png %%QT_EXAMPLEDIR%%/widgets/doc/images/orderform-example.png -%%QT_EXAMPLEDIR%%/widgets/doc/images/regexp-example.png %%QT_EXAMPLEDIR%%/widgets/doc/images/regularexpression-example.png -%%QT_EXAMPLEDIR%%/widgets/doc/images/sipdialog-closed.png -%%QT_EXAMPLEDIR%%/widgets/doc/images/sipdialog-opened.png %%QT_EXAMPLEDIR%%/widgets/doc/images/systemtray-editor.png %%QT_EXAMPLEDIR%%/widgets/doc/images/systemtray-example.png %%QT_EXAMPLEDIR%%/widgets/doc/images/treemodel-structure.png @@ -7858,6 +8291,7 @@ %%QT_EXAMPLEDIR%%/widgets/doc/src/dragdroprobot.qdoc %%QT_EXAMPLEDIR%%/widgets/doc/src/draggableicons.qdoc %%QT_EXAMPLEDIR%%/widgets/doc/src/draggabletext.qdoc +%%QT_EXAMPLEDIR%%/widgets/doc/src/dropsite.qdoc %%QT_EXAMPLEDIR%%/widgets/doc/src/easing.qdoc %%QT_EXAMPLEDIR%%/widgets/doc/src/editabletreemodel.qdoc %%QT_EXAMPLEDIR%%/widgets/doc/src/elasticnodes.qdoc diff --git a/multimedia/qt6-multimedia/Makefile b/multimedia/qt6-multimedia/Makefile index f6c81900033f..400f238a6274 100644 --- a/multimedia/qt6-multimedia/Makefile +++ b/multimedia/qt6-multimedia/Makefile @@ -1,6 +1,5 @@ PORTNAME= multimedia DISTVERSION= ${QT6_VERSION} -PORTREVISION= 1 CATEGORIES= multimedia PKGNAMEPREFIX= qt6- @@ -17,8 +16,8 @@ USE_QT= base declarative shadertools:build CFLAGS_powerpc= -DPFFFT_SIMD_DISABLE CXXFLAGS_powerpc64= -mvsx -OPTIONS_DEFINE= FFMPEG GSTREAMER Q3D V4L VAAPI X11 -OPTIONS_DEFAULT= FFMPEG GSTREAMER PULSEAUDIO Q3D V4L VAAPI X11 +OPTIONS_DEFINE= FFMPEG GSTREAMER PIPEWIRE Q3D V4L VAAPI X11 +OPTIONS_DEFAULT= FFMPEG GSTREAMER PIPEWIRE PULSEAUDIO Q3D V4L VAAPI X11 AUDIO_DESC= Low-level audio backend OPTIONS_SINGLE= AUDIO OPTIONS_SINGLE_AUDIO= ALSA PULSEAUDIO @@ -44,6 +43,10 @@ GSTREAMER_CMAKE_BOOL= FEATURE_gstreamer \ FEATURE_gstreamer_gl \ FEATURE_gstreamer_photography +PIPEWIRE_LIB_DEPENDS= libpipewire-0.3.so:multimedia/pipewire +PIPEWIRE_CMAKE_BOOL= FEATURE_pipewire +PIPEWIRE_IMPLIES= FFMPEG + PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_CMAKE_BOOL= FEATURE_pulseaudio diff --git a/multimedia/qt6-multimedia/distinfo b/multimedia/qt6-multimedia/distinfo index bd9a27e34cdd..7e5c18c7dbd7 100644 --- a/multimedia/qt6-multimedia/distinfo +++ b/multimedia/qt6-multimedia/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1727500687 -SHA256 (KDE/Qt/6.7.3/qtmultimedia-everywhere-src-6.7.3.tar.xz) = 304d28b8e592435293893b0110d5f3534407604d1e04d8a0b0e5b34afe577303 -SIZE (KDE/Qt/6.7.3/qtmultimedia-everywhere-src-6.7.3.tar.xz) = 9360356 +TIMESTAMP = 1733205477 +SHA256 (KDE/Qt/6.8.1/qtmultimedia-everywhere-src-6.8.1.tar.xz) = 75fa87134f9afab7f0a62c55a4744799ac79519560d19c8e1d4c32bdd173f953 +SIZE (KDE/Qt/6.8.1/qtmultimedia-everywhere-src-6.8.1.tar.xz) = 9664564 diff --git a/multimedia/qt6-multimedia/files/patch-cmake_FindFFmpeg.cmake b/multimedia/qt6-multimedia/files/patch-cmake_FindFFmpeg.cmake index a9d7f64fcd4a..03598d129790 100644 --- a/multimedia/qt6-multimedia/files/patch-cmake_FindFFmpeg.cmake +++ b/multimedia/qt6-multimedia/files/patch-cmake_FindFFmpeg.cmake @@ -1,11 +1,11 @@ ---- cmake/FindFFmpeg.cmake.orig 2024-06-03 15:20:28 UTC +--- cmake/FindFFmpeg.cmake.orig 2024-11-22 07:31:25 UTC +++ cmake/FindFFmpeg.cmake -@@ -253,7 +253,7 @@ function(__ffmpeg_internal_set_dependencies _component - # and adds them to the target library. - function(__ffmpeg_internal_set_dependencies _component) - string(TOLOWER ${_component} lib) -- set(PC_FILE ${${_component}_LIBRARY_DIR}/pkgconfig/lib${lib}.pc) -+ set(PC_FILE ${${_component}_LIBRARY_DIR}/../libdata/pkgconfig/lib${lib}.pc) - if(EXISTS ${PC_FILE}) - file(READ ${PC_FILE} pcfile) +@@ -255,7 +255,7 @@ function(__ffmpeg_internal_set_dependencies _component + # The pkgconfig directory is always in lib/pkgconfig/, even on Windows + # where libs and dlls are in bin/ +- set(PC_FILE ${${_component}_LIBRARY_DIR}/../lib/pkgconfig/lib${lib}.pc) ++ set(PC_FILE ${${_component}_LIBRARY_DIR}/../libdata/pkgconfig/lib${lib}.pc) + + if(EXISTS ${PC_FILE}) + file(READ ${PC_FILE} pcfile) diff --git a/multimedia/qt6-multimedia/files/patch-src_multimedia_CMakeLists.txt b/multimedia/qt6-multimedia/files/patch-src_multimedia_CMakeLists.txt index d8399f5e1ab1..5d36f1829051 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-06-08 01:28:28 UTC +--- src/multimedia/CMakeLists.txt.orig 2024-06-03 15:20:28 UTC +++ src/multimedia/CMakeLists.txt -@@ -109,7 +109,7 @@ qt_internal_extend_target(Multimedia +@@ -117,7 +117,7 @@ qt_internal_extend_target(Multimedia ) qt_internal_extend_target(Multimedia diff --git a/multimedia/qt6-multimedia/files/patch-src_multimedia_configure.cmake b/multimedia/qt6-multimedia/files/patch-src_multimedia_configure.cmake index 73e33bafa6ef..6612e19d3e11 100644 --- a/multimedia/qt6-multimedia/files/patch-src_multimedia_configure.cmake +++ b/multimedia/qt6-multimedia/files/patch-src_multimedia_configure.cmake @@ -1,4 +1,4 @@ ---- src/multimedia/configure.cmake.orig 2024-06-08 01:28:28 UTC +--- src/multimedia/configure.cmake.orig 2024-06-03 15:20:28 UTC +++ src/multimedia/configure.cmake @@ -80,7 +80,7 @@ qt_feature("ffmpeg" PRIVATE LABEL "FFmpeg" diff --git a/multimedia/qt6-multimedia/files/patch-src_plugins_multimedia_ffmpeg_CMakeLists.txt b/multimedia/qt6-multimedia/files/patch-src_plugins_multimedia_ffmpeg_CMakeLists.txt index b0d7b6d77a7d..a3193a0b13fb 100644 --- a/multimedia/qt6-multimedia/files/patch-src_plugins_multimedia_ffmpeg_CMakeLists.txt +++ b/multimedia/qt6-multimedia/files/patch-src_plugins_multimedia_ffmpeg_CMakeLists.txt @@ -1,6 +1,6 @@ ---- src/plugins/multimedia/ffmpeg/CMakeLists.txt.orig 2024-06-08 01:28:28 UTC +--- src/plugins/multimedia/ffmpeg/CMakeLists.txt.orig 2024-06-03 15:20:28 UTC +++ src/plugins/multimedia/ffmpeg/CMakeLists.txt -@@ -82,7 +82,7 @@ qt_internal_add_plugin(QFFmpegMediaPlugin +@@ -84,7 +84,7 @@ qt_internal_add_plugin(QFFmpegMediaPlugin Qt::CorePrivate ) diff --git a/multimedia/qt6-multimedia/pkg-plist b/multimedia/qt6-multimedia/pkg-plist index 8948bc67ccfb..07e1cb33dd57 100644 --- a/multimedia/qt6-multimedia/pkg-plist +++ b/multimedia/qt6-multimedia/pkg-plist @@ -1,12 +1,13 @@ -%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qabstractvideobuffer_p.h %%ALSA%%%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qalsaaudiodevice_p.h %%ALSA%%%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qalsaaudiosink_p.h %%ALSA%%%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qalsaaudiosource_p.h %%ALSA%%%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qalsamediadevices_p.h +%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qaudiobufferoutput_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qaudiodecoder_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qaudiodevice_p.h %%PULSEAUDIO%%%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qaudioengine_pulse_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qaudiohelpers_p.h +%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qaudioringbuffer_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qaudiostatemachine_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qaudiostatemachineutils_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qaudiosystem_p.h @@ -15,14 +16,18 @@ %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qcapturablewindow_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qerrorinfo_p.h %%GSTREAMER%%%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qgstreamer_platformspecificinterface_p.h +%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qhwvideobuffer_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qimagevideobuffer_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qmaybe_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qmediacapturesession_p.h +%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qmediaframeinput_p.h +%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qmediainputencoderinterface_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qmediaplayer_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qmediarecorder_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qmediastoragelocation_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qmemoryvideobuffer_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qmultimediautils_p.h +%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qplatformaudiobufferinput_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qplatformaudiodecoder_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qplatformaudioinput_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qplatformaudiooutput_p.h @@ -39,6 +44,7 @@ %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qplatformmediarecorder_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qplatformsurfacecapture_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qplatformvideodevices_p.h +%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qplatformvideoframeinput_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qplatformvideosink_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qplatformvideosource_p.h %%PULSEAUDIO%%%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qpulseaudiodevice_p.h @@ -55,9 +61,13 @@ %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qvideoframeconverter_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qvideooutputorientationhandler_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qvideotexturehelper_p.h +%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qvideotransformation_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qvideowindow_p.h +%%QT_INCDIR%%/QtMultimedia/QAbstractVideoBuffer %%QT_INCDIR%%/QtMultimedia/QAudio %%QT_INCDIR%%/QtMultimedia/QAudioBuffer +%%QT_INCDIR%%/QtMultimedia/QAudioBufferInput +%%QT_INCDIR%%/QtMultimedia/QAudioBufferOutput %%QT_INCDIR%%/QtMultimedia/QAudioDecoder %%QT_INCDIR%%/QtMultimedia/QAudioDevice %%QT_INCDIR%%/QtMultimedia/QAudioFormat @@ -82,6 +92,7 @@ %%QT_INCDIR%%/QtMultimedia/QSoundEffect %%QT_INCDIR%%/QtMultimedia/QVideoFrame %%QT_INCDIR%%/QtMultimedia/QVideoFrameFormat +%%QT_INCDIR%%/QtMultimedia/QVideoFrameInput %%QT_INCDIR%%/QtMultimedia/QVideoSink %%QT_INCDIR%%/QtMultimedia/QWaveDecoder %%QT_INCDIR%%/QtMultimedia/QWindowCapture @@ -89,8 +100,11 @@ %%QT_INCDIR%%/QtMultimedia/QtMultimedia %%QT_INCDIR%%/QtMultimedia/QtMultimediaDepends %%QT_INCDIR%%/QtMultimedia/QtMultimediaVersion +%%QT_INCDIR%%/QtMultimedia/qabstractvideobuffer.h %%QT_INCDIR%%/QtMultimedia/qaudio.h %%QT_INCDIR%%/QtMultimedia/qaudiobuffer.h +%%QT_INCDIR%%/QtMultimedia/qaudiobufferinput.h +%%QT_INCDIR%%/QtMultimedia/qaudiobufferoutput.h %%QT_INCDIR%%/QtMultimedia/qaudiodecoder.h %%QT_INCDIR%%/QtMultimedia/qaudiodevice.h %%QT_INCDIR%%/QtMultimedia/qaudioformat.h @@ -104,7 +118,6 @@ %%QT_INCDIR%%/QtMultimedia/qimagecapture.h %%QT_INCDIR%%/QtMultimedia/qmediacapturesession.h %%QT_INCDIR%%/QtMultimedia/qmediadevices.h -%%QT_INCDIR%%/QtMultimedia/qmediaenumdebug.h %%QT_INCDIR%%/QtMultimedia/qmediaformat.h %%QT_INCDIR%%/QtMultimedia/qmediametadata.h %%QT_INCDIR%%/QtMultimedia/qmediaplayer.h @@ -120,6 +133,7 @@ %%QT_INCDIR%%/QtMultimedia/qtvideo.h %%QT_INCDIR%%/QtMultimedia/qvideoframe.h %%QT_INCDIR%%/QtMultimedia/qvideoframeformat.h +%%QT_INCDIR%%/QtMultimedia/qvideoframeinput.h %%QT_INCDIR%%/QtMultimedia/qvideosink.h %%QT_INCDIR%%/QtMultimedia/qwavedecoder.h %%QT_INCDIR%%/QtMultimedia/qwindowcapture.h @@ -138,6 +152,23 @@ %%QT_INCDIR%%/QtMultimediaQuick/QtMultimediaQuickVersion %%QT_INCDIR%%/QtMultimediaQuick/qtmultimediaquickexports.h %%QT_INCDIR%%/QtMultimediaQuick/qtmultimediaquickversion.h +%%QT_INCDIR%%/QtMultimediaTestLib/%%FULLVER%%/QtMultimediaTestLib/private/audiogenerationutils_p.h +%%QT_INCDIR%%/QtMultimediaTestLib/%%FULLVER%%/QtMultimediaTestLib/private/capturesessionfixture_p.h +%%QT_INCDIR%%/QtMultimediaTestLib/%%FULLVER%%/QtMultimediaTestLib/private/framegenerator_p.h +%%QT_INCDIR%%/QtMultimediaTestLib/%%FULLVER%%/QtMultimediaTestLib/private/mediabackendutils_p.h +%%QT_INCDIR%%/QtMultimediaTestLib/%%FULLVER%%/QtMultimediaTestLib/private/mediafileselector_p.h +%%QT_INCDIR%%/QtMultimediaTestLib/%%FULLVER%%/QtMultimediaTestLib/private/mediainfo_p.h +%%QT_INCDIR%%/QtMultimediaTestLib/%%FULLVER%%/QtMultimediaTestLib/private/qcolorutil_p.h +%%QT_INCDIR%%/QtMultimediaTestLib/%%FULLVER%%/QtMultimediaTestLib/private/qfileutil_p.h +%%QT_INCDIR%%/QtMultimediaTestLib/%%FULLVER%%/QtMultimediaTestLib/private/qmockiodevice_p.h +%%QT_INCDIR%%/QtMultimediaTestLib/%%FULLVER%%/QtMultimediaTestLib/private/qscopedenvironmentvariable_p.h +%%QT_INCDIR%%/QtMultimediaTestLib/%%FULLVER%%/QtMultimediaTestLib/private/qsequentialfileadaptor_p.h +%%QT_INCDIR%%/QtMultimediaTestLib/%%FULLVER%%/QtMultimediaTestLib/private/qsinewavevalidator_p.h +%%QT_INCDIR%%/QtMultimediaTestLib/%%FULLVER%%/QtMultimediaTestLib/private/testvideosink_p.h +%%QT_INCDIR%%/QtMultimediaTestLib/QtMultimediaTestLib +%%QT_INCDIR%%/QtMultimediaTestLib/QtMultimediaTestLibDepends +%%QT_INCDIR%%/QtMultimediaTestLib/QtMultimediaTestLibVersion +%%QT_INCDIR%%/QtMultimediaTestLib/qtmultimediatestlibversion.h %%QT_INCDIR%%/QtMultimediaWidgets/%%FULLVER%%/QtMultimediaWidgets/private/qvideowidget_p.h %%QT_INCDIR%%/QtMultimediaWidgets/QGraphicsVideoItem %%QT_INCDIR%%/QtMultimediaWidgets/QVideoWidget @@ -150,12 +181,15 @@ %%QT_INCDIR%%/QtMultimediaWidgets/qtmultimediawidgetsversion.h %%QT_INCDIR%%/QtMultimediaWidgets/qvideowidget.h %%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPluginImpl/%%FULLVER%%/QtQGstreamerMediaPluginImpl/private/qglist_helper_p.h -%%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPluginImpl/%%FULLVER%%/QtQGstreamerMediaPluginImpl/private/qgst_bus_p.h +%%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPluginImpl/%%FULLVER%%/QtQGstreamerMediaPluginImpl/private/qgst_bus_observer_p.h %%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPluginImpl/%%FULLVER%%/QtQGstreamerMediaPluginImpl/private/qgst_debug_p.h +%%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPluginImpl/%%FULLVER%%/QtQGstreamerMediaPluginImpl/private/qgst_discoverer_p.h %%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPluginImpl/%%FULLVER%%/QtQGstreamerMediaPluginImpl/private/qgst_handle_types_p.h %%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPluginImpl/%%FULLVER%%/QtQGstreamerMediaPluginImpl/private/qgst_p.h -%%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPluginImpl/%%FULLVER%%/QtQGstreamerMediaPluginImpl/private/qgstappsource_p.h +%%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPluginImpl/%%FULLVER%%/QtQGstreamerMediaPluginImpl/private/qgst_play_p.h %%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPluginImpl/%%FULLVER%%/QtQGstreamerMediaPluginImpl/private/qgstpipeline_p.h +%%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPluginImpl/%%FULLVER%%/QtQGstreamerMediaPluginImpl/private/qgstreamer_qiodevice_handler_p.h +%%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPluginImpl/%%FULLVER%%/QtQGstreamerMediaPluginImpl/private/qgstreamer_qrc_handler_p.h %%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPluginImpl/%%FULLVER%%/QtQGstreamerMediaPluginImpl/private/qgstreameraudiodecoder_p.h %%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPluginImpl/%%FULLVER%%/QtQGstreamerMediaPluginImpl/private/qgstreameraudiodevice_p.h %%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPluginImpl/%%FULLVER%%/QtQGstreamerMediaPluginImpl/private/qgstreameraudioinput_p.h @@ -165,9 +199,9 @@ %%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPluginImpl/%%FULLVER%%/QtQGstreamerMediaPluginImpl/private/qgstreamerformatinfo_p.h %%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPluginImpl/%%FULLVER%%/QtQGstreamerMediaPluginImpl/private/qgstreamerimagecapture_p.h %%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPluginImpl/%%FULLVER%%/QtQGstreamerMediaPluginImpl/private/qgstreamerintegration_p.h -%%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPluginImpl/%%FULLVER%%/QtQGstreamerMediaPluginImpl/private/qgstreamermediacapture_p.h -%%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPluginImpl/%%FULLVER%%/QtQGstreamerMediaPluginImpl/private/qgstreamermediaencoder_p.h +%%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPluginImpl/%%FULLVER%%/QtQGstreamerMediaPluginImpl/private/qgstreamermediacapturesession_p.h %%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPluginImpl/%%FULLVER%%/QtQGstreamerMediaPluginImpl/private/qgstreamermediaplayer_p.h +%%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPluginImpl/%%FULLVER%%/QtQGstreamerMediaPluginImpl/private/qgstreamermediarecorder_p.h %%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPluginImpl/%%FULLVER%%/QtQGstreamerMediaPluginImpl/private/qgstreamermessage_p.h %%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPluginImpl/%%FULLVER%%/QtQGstreamerMediaPluginImpl/private/qgstreamermetadata_p.h %%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPluginImpl/%%FULLVER%%/QtQGstreamerMediaPluginImpl/private/qgstreamervideodevices_p.h @@ -194,10 +228,12 @@ %%Q3D%%%%QT_INCDIR%%/QtQuick3DSpatialAudio/QtQuick3DSpatialAudioVersion %%Q3D%%%%QT_INCDIR%%/QtQuick3DSpatialAudio/qtquick3dspatialaudioexports.h %%Q3D%%%%QT_INCDIR%%/QtQuick3DSpatialAudio/qtquick3dspatialaudioversion.h +%%QT_INCDIR%%/QtSpatialAudio/%%FULLVER%%/QtSpatialAudio/private/qambientsound_p.h %%QT_INCDIR%%/QtSpatialAudio/%%FULLVER%%/QtSpatialAudio/private/qambisonicdecoder_p.h %%QT_INCDIR%%/QtSpatialAudio/%%FULLVER%%/QtSpatialAudio/private/qambisonicdecoderdata_p.h %%QT_INCDIR%%/QtSpatialAudio/%%FULLVER%%/QtSpatialAudio/private/qaudioengine_p.h %%QT_INCDIR%%/QtSpatialAudio/%%FULLVER%%/QtSpatialAudio/private/qaudioroom_p.h +%%QT_INCDIR%%/QtSpatialAudio/%%FULLVER%%/QtSpatialAudio/private/qspatialsound_p.h %%QT_INCDIR%%/QtSpatialAudio/%%FULLVER%%/QtSpatialAudio/private/qtspatialaudioglobal_p.h %%QT_INCDIR%%/QtSpatialAudio/QAmbientSound %%QT_INCDIR%%/QtSpatialAudio/QAudioEngine @@ -221,6 +257,7 @@ lib/cmake/Qt6/FindGObject.cmake lib/cmake/Qt6/FindGStreamer.cmake lib/cmake/Qt6/FindMMRenderer.cmake lib/cmake/Qt6/FindMMRendererCore.cmake +lib/cmake/Qt6/FindPipeWire.cmake lib/cmake/Qt6/FindVAAPI.cmake lib/cmake/Qt6/FindWMF.cmake lib/cmake/Qt6/FindWrapBundledResonanceAudioConfigExtra.cmake @@ -232,15 +269,18 @@ lib/cmake/Qt6BundledResonanceAudio/Qt6BundledResonanceAudioConfigVersion.cmake lib/cmake/Qt6BundledResonanceAudio/Qt6BundledResonanceAudioConfigVersionImpl.cmake lib/cmake/Qt6BundledResonanceAudio/Qt6BundledResonanceAudioTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6BundledResonanceAudio/Qt6BundledResonanceAudioTargets.cmake +lib/cmake/Qt6BundledResonanceAudio/Qt6BundledResonanceAudioVersionlessAliasTargets.cmake lib/cmake/Qt6BundledResonanceAudio/Qt6BundledResonanceAudioVersionlessTargets.cmake lib/cmake/Qt6Multimedia/Qt6MultimediaAdditionalTargetInfo.cmake lib/cmake/Qt6Multimedia/Qt6MultimediaConfig.cmake lib/cmake/Qt6Multimedia/Qt6MultimediaConfigVersion.cmake lib/cmake/Qt6Multimedia/Qt6MultimediaConfigVersionImpl.cmake lib/cmake/Qt6Multimedia/Qt6MultimediaDependencies.cmake +lib/cmake/Qt6Multimedia/Qt6MultimediaMacros.cmake lib/cmake/Qt6Multimedia/Qt6MultimediaPlugins.cmake lib/cmake/Qt6Multimedia/Qt6MultimediaTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6Multimedia/Qt6MultimediaTargets.cmake +lib/cmake/Qt6Multimedia/Qt6MultimediaVersionlessAliasTargets.cmake lib/cmake/Qt6Multimedia/Qt6MultimediaVersionlessTargets.cmake %%FFMPEG%%lib/cmake/Qt6Multimedia/Qt6QFFmpegMediaPluginAdditionalTargetInfo.cmake %%FFMPEG%%lib/cmake/Qt6Multimedia/Qt6QFFmpegMediaPluginConfig.cmake @@ -261,7 +301,17 @@ lib/cmake/Qt6MultimediaQuickPrivate/Qt6MultimediaQuickPrivateConfigVersionImpl.c lib/cmake/Qt6MultimediaQuickPrivate/Qt6MultimediaQuickPrivateDependencies.cmake lib/cmake/Qt6MultimediaQuickPrivate/Qt6MultimediaQuickPrivateTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6MultimediaQuickPrivate/Qt6MultimediaQuickPrivateTargets.cmake +lib/cmake/Qt6MultimediaQuickPrivate/Qt6MultimediaQuickPrivateVersionlessAliasTargets.cmake lib/cmake/Qt6MultimediaQuickPrivate/Qt6MultimediaQuickPrivateVersionlessTargets.cmake +lib/cmake/Qt6MultimediaTestLibPrivate/Qt6MultimediaTestLibPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6MultimediaTestLibPrivate/Qt6MultimediaTestLibPrivateConfig.cmake +lib/cmake/Qt6MultimediaTestLibPrivate/Qt6MultimediaTestLibPrivateConfigVersion.cmake +lib/cmake/Qt6MultimediaTestLibPrivate/Qt6MultimediaTestLibPrivateConfigVersionImpl.cmake +lib/cmake/Qt6MultimediaTestLibPrivate/Qt6MultimediaTestLibPrivateDependencies.cmake +lib/cmake/Qt6MultimediaTestLibPrivate/Qt6MultimediaTestLibPrivateTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/Qt6MultimediaTestLibPrivate/Qt6MultimediaTestLibPrivateTargets.cmake +lib/cmake/Qt6MultimediaTestLibPrivate/Qt6MultimediaTestLibPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6MultimediaTestLibPrivate/Qt6MultimediaTestLibPrivateVersionlessTargets.cmake lib/cmake/Qt6MultimediaWidgets/Qt6MultimediaWidgetsAdditionalTargetInfo.cmake lib/cmake/Qt6MultimediaWidgets/Qt6MultimediaWidgetsConfig.cmake lib/cmake/Qt6MultimediaWidgets/Qt6MultimediaWidgetsConfigVersion.cmake @@ -269,6 +319,7 @@ lib/cmake/Qt6MultimediaWidgets/Qt6MultimediaWidgetsConfigVersionImpl.cmake lib/cmake/Qt6MultimediaWidgets/Qt6MultimediaWidgetsDependencies.cmake lib/cmake/Qt6MultimediaWidgets/Qt6MultimediaWidgetsTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6MultimediaWidgets/Qt6MultimediaWidgetsTargets.cmake +lib/cmake/Qt6MultimediaWidgets/Qt6MultimediaWidgetsVersionlessAliasTargets.cmake lib/cmake/Qt6MultimediaWidgets/Qt6MultimediaWidgetsVersionlessTargets.cmake %%GSTREAMER%%lib/cmake/Qt6QGstreamerMediaPluginImplPrivate/Qt6QGstreamerMediaPluginImplPrivateAdditionalTargetInfo.cmake %%GSTREAMER%%lib/cmake/Qt6QGstreamerMediaPluginImplPrivate/Qt6QGstreamerMediaPluginImplPrivateConfig.cmake @@ -277,6 +328,7 @@ lib/cmake/Qt6MultimediaWidgets/Qt6MultimediaWidgetsVersionlessTargets.cmake %%GSTREAMER%%lib/cmake/Qt6QGstreamerMediaPluginImplPrivate/Qt6QGstreamerMediaPluginImplPrivateDependencies.cmake %%GSTREAMER%%lib/cmake/Qt6QGstreamerMediaPluginImplPrivate/Qt6QGstreamerMediaPluginImplPrivateTargets-%%CMAKE_BUILD_TYPE%%.cmake %%GSTREAMER%%lib/cmake/Qt6QGstreamerMediaPluginImplPrivate/Qt6QGstreamerMediaPluginImplPrivateTargets.cmake +%%GSTREAMER%%lib/cmake/Qt6QGstreamerMediaPluginImplPrivate/Qt6QGstreamerMediaPluginImplPrivateVersionlessAliasTargets.cmake %%GSTREAMER%%lib/cmake/Qt6QGstreamerMediaPluginImplPrivate/Qt6QGstreamerMediaPluginImplPrivateVersionlessTargets.cmake %%Q3D%%lib/cmake/Qt6Qml/QmlPlugins/Qt6quick3dspatialaudioAdditionalTargetInfo.cmake %%Q3D%%lib/cmake/Qt6Qml/QmlPlugins/Qt6quick3dspatialaudioConfig.cmake @@ -297,6 +349,7 @@ lib/cmake/Qt6Qml/QmlPlugins/Qt6quickmultimediaTargets.cmake %%Q3D%%lib/cmake/Qt6Quick3DSpatialAudioPrivate/Qt6Quick3DSpatialAudioPrivateDependencies.cmake %%Q3D%%lib/cmake/Qt6Quick3DSpatialAudioPrivate/Qt6Quick3DSpatialAudioPrivateTargets-%%CMAKE_BUILD_TYPE%%.cmake %%Q3D%%lib/cmake/Qt6Quick3DSpatialAudioPrivate/Qt6Quick3DSpatialAudioPrivateTargets.cmake +%%Q3D%%lib/cmake/Qt6Quick3DSpatialAudioPrivate/Qt6Quick3DSpatialAudioPrivateVersionlessAliasTargets.cmake %%Q3D%%lib/cmake/Qt6Quick3DSpatialAudioPrivate/Qt6Quick3DSpatialAudioPrivateVersionlessTargets.cmake lib/cmake/Qt6SpatialAudio/Qt6SpatialAudioAdditionalTargetInfo.cmake lib/cmake/Qt6SpatialAudio/Qt6SpatialAudioConfig.cmake @@ -305,6 +358,7 @@ lib/cmake/Qt6SpatialAudio/Qt6SpatialAudioConfigVersionImpl.cmake lib/cmake/Qt6SpatialAudio/Qt6SpatialAudioDependencies.cmake lib/cmake/Qt6SpatialAudio/Qt6SpatialAudioTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6SpatialAudio/Qt6SpatialAudioTargets.cmake +lib/cmake/Qt6SpatialAudio/Qt6SpatialAudioVersionlessAliasTargets.cmake lib/cmake/Qt6SpatialAudio/Qt6SpatialAudioVersionlessTargets.cmake %%QT_LIBDIR%%/libQt6BundledResonanceAudio.a %%QT_LIBDIR%%/libQt6Multimedia.prl @@ -315,6 +369,8 @@ lib/cmake/Qt6SpatialAudio/Qt6SpatialAudioVersionlessTargets.cmake %%QT_LIBDIR%%/libQt6MultimediaQuick.so %%QT_LIBDIR%%/libQt6MultimediaQuick.so.6 %%QT_LIBDIR%%/libQt6MultimediaQuick.so.%%FULLVER%% +%%QT_LIBDIR%%/libQt6MultimediaTestLib.a +%%QT_LIBDIR%%/libQt6MultimediaTestLib.prl %%QT_LIBDIR%%/libQt6MultimediaWidgets.prl %%QT_LIBDIR%%/libQt6MultimediaWidgets.so %%QT_LIBDIR%%/libQt6MultimediaWidgets.so.6 @@ -331,6 +387,7 @@ lib/cmake/Qt6SpatialAudio/Qt6SpatialAudioVersionlessTargets.cmake %%QT_LIBDIR%%/libQt6SpatialAudio.so.%%FULLVER%% %%QT_LIBDIR%%/metatypes/qt6multimedia_%%CMAKE_BUILD_TYPE%%_metatypes.json %%QT_LIBDIR%%/metatypes/qt6multimediaquickprivate_%%CMAKE_BUILD_TYPE%%_metatypes.json +%%QT_LIBDIR%%/metatypes/qt6multimediatestlibprivate_%%CMAKE_BUILD_TYPE%%_metatypes.json %%QT_LIBDIR%%/metatypes/qt6multimediawidgets_%%CMAKE_BUILD_TYPE%%_metatypes.json %%GSTREAMER%%%%QT_LIBDIR%%/metatypes/qt6qgstreamermediapluginimplprivate_%%CMAKE_BUILD_TYPE%%_metatypes.json %%Q3D%%%%QT_LIBDIR%%/metatypes/qt6quick3dspatialaudioprivate_%%CMAKE_BUILD_TYPE%%_metatypes.json @@ -338,6 +395,7 @@ lib/cmake/Qt6SpatialAudio/Qt6SpatialAudioVersionlessTargets.cmake %%QT_MKSPECDIR%%/modules/qt_lib_multimedia.pri %%QT_MKSPECDIR%%/modules/qt_lib_multimedia_private.pri %%QT_MKSPECDIR%%/modules/qt_lib_multimediaquick_private.pri +%%QT_MKSPECDIR%%/modules/qt_lib_multimediatestlibprivate_private.pri %%QT_MKSPECDIR%%/modules/qt_lib_multimediawidgets.pri %%QT_MKSPECDIR%%/modules/qt_lib_multimediawidgets_private.pri %%GSTREAMER%%%%QT_MKSPECDIR%%/modules/qt_lib_qgstreamermediapluginimpl_private.pri @@ -353,11 +411,13 @@ lib/cmake/Qt6SpatialAudio/Qt6SpatialAudioVersionlessTargets.cmake %%Q3D%%%%QT_QMLDIR%%/QtQuick3D/SpatialAudio/libquick3dspatialaudioplugin.so %%Q3D%%%%QT_QMLDIR%%/QtQuick3D/SpatialAudio/plugins.qmltypes %%Q3D%%%%QT_QMLDIR%%/QtQuick3D/SpatialAudio/qmldir +%%QT_SBOMDIR%%/qtmultimedia-%%FULLVER%%.spdx libdata/pkgconfig/Qt6Multimedia.pc libdata/pkgconfig/Qt6MultimediaWidgets.pc libdata/pkgconfig/Qt6SpatialAudio.pc %%QT_DATADIR%%/modules/Multimedia.json %%QT_DATADIR%%/modules/MultimediaQuickPrivate.json +%%QT_DATADIR%%/modules/MultimediaTestLibPrivate.json %%QT_DATADIR%%/modules/MultimediaWidgets.json %%GSTREAMER%%%%QT_DATADIR%%/modules/QGstreamerMediaPluginImplPrivate.json %%Q3D%%%%QT_DATADIR%%/modules/Quick3DSpatialAudioPrivate.json diff --git a/net/py-qt6-networkauth/Makefile b/net/py-qt6-networkauth/Makefile index a12de94a4bde..7a486a550fce 100644 --- a/net/py-qt6-networkauth/Makefile +++ b/net/py-qt6-networkauth/Makefile @@ -1,6 +1,5 @@ PORTNAME= networkauth DISTVERSION= ${PYQTNETWORKAUTH_VERSION} -PORTREVISION= 1 CATEGORIES= net devel python MASTER_SITES= ${MASTER_SITES_PYQTNETWORKAUTH} PKGNAMEPREFIX= ${PYQT_PY_RELNAME}- diff --git a/net/py-qt6-networkauth/distinfo b/net/py-qt6-networkauth/distinfo index e7358e253955..3a30021947df 100644 --- a/net/py-qt6-networkauth/distinfo +++ b/net/py-qt6-networkauth/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1714272075 -SHA256 (PyQt6_NetworkAuth-6.7.0.tar.gz) = 974983525437633a0f016c0ffa0dc311847089f253dfe6840b0ec8ce21dc8685 -SIZE (PyQt6_NetworkAuth-6.7.0.tar.gz) = 20275 +TIMESTAMP = 1733628655 +SHA256 (PyQt6_NetworkAuth-6.8.0.tar.gz) = 2a1043ff6d03fc19e7bc87fad4f32d4d7e56d2bf1bb89b2a43287c0161457d59 +SIZE (PyQt6_NetworkAuth-6.8.0.tar.gz) = 20739 diff --git a/net/py-qt6-networkauth/pkg-plist b/net/py-qt6-networkauth/pkg-plist index ab45331481d9..3bb7e6beee3c 100644 --- a/net/py-qt6-networkauth/pkg-plist +++ b/net/py-qt6-networkauth/pkg-plist @@ -9,6 +9,7 @@ %%PYQT_SIPDIR%%/QtNetworkAuth/qoauth2authorizationcodeflow.sip %%PYQT_SIPDIR%%/QtNetworkAuth/qoauthhttpserverreplyhandler.sip %%PYQT_SIPDIR%%/QtNetworkAuth/qoauthoobreplyhandler.sip +%%PYQT_SIPDIR%%/QtNetworkAuth/qoauthurischemereplyhandler.sip %%PYTHON_SITELIBDIR%%/PyQt6/QtNetworkAuth.abi%%PYTHON_MAJOR_VER%%.so %%PYTHON_SITELIBDIR%%/PyQt6_NetworkAuth-%%PYQTNETWORKAUTH_VERSION%%.dist-info/INSTALLER %%PYTHON_SITELIBDIR%%/PyQt6_NetworkAuth-%%PYQTNETWORKAUTH_VERSION%%.dist-info/METADATA diff --git a/net/qt6-coap/distinfo b/net/qt6-coap/distinfo index 59591234c0be..503ff225d4db 100644 --- a/net/qt6-coap/distinfo +++ b/net/qt6-coap/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1727500155 -SHA256 (KDE/Qt/6.7.3/qt-qtcoap-v6.7.3_GH0.tar.gz) = 28df360e970a46c1547c26399079434824d6fdd38fa513ebcbf28e6e369467b4 -SIZE (KDE/Qt/6.7.3/qt-qtcoap-v6.7.3_GH0.tar.gz) = 183928 +TIMESTAMP = 1733205479 +SHA256 (KDE/Qt/6.8.1/qt-qtcoap-v6.8.1_GH0.tar.gz) = 43dc5f9f4efaf0b4046b51bb1064055cecc0ef8f6e0ecfe59ef1693689da6ded +SIZE (KDE/Qt/6.8.1/qt-qtcoap-v6.8.1_GH0.tar.gz) = 186208 diff --git a/net/qt6-coap/pkg-plist b/net/qt6-coap/pkg-plist index d5bdd8f77102..e7aa731e0c42 100644 --- a/net/qt6-coap/pkg-plist +++ b/net/qt6-coap/pkg-plist @@ -46,6 +46,7 @@ lib/cmake/Qt6Coap/Qt6CoapConfigVersionImpl.cmake lib/cmake/Qt6Coap/Qt6CoapDependencies.cmake lib/cmake/Qt6Coap/Qt6CoapTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6Coap/Qt6CoapTargets.cmake +lib/cmake/Qt6Coap/Qt6CoapVersionlessAliasTargets.cmake lib/cmake/Qt6Coap/Qt6CoapVersionlessTargets.cmake %%QT_LIBDIR%%/libQt6Coap.prl %%QT_LIBDIR%%/libQt6Coap.so @@ -54,5 +55,6 @@ lib/cmake/Qt6Coap/Qt6CoapVersionlessTargets.cmake %%QT_LIBDIR%%/metatypes/qt6coap_%%CMAKE_BUILD_TYPE%%_metatypes.json %%QT_MKSPECDIR%%/modules/qt_lib_coap.pri %%QT_MKSPECDIR%%/modules/qt_lib_coap_private.pri +%%QT_SBOMDIR%%/qtcoap-%%FULLVER%%.spdx libdata/pkgconfig/Qt6Coap.pc %%QT_DATADIR%%/modules/Coap.json diff --git a/net/qt6-networkauth/Makefile b/net/qt6-networkauth/Makefile index 93ed08a99a12..1cb2f4847dc8 100644 --- a/net/qt6-networkauth/Makefile +++ b/net/qt6-networkauth/Makefile @@ -8,8 +8,9 @@ COMMENT= Qt6 Network authentication module BUILD_DEPENDS= ${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers -USES= cmake compiler:c++17-lang \ +USES= cmake gl compiler:c++17-lang \ qt-dist:6 +USE_GL= opengl USE_QT= base USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} diff --git a/net/qt6-networkauth/distinfo b/net/qt6-networkauth/distinfo index a907664de813..2ac2e3fdeb94 100644 --- a/net/qt6-networkauth/distinfo +++ b/net/qt6-networkauth/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1727500689 -SHA256 (KDE/Qt/6.7.3/qtnetworkauth-everywhere-src-6.7.3.tar.xz) = 6b9a75a5e8829c56f4cfcdd146082882896b87eda380996f9cc34936504a13b7 -SIZE (KDE/Qt/6.7.3/qtnetworkauth-everywhere-src-6.7.3.tar.xz) = 148772 +TIMESTAMP = 1733205481 +SHA256 (KDE/Qt/6.8.1/qtnetworkauth-everywhere-src-6.8.1.tar.xz) = 118664ba929c5fbbdf822438bd69bd43674cfee82e504e143da600fe47c74024 +SIZE (KDE/Qt/6.8.1/qtnetworkauth-everywhere-src-6.8.1.tar.xz) = 253260 diff --git a/net/qt6-networkauth/pkg-plist b/net/qt6-networkauth/pkg-plist index 2ebe8b8f2fe9..d64d01cd88f1 100644 --- a/net/qt6-networkauth/pkg-plist +++ b/net/qt6-networkauth/pkg-plist @@ -5,6 +5,8 @@ %%QT_INCDIR%%/QtNetworkAuth/%%FULLVER%%/QtNetworkAuth/private/qoauth1signature_p.h %%QT_INCDIR%%/QtNetworkAuth/%%FULLVER%%/QtNetworkAuth/private/qoauth2authorizationcodeflow_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 %%QT_INCDIR%%/QtNetworkAuth/QAbstractOAuth %%QT_INCDIR%%/QtNetworkAuth/QAbstractOAuth2 %%QT_INCDIR%%/QtNetworkAuth/QAbstractOAuthReplyHandler @@ -13,6 +15,7 @@ %%QT_INCDIR%%/QtNetworkAuth/QOAuth2AuthorizationCodeFlow %%QT_INCDIR%%/QtNetworkAuth/QOAuthHttpServerReplyHandler %%QT_INCDIR%%/QtNetworkAuth/QOAuthOobReplyHandler +%%QT_INCDIR%%/QtNetworkAuth/QOAuthUriSchemeReplyHandler %%QT_INCDIR%%/QtNetworkAuth/QtNetworkAuth %%QT_INCDIR%%/QtNetworkAuth/QtNetworkAuthDepends %%QT_INCDIR%%/QtNetworkAuth/QtNetworkAuthVersion @@ -25,6 +28,8 @@ %%QT_INCDIR%%/QtNetworkAuth/qoauthglobal.h %%QT_INCDIR%%/QtNetworkAuth/qoauthhttpserverreplyhandler.h %%QT_INCDIR%%/QtNetworkAuth/qoauthoobreplyhandler.h +%%QT_INCDIR%%/QtNetworkAuth/qoauthurischemereplyhandler.h +%%QT_INCDIR%%/QtNetworkAuth/qtnetworkauth-config.h %%QT_INCDIR%%/QtNetworkAuth/qtnetworkauthversion.h lib/cmake/Qt6BuildInternals/StandaloneTests/QtNetworkAuthTestsConfig.cmake lib/cmake/Qt6NetworkAuth/Qt6NetworkAuthAdditionalTargetInfo.cmake @@ -34,6 +39,7 @@ lib/cmake/Qt6NetworkAuth/Qt6NetworkAuthConfigVersionImpl.cmake lib/cmake/Qt6NetworkAuth/Qt6NetworkAuthDependencies.cmake lib/cmake/Qt6NetworkAuth/Qt6NetworkAuthTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6NetworkAuth/Qt6NetworkAuthTargets.cmake +lib/cmake/Qt6NetworkAuth/Qt6NetworkAuthVersionlessAliasTargets.cmake lib/cmake/Qt6NetworkAuth/Qt6NetworkAuthVersionlessTargets.cmake %%QT_LIBDIR%%/libQt6NetworkAuth.prl %%QT_LIBDIR%%/libQt6NetworkAuth.so @@ -42,5 +48,6 @@ lib/cmake/Qt6NetworkAuth/Qt6NetworkAuthVersionlessTargets.cmake %%QT_LIBDIR%%/metatypes/qt6networkauth_%%CMAKE_BUILD_TYPE%%_metatypes.json %%QT_MKSPECDIR%%/modules/qt_lib_networkauth.pri %%QT_MKSPECDIR%%/modules/qt_lib_networkauth_private.pri +%%QT_SBOMDIR%%/qtnetworkauth-%%FULLVER%%.spdx libdata/pkgconfig/Qt6NetworkAuth.pc %%QT_DATADIR%%/modules/NetworkAuth.json diff --git a/print/qt6-pdf/pkg-plist b/print/qt6-pdf/pkg-plist index 53ddfd7ffb0b..9c882631c25d 100644 --- a/print/qt6-pdf/pkg-plist +++ b/print/qt6-pdf/pkg-plist @@ -5,7 +5,6 @@ %%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/qtpdfexports_p.h %%QT_INCDIR%%/QtPdf/QPdfBookmarkModel %%QT_INCDIR%%/QtPdf/QPdfDocument %%QT_INCDIR%%/QtPdf/QPdfDocumentRenderOptions @@ -74,6 +73,7 @@ lib/cmake/Qt6Pdf/Qt6PdfConfigVersionImpl.cmake lib/cmake/Qt6Pdf/Qt6PdfDependencies.cmake 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/Qt6PdfQuick/Qt6PdfQuickAdditionalTargetInfo.cmake lib/cmake/Qt6PdfQuick/Qt6PdfQuickConfig.cmake @@ -82,6 +82,7 @@ lib/cmake/Qt6PdfQuick/Qt6PdfQuickConfigVersionImpl.cmake lib/cmake/Qt6PdfQuick/Qt6PdfQuickDependencies.cmake 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/Qt6PdfWidgets/Qt6PdfWidgetsAdditionalTargetInfo.cmake lib/cmake/Qt6PdfWidgets/Qt6PdfWidgetsConfig.cmake @@ -90,6 +91,7 @@ lib/cmake/Qt6PdfWidgets/Qt6PdfWidgetsConfigVersionImpl.cmake lib/cmake/Qt6PdfWidgets/Qt6PdfWidgetsDependencies.cmake 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/Qt6Qml/QmlPlugins/Qt6PdfQuickpluginAdditionalTargetInfo.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6PdfQuickpluginConfig.cmake diff --git a/science/qt6-quick3dphysics/distinfo b/science/qt6-quick3dphysics/distinfo index 691126328b77..7cbae5d63859 100644 --- a/science/qt6-quick3dphysics/distinfo +++ b/science/qt6-quick3dphysics/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1727500690 -SHA256 (KDE/Qt/6.7.3/qtquick3dphysics-everywhere-src-6.7.3.tar.xz) = b45dc48b3079270d42890b299c53bc1259ae80945a23242407f18a07be89d8f3 -SIZE (KDE/Qt/6.7.3/qtquick3dphysics-everywhere-src-6.7.3.tar.xz) = 4704352 +TIMESTAMP = 1733205485 +SHA256 (KDE/Qt/6.8.1/qtquick3dphysics-everywhere-src-6.8.1.tar.xz) = 652e8edb572f0322fb4ab221ed6f7205df5c045e47500990e3c7b748975f0a6e +SIZE (KDE/Qt/6.8.1/qtquick3dphysics-everywhere-src-6.8.1.tar.xz) = 4709588 diff --git a/science/qt6-quick3dphysics/pkg-plist b/science/qt6-quick3dphysics/pkg-plist index a021ba409d55..653fce7b1054 100644 --- a/science/qt6-quick3dphysics/pkg-plist +++ b/science/qt6-quick3dphysics/pkg-plist @@ -49,6 +49,7 @@ lib/cmake/Qt6BundledPhysX/Qt6BundledPhysXConfigVersion.cmake lib/cmake/Qt6BundledPhysX/Qt6BundledPhysXConfigVersionImpl.cmake lib/cmake/Qt6BundledPhysX/Qt6BundledPhysXTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6BundledPhysX/Qt6BundledPhysXTargets.cmake +lib/cmake/Qt6BundledPhysX/Qt6BundledPhysXVersionlessAliasTargets.cmake lib/cmake/Qt6BundledPhysX/Qt6BundledPhysXVersionlessTargets.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6qquick3dphysicspluginAdditionalTargetInfo.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6qquick3dphysicspluginConfig.cmake @@ -69,6 +70,7 @@ lib/cmake/Qt6Quick3DPhysics/Qt6Quick3DPhysicsConfigVersionImpl.cmake lib/cmake/Qt6Quick3DPhysics/Qt6Quick3DPhysicsDependencies.cmake lib/cmake/Qt6Quick3DPhysics/Qt6Quick3DPhysicsTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6Quick3DPhysics/Qt6Quick3DPhysicsTargets.cmake +lib/cmake/Qt6Quick3DPhysics/Qt6Quick3DPhysicsVersionlessAliasTargets.cmake lib/cmake/Qt6Quick3DPhysics/Qt6Quick3DPhysicsVersionlessTargets.cmake lib/cmake/Qt6Quick3DPhysicsHelpers/Qt6Quick3DPhysicsHelpersAdditionalTargetInfo.cmake lib/cmake/Qt6Quick3DPhysicsHelpers/Qt6Quick3DPhysicsHelpersConfig.cmake @@ -77,6 +79,7 @@ lib/cmake/Qt6Quick3DPhysicsHelpers/Qt6Quick3DPhysicsHelpersConfigVersionImpl.cma lib/cmake/Qt6Quick3DPhysicsHelpers/Qt6Quick3DPhysicsHelpersDependencies.cmake lib/cmake/Qt6Quick3DPhysicsHelpers/Qt6Quick3DPhysicsHelpersTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6Quick3DPhysicsHelpers/Qt6Quick3DPhysicsHelpersTargets.cmake +lib/cmake/Qt6Quick3DPhysicsHelpers/Qt6Quick3DPhysicsHelpersVersionlessAliasTargets.cmake lib/cmake/Qt6Quick3DPhysicsHelpers/Qt6Quick3DPhysicsHelpersVersionlessTargets.cmake %%QT_BINDIR%%/cooker %%QT_LIBDIR%%/libQt6BundledPhysX.a @@ -167,6 +170,7 @@ lib/cmake/Qt6Quick3DPhysicsHelpers/Qt6Quick3DPhysicsHelpersVersionlessTargets.cm %%QT_QMLDIR%%/QtQuick3D/Physics/libqquick3dphysicsplugin.so %%QT_QMLDIR%%/QtQuick3D/Physics/plugins.qmltypes %%QT_QMLDIR%%/QtQuick3D/Physics/qmldir +%%QT_SBOMDIR%%/qtquick3dphysics-%%FULLVER%%.spdx libdata/pkgconfig/Qt6Quick3DPhysics.pc libdata/pkgconfig/Qt6Quick3DPhysicsHelpers.pc %%QT_DATADIR%%/modules/Quick3DPhysics.json diff --git a/www/py-qt6-webengine/Makefile b/www/py-qt6-webengine/Makefile index 81ae168450ea..becd950af8ac 100644 --- a/www/py-qt6-webengine/Makefile +++ b/www/py-qt6-webengine/Makefile @@ -1,6 +1,5 @@ PORTNAME= webengine DISTVERSION= ${PYQTWEBENGINE_VERSION} -PORTREVISION= 1 CATEGORIES= www devel python MASTER_SITES= ${MASTER_SITES_PYQTWEBENGINE} PKGNAMEPREFIX= ${PYQT_PY_RELNAME}- diff --git a/www/py-qt6-webengine/distinfo b/www/py-qt6-webengine/distinfo index 4e4a1ee59e1d..62f51b9e53b2 100644 --- a/www/py-qt6-webengine/distinfo +++ b/www/py-qt6-webengine/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1714272046 -SHA256 (PyQt6_WebEngine-6.7.0.tar.gz) = 68edc7adb6d9e275f5de956881e79cca0d71fad439abeaa10d823bff5ac55001 -SIZE (PyQt6_WebEngine-6.7.0.tar.gz) = 32593 +TIMESTAMP = 1733628696 +SHA256 (PyQt6_WebEngine-6.8.0.tar.gz) = 64045ea622b6a41882c2b18f55ae9714b8660acff06a54e910eb72822c2f3ff2 +SIZE (PyQt6_WebEngine-6.8.0.tar.gz) = 34203 diff --git a/www/py-qt6-webengine/files/patch-pyproject.toml b/www/py-qt6-webengine/files/patch-pyproject.toml index eff2ee7441ae..5086e7490062 100644 --- a/www/py-qt6-webengine/files/patch-pyproject.toml +++ b/www/py-qt6-webengine/files/patch-pyproject.toml @@ -5,9 +5,9 @@ without CUPS support. #include ^~~~~~~~~~~~ ---- pyproject.toml.orig 2023-10-25 10:26:54 UTC +--- pyproject.toml.orig 2024-10-15 00:23:11 UTC +++ pyproject.toml -@@ -32,3 +32,5 @@ qmake-QT = ["webenginewidgets"] +@@ -34,3 +34,5 @@ qmake-QT = ["webenginewidgets"] [tool.sip.bindings.QtWebEngineWidgets] qmake-QT = ["webenginewidgets"] diff --git a/www/py-qt6-webengine/files/patch-sip_QtWebEngineCore_qwebengineframe.sip b/www/py-qt6-webengine/files/patch-sip_QtWebEngineCore_qwebengineframe.sip new file mode 100644 index 000000000000..313fd35b09bb --- /dev/null +++ b/www/py-qt6-webengine/files/patch-sip_QtWebEngineCore_qwebengineframe.sip @@ -0,0 +1,10 @@ +--- sip/QtWebEngineCore/qwebengineframe.sip.orig 2024-10-15 00:23:12 UTC ++++ sip/QtWebEngineCore/qwebengineframe.sip +@@ -25,6 +25,7 @@ class QWebEngineFrame /NoDefaultCtors/ + class QWebEngineFrame /NoDefaultCtors/ + { + %TypeHeaderCode ++#include + #include + %End + diff --git a/www/py-qt6-webengine/pkg-plist b/www/py-qt6-webengine/pkg-plist index d569bcec7b29..59dc8df6b257 100644 --- a/www/py-qt6-webengine/pkg-plist +++ b/www/py-qt6-webengine/pkg-plist @@ -5,12 +5,14 @@ %%PYQT_SIPDIR%%/QtWebEngineCore/qwebenginecertificateerror.sip %%PYQT_SIPDIR%%/QtWebEngineCore/qwebengineclientcertificateselection.sip %%PYQT_SIPDIR%%/QtWebEngineCore/qwebengineclientcertificatestore.sip +%%PYQT_SIPDIR%%/QtWebEngineCore/qwebengineclienthints.sip %%PYQT_SIPDIR%%/QtWebEngineCore/qwebenginecontextmenurequest.sip %%PYQT_SIPDIR%%/QtWebEngineCore/qwebenginecookiestore.sip %%PYQT_SIPDIR%%/QtWebEngineCore/qwebenginedesktopmediarequest.sip %%PYQT_SIPDIR%%/QtWebEngineCore/qwebenginedownloadrequest.sip %%PYQT_SIPDIR%%/QtWebEngineCore/qwebenginefilesystemaccessrequest.sip %%PYQT_SIPDIR%%/QtWebEngineCore/qwebenginefindtextresult.sip +%%PYQT_SIPDIR%%/QtWebEngineCore/qwebengineframe.sip %%PYQT_SIPDIR%%/QtWebEngineCore/qwebenginefullscreenrequest.sip %%PYQT_SIPDIR%%/QtWebEngineCore/qwebengineglobalsettings.sip %%PYQT_SIPDIR%%/QtWebEngineCore/qwebenginehistory.sip @@ -20,6 +22,7 @@ %%PYQT_SIPDIR%%/QtWebEngineCore/qwebenginenewwindowrequest.sip %%PYQT_SIPDIR%%/QtWebEngineCore/qwebenginenotification.sip %%PYQT_SIPDIR%%/QtWebEngineCore/qwebenginepage.sip +%%PYQT_SIPDIR%%/QtWebEngineCore/qwebenginepermission.sip %%PYQT_SIPDIR%%/QtWebEngineCore/qwebengineprofile.sip %%PYQT_SIPDIR%%/QtWebEngineCore/qwebenginequotarequest.sip %%PYQT_SIPDIR%%/QtWebEngineCore/qwebengineregisterprotocolhandlerrequest.sip diff --git a/www/qt6-httpserver/distinfo b/www/qt6-httpserver/distinfo index 341028e79940..2ca780dbdbd3 100644 --- a/www/qt6-httpserver/distinfo +++ b/www/qt6-httpserver/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1727500691 -SHA256 (KDE/Qt/6.7.3/qthttpserver-everywhere-src-6.7.3.tar.xz) = 7f2317c7e52b6b634a5be9a9c917066fb707b905ec618f047cc57b8093f4deff -SIZE (KDE/Qt/6.7.3/qthttpserver-everywhere-src-6.7.3.tar.xz) = 163692 +TIMESTAMP = 1733205487 +SHA256 (KDE/Qt/6.8.1/qthttpserver-everywhere-src-6.8.1.tar.xz) = 5d8cb90fddc359b1c74d1e344656785c418483b185d32d97c12d834ec39b0b27 +SIZE (KDE/Qt/6.8.1/qthttpserver-everywhere-src-6.8.1.tar.xz) = 183724 diff --git a/www/qt6-httpserver/pkg-plist b/www/qt6-httpserver/pkg-plist index 1d49dfa0a5c4..1ccfed5a1ac3 100644 --- a/www/qt6-httpserver/pkg-plist +++ b/www/qt6-httpserver/pkg-plist @@ -1,5 +1,7 @@ %%QT_INCDIR%%/QtHttpServer/%%FULLVER%%/QtHttpServer/private/qabstracthttpserver_p.h %%QT_INCDIR%%/QtHttpServer/%%FULLVER%%/QtHttpServer/private/qhttpserver_p.h +%%QT_INCDIR%%/QtHttpServer/%%FULLVER%%/QtHttpServer/private/qhttpserverhttp1protocolhandler_p.h +%%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/qhttpserverresponder_p.h @@ -9,13 +11,13 @@ %%QT_INCDIR%%/QtHttpServer/%%FULLVER%%/QtHttpServer/private/qhttpserverstream_p.h %%QT_INCDIR%%/QtHttpServer/QAbstractHttpServer %%QT_INCDIR%%/QtHttpServer/QHttpServer -%%QT_INCDIR%%/QtHttpServer/QHttpServerAfterRequestViewTraits %%QT_INCDIR%%/QtHttpServer/QHttpServerRequest %%QT_INCDIR%%/QtHttpServer/QHttpServerResponder %%QT_INCDIR%%/QtHttpServer/QHttpServerResponse %%QT_INCDIR%%/QtHttpServer/QHttpServerRouter %%QT_INCDIR%%/QtHttpServer/QHttpServerRouterRule %%QT_INCDIR%%/QtHttpServer/QHttpServerRouterViewTraits +%%QT_INCDIR%%/QtHttpServer/QHttpServerWebSocketUpgradeResponse %%QT_INCDIR%%/QtHttpServer/QtHttpServer %%QT_INCDIR%%/QtHttpServer/QtHttpServerDepends %%QT_INCDIR%%/QtHttpServer/QtHttpServerVersion @@ -27,8 +29,8 @@ %%QT_INCDIR%%/QtHttpServer/qhttpserverrouter.h %%QT_INCDIR%%/QtHttpServer/qhttpserverrouterrule.h %%QT_INCDIR%%/QtHttpServer/qhttpserverrouterviewtraits.h -%%QT_INCDIR%%/QtHttpServer/qhttpserverviewtraits.h %%QT_INCDIR%%/QtHttpServer/qhttpserverviewtraits_impl.h +%%QT_INCDIR%%/QtHttpServer/qhttpserverwebsocketupgraderesponse.h %%QT_INCDIR%%/QtHttpServer/qthttpserverexports.h %%QT_INCDIR%%/QtHttpServer/qthttpserverglobal.h %%QT_INCDIR%%/QtHttpServer/qthttpserverversion.h @@ -40,6 +42,7 @@ lib/cmake/Qt6HttpServer/Qt6HttpServerConfigVersionImpl.cmake lib/cmake/Qt6HttpServer/Qt6HttpServerDependencies.cmake lib/cmake/Qt6HttpServer/Qt6HttpServerTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6HttpServer/Qt6HttpServerTargets.cmake +lib/cmake/Qt6HttpServer/Qt6HttpServerVersionlessAliasTargets.cmake lib/cmake/Qt6HttpServer/Qt6HttpServerVersionlessTargets.cmake %%QT_LIBDIR%%/libQt6HttpServer.prl %%QT_LIBDIR%%/libQt6HttpServer.so @@ -48,5 +51,6 @@ lib/cmake/Qt6HttpServer/Qt6HttpServerVersionlessTargets.cmake %%QT_LIBDIR%%/metatypes/qt6httpserver_%%CMAKE_BUILD_TYPE%%_metatypes.json %%QT_MKSPECDIR%%/modules/qt_lib_httpserver.pri %%QT_MKSPECDIR%%/modules/qt_lib_httpserver_private.pri +%%QT_SBOMDIR%%/qthttpserver-%%FULLVER%%.spdx libdata/pkgconfig/Qt6HttpServer.pc %%QT_DATADIR%%/modules/HttpServer.json diff --git a/www/qt6-webchannel/distinfo b/www/qt6-webchannel/distinfo index b5ef7a803dbb..d66ef0cfdbf0 100644 --- a/www/qt6-webchannel/distinfo +++ b/www/qt6-webchannel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1727500692 -SHA256 (KDE/Qt/6.7.3/qtwebchannel-everywhere-src-6.7.3.tar.xz) = 15633fde6db09b3a06d46b5fd11221c915f1e49b8fb541f463966e17d25474b8 -SIZE (KDE/Qt/6.7.3/qtwebchannel-everywhere-src-6.7.3.tar.xz) = 206716 +TIMESTAMP = 1733205489 +SHA256 (KDE/Qt/6.8.1/qtwebchannel-everywhere-src-6.8.1.tar.xz) = 6b139f7f9128309e924da145023fa8ea87922bd79693392b3b2e4ba568a5763a +SIZE (KDE/Qt/6.8.1/qtwebchannel-everywhere-src-6.8.1.tar.xz) = 207412 diff --git a/www/qt6-webchannel/pkg-plist b/www/qt6-webchannel/pkg-plist index aa719f3ba65d..c306d39eaa88 100644 --- a/www/qt6-webchannel/pkg-plist +++ b/www/qt6-webchannel/pkg-plist @@ -34,6 +34,7 @@ lib/cmake/Qt6WebChannel/Qt6WebChannelConfigVersionImpl.cmake lib/cmake/Qt6WebChannel/Qt6WebChannelDependencies.cmake 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/Qt6WebChannelQuick/Qt6WebChannelQuickAdditionalTargetInfo.cmake lib/cmake/Qt6WebChannelQuick/Qt6WebChannelQuickConfig.cmake @@ -42,6 +43,7 @@ lib/cmake/Qt6WebChannelQuick/Qt6WebChannelQuickConfigVersionImpl.cmake lib/cmake/Qt6WebChannelQuick/Qt6WebChannelQuickDependencies.cmake lib/cmake/Qt6WebChannelQuick/Qt6WebChannelQuickTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6WebChannelQuick/Qt6WebChannelQuickTargets.cmake +lib/cmake/Qt6WebChannelQuick/Qt6WebChannelQuickVersionlessAliasTargets.cmake lib/cmake/Qt6WebChannelQuick/Qt6WebChannelQuickVersionlessTargets.cmake %%QT_LIBDIR%%/libQt6WebChannel.prl %%QT_LIBDIR%%/libQt6WebChannel.so @@ -60,6 +62,7 @@ lib/cmake/Qt6WebChannelQuick/Qt6WebChannelQuickVersionlessTargets.cmake %%QT_QMLDIR%%/QtWebChannel/libwebchannelquickplugin.so %%QT_QMLDIR%%/QtWebChannel/plugins.qmltypes %%QT_QMLDIR%%/QtWebChannel/qmldir +%%QT_SBOMDIR%%/qtwebchannel-%%FULLVER%%.spdx libdata/pkgconfig/Qt6WebChannel.pc libdata/pkgconfig/Qt6WebChannelQuick.pc %%QT_DATADIR%%/modules/WebChannel.json diff --git a/www/qt6-webengine/Makefile b/www/qt6-webengine/Makefile index 59ef4d840c56..e0e918a081bd 100644 --- a/www/qt6-webengine/Makefile +++ b/www/qt6-webengine/Makefile @@ -12,7 +12,7 @@ PORTNAME?= webengine DISTVERSION= ${QT6_VERSION} -PORTREVISION?= 3 # Master port for print/qt6-pdf. Please keep this line. +PORTREVISION?= 0 # Master port for print/qt6-pdf. Please keep this line. CATEGORIES?= www PKGNAMEPREFIX= qt6- @@ -23,9 +23,10 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib@${PY_FLAVOR} \ ${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers LIB_DEPENDS= libfreetype.so:print/freetype2 \ libnss3.so:security/nss \ + libopenjp2.so:graphics/openjpeg \ libxkbcommon.so:x11/libxkbcommon -USES= bison cmake compiler:c++17-lang gl gperf \ +USES= bison cmake compiler:c++20-lang gl gperf \ localbase:ldflags ninja:build nodejs:build,lts \ pkgconfig python:build qt-dist:6,webengine USE_GL= opengl @@ -37,11 +38,9 @@ CMAKE_ON= QT_FEATURE_webengine_system_ffmpeg \ QT_FEATURE_webengine_proprietary_codecs .if defined(BUILD_QTPDF) -LIB_DEPENDS+= libcups.so:print/cups \ - libopenjp2.so:graphics/openjpeg - CMAKE_ON+= QT_FEATURE_qtpdf_build -CMAKE_OFF+= QT_FEATURE_qtwebengine_build +CMAKE_OFF+= QT_FEATURE_qtwebengine_build \ + QT_GENERATE_SBOM SYS_LIBS= freetype .else @@ -54,6 +53,7 @@ LIB_DEPENDS+= libabsl_base.so:devel/abseil \ libexpat.so:textproc/expat2 \ libfontconfig.so:x11-fonts/fontconfig \ libharfbuzz.so:print/harfbuzz \ + liblcms2.so:graphics/lcms2 \ libnspr4.so:devel/nspr \ libopenh264.so:multimedia/openh264 \ libopus.so:audio/opus \ @@ -61,6 +61,7 @@ LIB_DEPENDS+= libabsl_base.so:devel/abseil \ libpng.so:graphics/png \ libre2.so:devel/re2 \ libsnappy.so:archivers/snappy \ + libtiff.so:graphics/tiff \ libvpx.so:multimedia/libvpx \ libwebp.so:graphics/webp @@ -101,8 +102,8 @@ DO_MAKE_BUILD= ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} -j1 $ BINARY_ALIAS= python3=${PYTHON_CMD} .if !defined(BUILD_QTPDF) -OPTIONS_DEFINE= CUPS DRIVER -OPTIONS_DEFAULT= ALSA CUPS DRIVER +OPTIONS_DEFINE= DRIVER PIPEWIRE +OPTIONS_DEFAULT= ALSA DRIVER PIPEWIRE OPTIONS_SINGLE= AUDIO OPTIONS_SINGLE_AUDIO= ALSA PULSEAUDIO SNDIO OPTIONS_SUB= yes @@ -116,17 +117,14 @@ ALSA_RUN_DEPENDS= alsa-plugins>=0:audio/alsa-plugins ALSA_CMAKE_ON= -DQT_FEATURE_webengine_system_alsa:BOOL=ON ALSA_CMAKE_OFF= -DQT_FEATURE_webengine_system_alsa:BOOL=OFF -CUPS_LIB_DEPENDS= libcups.so:print/cups \ - liblcms2.so:graphics/lcms2 \ - libopenjp2.so:graphics/openjpeg \ - libtiff.so:graphics/tiff -CUPS_CMAKE_ON= -DQT_FEATURE_webengine_printing_and_pdf:BOOL=ON -CUPS_CMAKE_OFF= -DQT_FEATURE_webengine_printing_and_pdf:BOOL=OFF - DRIVER_DESC= Install WebEngineDriver DRIVER_CMAKE_ON= -DQT_FEATURE_webenginedriver:BOOL=ON DRIVER_CMAKE_OFF= -DQT_FEATURE_webenginedriver:BOOL=OFF +PIPEWIRE_LIB_DEPENDS= libpipewire-0.3.so:multimedia/pipewire +PIPEWIRE_CMAKE_ON= -DQT_FEATURE_webengine_webrtc_pipewire:BOOL=ON +PIPEWIRE_CMAKE_OFF= -DQT_FEATURE_webengine_webrtc_pipewire:BOOL=OFF + PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_CMAKE_ON= -DQT_FEATURE_webengine_system_pulseaudio:BOOL=ON PULSEAUDIO_CMAKE_OFF= -DQT_FEATURE_webengine_system_pulseaudio:BOOL=OFF diff --git a/www/qt6-webengine/distinfo b/www/qt6-webengine/distinfo index 92fab2919ffd..e141d67205d9 100644 --- a/www/qt6-webengine/distinfo +++ b/www/qt6-webengine/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1727500696 -SHA256 (KDE/Qt/6.7.3/qtwebengine-everywhere-src-6.7.3.tar.xz) = c22b159cbb80dc569ce907ea26cc53687873f5e804dab142db54662589d846db -SIZE (KDE/Qt/6.7.3/qtwebengine-everywhere-src-6.7.3.tar.xz) = 550988288 +TIMESTAMP = 1733205732 +SHA256 (KDE/Qt/6.8.1/qtwebengine-everywhere-src-6.8.1.tar.xz) = 1ba8e03ac8edcf50ce830e49b63db983de22e96757452975c1d3e6d120ae91bc +SIZE (KDE/Qt/6.8.1/qtwebengine-everywhere-src-6.8.1.tar.xz) = 566480152 diff --git a/www/qt6-webengine/files/patch-cmake_Functions.cmake b/www/qt6-webengine/files/patch-cmake_Functions.cmake index e4c938996ef3..e158ced72b96 100644 --- a/www/qt6-webengine/files/patch-cmake_Functions.cmake +++ b/www/qt6-webengine/files/patch-cmake_Functions.cmake @@ -1,4 +1,4 @@ ---- cmake/Functions.cmake.orig 2024-02-10 00:27:53 UTC +--- cmake/Functions.cmake.orig 2024-10-02 15:40:01 UTC +++ cmake/Functions.cmake @@ -416,7 +416,7 @@ function(add_linker_options target buildDir completeSt set(libs_rsp "${buildDir}/${ninjaTarget}_libs.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") -@@ -675,6 +675,8 @@ function(get_gn_os result) +@@ -676,6 +676,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() -@@ -878,7 +880,7 @@ macro(append_build_type_setup) +@@ -879,7 +881,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 -@@ -932,7 +934,7 @@ macro(append_compiler_linker_sdk_setup) +@@ -939,7 +941,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 ) -@@ -970,7 +972,7 @@ macro(append_compiler_linker_sdk_setup) +@@ -977,7 +979,7 @@ macro(append_compiler_linker_sdk_setup) ) endif() get_gn_arch(cpu ${TEST_architecture_arch}) @@ -45,7 +45,7 @@ extend_gn_list_cflag(gnArgArg ARG arm_tune -@@ -1060,7 +1062,7 @@ macro(append_toolchain_setup) +@@ -1067,7 +1069,7 @@ macro(append_toolchain_setup) host_cpu="${cpu}" ) endif() @@ -54,7 +54,7 @@ get_gn_arch(cpu ${TEST_architecture_arch}) list(APPEND gnArgArg custom_toolchain="${buildDir}/target_toolchain:target" -@@ -1198,6 +1200,20 @@ function(add_gn_build_artifacts_to_target) +@@ -1205,6 +1207,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,7 +75,7 @@ if(QT_IS_MACOS_UNIVERSAL) add_intermediate_archive(${target} ${arg_BUILDDIR}/${config}/${arch} ${arg_COMPLETE_STATIC}) elseif(IOS) -@@ -1313,7 +1329,7 @@ function(check_for_ulimit) +@@ -1331,7 +1347,7 @@ function(check_for_ulimit) function(check_for_ulimit) message("-- Checking 'ulimit -n'") @@ -84,7 +84,7 @@ OUTPUT_VARIABLE ulimitOutput ) string(REGEX MATCHALL "[0-9]+" limit "${ulimitOutput}") -@@ -1322,7 +1338,7 @@ function(check_for_ulimit) +@@ -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 diff --git a/www/qt6-webengine/files/patch-configure.cmake b/www/qt6-webengine/files/patch-configure.cmake index 7fdd8b60d800..90d0ec130ed5 100644 --- a/www/qt6-webengine/files/patch-configure.cmake +++ b/www/qt6-webengine/files/patch-configure.cmake @@ -1,6 +1,6 @@ ---- configure.cmake.orig 2023-12-12 22:08:45 UTC +--- configure.cmake.orig 2024-11-21 04:36:37 UTC +++ configure.cmake -@@ -68,7 +68,7 @@ endif() +@@ -73,7 +73,7 @@ endif() endif() #### Tests @@ -9,16 +9,16 @@ check_for_ulimit() endif() -@@ -428,7 +428,7 @@ qt_feature("webengine-ozone-x11" PRIVATE +@@ -434,7 +434,7 @@ qt_feature("webengine-ozone-x11" PRIVATE qt_feature("webengine-ozone-x11" PRIVATE - LABEL "Support GLX on qpa-xcb" + LABEL "Support X11 on qpa-xcb" - CONDITION LINUX + CONDITION LINUX OR FREEBSD AND TARGET Qt::Gui AND QT_FEATURE_xcb AND X11_FOUND -@@ -465,12 +465,12 @@ add_check_for_support( +@@ -474,12 +474,12 @@ add_check_for_support( ) add_check_for_support( MODULES QtWebEngine @@ -33,7 +33,7 @@ MESSAGE "Build can be done only on Linux, Windows, macO, iOS and Android." ) if(LINUX AND CMAKE_CROSSCOMPILING) -@@ -492,13 +492,6 @@ add_check_for_support( +@@ -502,13 +502,6 @@ add_check_for_support( MESSAGE "node.js version 14 or later is required." ) add_check_for_support( @@ -46,8 +46,8 @@ -add_check_for_support( MODULES QtWebEngine QtPdf CONDITION Python3_EXECUTABLE - MESSAGE "Python version 3.6 or later is required." -@@ -576,8 +569,8 @@ add_check_for_support( + 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 @@ -58,7 +58,7 @@ (MACOS AND CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang") MESSAGE "${CMAKE_CXX_COMPILER_ID} compiler is not supported." -@@ -586,8 +579,8 @@ add_check_for_support( +@@ -582,8 +575,8 @@ add_check_for_support( add_check_for_support( MODULES QtPdf CONDITION MSVC OR diff --git a/www/qt6-webengine/files/patch-security-rollup b/www/qt6-webengine/files/patch-security-rollup deleted file mode 100644 index ee21cc53c094..000000000000 --- a/www/qt6-webengine/files/patch-security-rollup +++ /dev/null @@ -1,2884 +0,0 @@ -Security fixes applied to the 118-based branch [1] after Qt 6.7.3 release. - -Includes fixes between [2] and [3]. [4] has been redacted, since it disrupts -our main patches, is not a security fix, and only applies to iOS. - -[1] https://code.qt.io/cgit/qt/qtwebengine-chromium.git/log/chromium?h=118-based -[2] https://code.qt.io/cgit/qt/qtwebengine-chromium.git/commit/chromium?h=118-based&id=45bdfbd7721749beea9abd18467465e4c9026559 -[3] https://code.qt.io/cgit/qt/qtwebengine-chromium.git/commit/chromium?h=118-based&id=eb31082fcba2380e2cc5789aa707328050531e8d -[4] https://code.qt.io/cgit/qt/qtwebengine-chromium.git/commit/chromium?h=118-based&id=edb5aad8fc938acb291261ec123f5d25f615ddc7 - -diff --git a/chromium/base/mac/wrap_cg_display.h b/chromium/base/mac/wrap_cg_display.h -index a579ef1a900..8645627a3a1 100644 ---- src/3rdparty/chromium/base/mac/wrap_cg_display.h -+++ src/3rdparty/chromium/base/mac/wrap_cg_display.h -@@ -12,6 +12,11 @@ - - #include - -+// Build fix for macOS SDK 15 and newer -+#if !defined(CG_AVAILABLE_BUT_DEPRECATED) -+#define CG_AVAILABLE_BUT_DEPRECATED(a,b,c) -+#endif -+ - inline CGDisplayStreamRef __nullable wrapCGDisplayStreamCreate( - CGDirectDisplayID display, - size_t outputWidth, -diff --git a/chromium/base/metrics/field_trial.cc b/chromium/base/metrics/field_trial.cc -index 2b67eb59ba1..81243e649e8 100644 ---- src/3rdparty/chromium/base/metrics/field_trial.cc -+++ src/3rdparty/chromium/base/metrics/field_trial.cc -@@ -1020,7 +1020,7 @@ std::string FieldTrialList::SerializeSharedMemoryRegionMetadata( - // Tell the child process the name of the inherited HANDLE. - uintptr_t uintptr_handle = - reinterpret_cast(shm.GetPlatformHandle()); -- ss << uintptr_handle << ","; -+ ss << NumberToString(uintptr_handle) << ","; - if (launch_options->elevated) { - // Tell the child that it must open its parent and grab the handle. - ss << "p,"; -@@ -1061,8 +1061,8 @@ std::string FieldTrialList::SerializeSharedMemoryRegionMetadata( - #endif - - UnguessableToken guid = shm.GetGUID(); -- ss << guid.GetHighForSerialization() << "," << guid.GetLowForSerialization(); -- ss << "," << shm.GetSize(); -+ ss << NumberToString(guid.GetHighForSerialization()) << "," << NumberToString(guid.GetLowForSerialization()); -+ ss << "," << NumberToString(shm.GetSize()); - return ss.str(); - } - -diff --git a/chromium/base/trace_event/trace_event_etw_export_win.cc b/chromium/base/trace_event/trace_event_etw_export_win.cc -index 04e2ab0b350..26f6b168373 100644 ---- src/3rdparty/chromium/base/trace_event/trace_event_etw_export_win.cc -+++ src/3rdparty/chromium/base/trace_event/trace_event_etw_export_win.cc -@@ -426,8 +426,8 @@ bool TraceEventETWExport::IsCategoryGroupEnabled( - if (!instance->etw_provider_->IsEnabled()) - return false; - -- CStringTokenizer category_group_tokens(&*category_group_name.begin(), -- &*category_group_name.end(), ","); -+ CStringTokenizer category_group_tokens(category_group_name.data(), -+ category_group_name.data() + category_group_name.size(), ","); - while (category_group_tokens.GetNext()) { - StringPiece category_group_token = category_group_tokens.token_piece(); - if (instance->IsCategoryEnabled(category_group_token)) { -diff --git a/chromium/components/viz/service/gl/gpu_service_impl.cc b/chromium/components/viz/service/gl/gpu_service_impl.cc -index 0156b748c38..bed248728cc 100644 ---- src/3rdparty/chromium/components/viz/service/gl/gpu_service_impl.cc -+++ src/3rdparty/chromium/components/viz/service/gl/gpu_service_impl.cc -@@ -143,12 +143,6 @@ namespace viz { - - namespace { - --// Whether to crash the GPU service on context loss when running in-process with --// ANGLE. --BASE_FEATURE(kCrashOnInProcessANGLEContextLoss, -- "CrashOnInProcessANGLEContextLoss", -- base::FEATURE_DISABLED_BY_DEFAULT); -- - // The names emitted for GPU initialization trace events. - // This code may be removed after the following investigation: - // crbug.com/1350257 -@@ -671,16 +665,6 @@ void GpuServiceImpl::InitializeWithHost( - // initialized. - gl::DirectCompositionOverlayCapsMonitor::GetInstance()->AddObserver(this); - #endif -- -- if (in_host_process() && -- gpu_channel_manager_->use_passthrough_cmd_decoder()) { -- // Check `kCrashOnInProcessANGLEContextLoss` to ensure registration within -- // the experiment - the check done at the time of MaybeExitOnContextLost() -- // doesn't cause clients in the enabled arm to become registered in the -- // experiment due to it being followed by an immediate crash. -- [[maybe_unused]] bool unused = -- base::FeatureList::IsEnabled(kCrashOnInProcessANGLEContextLoss); -- } - } - - void GpuServiceImpl::Bind( -@@ -1063,24 +1047,6 @@ void GpuServiceImpl::MaybeExitOnContextLost( - DCHECK(main_runner_->BelongsToCurrentThread()); - - if (in_host_process()) { -- // When running with ANGLE, crash on a backend context loss if -- // `kCrashOnInProcessANGLEContextLoss` is enabled. This enables evaluation -- // of the hypothesis that as ANGLE is currently unable to recover from -- // context loss when running within Chrome, it is better to crash in this -- // case than enter into a loop of context loss events leading to undefined -- // behavior. Note that it *is* possible to recover from a context loss -- // event that was generated by Chrome rather than being due to an actual -- // backend context loss. In general, this is context losses where -- // `synthetic_loss is true - the one exception is if `context_lost_reason` -- // is `kMakeCurrentFailed`, which we regard as an unrecoverable context -- // loss even though `synthetic_loss` will be set to true. -- if (gpu_channel_manager_->use_passthrough_cmd_decoder() && -- (!synthetic_loss || -- context_lost_reason == gpu::error::kMakeCurrentFailed) && -- base::FeatureList::IsEnabled(kCrashOnInProcessANGLEContextLoss)) { -- CHECK(false); -- } -- - // We can't restart the GPU process when running in the host process; - // instead, just hope for recovery from the context loss. - return; -diff --git a/chromium/content/browser/file_system_access/file_system_access_directory_handle_impl.cc b/chromium/content/browser/file_system_access/file_system_access_directory_handle_impl.cc -index ec3216d5f92..bb3602f58b9 100644 ---- src/3rdparty/chromium/content/browser/file_system_access/file_system_access_directory_handle_impl.cc -+++ src/3rdparty/chromium/content/browser/file_system_access/file_system_access_directory_handle_impl.cc -@@ -54,32 +54,6 @@ using UserAction = FileSystemAccessPermissionContext::UserAction; - #endif - - namespace { --// Returns whether the specified extension receives special handling by the --// Windows shell. --bool IsShellIntegratedExtension(const base::FilePath::StringType& extension) { -- base::FilePath::StringType extension_lower = base::ToLowerASCII(extension); -- -- // .lnk and .scf files may be used to execute arbitrary code (see -- // https://nvd.nist.gov/vuln/detail/CVE-2010-2568 and -- // https://crbug.com/1227995, respectively). '.url' files can be used to read -- // arbitrary files (see https://crbug.com/1307930 and -- // https://crbug.com/1354518). -- if (extension_lower == FILE_PATH_LITERAL("lnk") || -- extension_lower == FILE_PATH_LITERAL("scf") || -- extension_lower == FILE_PATH_LITERAL("url")) { -- return true; -- } -- -- // Setting a file's extension to a CLSID may conceal its actual file type on -- // some Windows versions (see https://nvd.nist.gov/vuln/detail/CVE-2004-0420). -- if (!extension_lower.empty() && -- (extension_lower.front() == FILE_PATH_LITERAL('{')) && -- (extension_lower.back() == FILE_PATH_LITERAL('}'))) { -- return true; -- } -- return false; --} -- - #if BUILDFLAG(IS_POSIX) - base::FilePath ReadSymbolicLink(const base::FilePath& path) { - DCHECK(!path.empty()); -@@ -710,80 +684,13 @@ void FileSystemAccessDirectoryHandleImpl::AllEntriesReady( - file_system_access_error::Ok(), std::move(entries), has_more_entries); - } - --// static --bool FileSystemAccessDirectoryHandleImpl::IsSafePathComponent( -- const std::string& name) { -- // This method is similar to net::IsSafePortablePathComponent, with a few -- // notable differences where the net version does not consider names safe -- // while here we do want to allow them. These cases are: -- // - Names starting with a '.'. These would be hidden files in most file -- // managers, but are something we explicitly want to support for the -- // File System Access API, for names like .git. -- // - Names that end in '.local'. For downloads writing to such files is -- // dangerous since it might modify what code is executed when an executable -- // is ran from the same directory. For the File System Access API this -- // isn't really a problem though, since if a website can write to a .local -- // file via a FileSystemDirectoryHandle they can also just modify the -- // executables in the directory directly. -- // -- // TODO(https://crbug.com/1154757): Unify this with -- // net::IsSafePortablePathComponent, with the result probably ending up in -- // base/i18n/file_util_icu.h. -- -- const base::FilePath component = storage::StringToFilePath(name); -- // Empty names, or names that contain path separators are invalid. -- if (component.empty() || component != component.BaseName() || -- component != component.StripTrailingSeparators()) { -- return false; -- } -- -- std::u16string component16; --#if BUILDFLAG(IS_WIN) -- component16.assign(component.value().begin(), component.value().end()); --#else -- std::string component8 = component.AsUTF8Unsafe(); -- if (!base::UTF8ToUTF16(component8.c_str(), component8.size(), &component16)) { -- return false; -- } --#endif -- // base::i18n::IsFilenameLegal blocks names that start with '.', so strip out -- // a leading '.' before passing it to that method. -- // TODO(mek): Consider making IsFilenameLegal more flexible to support this -- // use case. -- if (component16[0] == '.') { -- component16 = component16.substr(1); -- } -- if (!base::i18n::IsFilenameLegal(component16)) { -- return false; -- } -- -- base::FilePath::StringType extension = component.Extension(); -- if (!extension.empty()) { -- extension.erase(extension.begin()); // Erase preceding '.'. -- } -- if (IsShellIntegratedExtension(extension)) { -- return false; -- } -- -- if (base::TrimString(component.value(), FILE_PATH_LITERAL("."), -- base::TRIM_TRAILING) != component.value()) { -- return false; -- } -- -- if (net::IsReservedNameOnWindows(component.value())) { -- return false; -- } -- -- return true; --} -- - blink::mojom::FileSystemAccessErrorPtr - FileSystemAccessDirectoryHandleImpl::GetChildURL( - const std::string& basename, - storage::FileSystemURL* result) { - DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); - -- if (!IsSafePathComponent(basename)) { -+ if (!manager()->IsSafePathComponent(basename)) { - return file_system_access_error::FromStatus( - FileSystemAccessStatus::kInvalidArgument, "Name is not allowed."); - } -diff --git a/chromium/content/browser/file_system_access/file_system_access_directory_handle_impl.h b/chromium/content/browser/file_system_access/file_system_access_directory_handle_impl.h -index 7bbec9a39d9..98452fc1f56 100644 ---- src/3rdparty/chromium/content/browser/file_system_access/file_system_access_directory_handle_impl.h -+++ src/3rdparty/chromium/content/browser/file_system_access/file_system_access_directory_handle_impl.h -@@ -84,14 +84,6 @@ class CONTENT_EXPORT FileSystemAccessDirectoryHandleImpl - const std::string& basename, - storage::FileSystemURL* result); - -- // The File System Access API should not give access to files that might -- // trigger special handling from the operating system. This method is used to -- // validate that all paths passed to GetFileHandle/GetDirectoryHandle are safe -- // to be exposed to the web. -- // TODO(https://crbug.com/1154757): Merge this with -- // net::IsSafePortablePathComponent. -- static bool IsSafePathComponent(const std::string& name); -- - private: - // This method creates the file if it does not currently exists. I.e. it is - // the implementation for passing create=true to GetFile. -diff --git a/chromium/content/browser/file_system_access/file_system_access_handle_base.cc b/chromium/content/browser/file_system_access/file_system_access_handle_base.cc -index 5792ad95e45..44891c0b75c 100644 ---- src/3rdparty/chromium/content/browser/file_system_access/file_system_access_handle_base.cc -+++ src/3rdparty/chromium/content/browser/file_system_access/file_system_access_handle_base.cc -@@ -217,7 +217,7 @@ void FileSystemAccessHandleBase::DoMove( - } - } - -- if (!FileSystemAccessDirectoryHandleImpl::IsSafePathComponent( -+ if (!manager()->IsSafePathComponent( - new_entry_name)) { - std::move(callback).Run(file_system_access_error::FromStatus( - blink::mojom::FileSystemAccessStatus::kInvalidArgument)); -@@ -250,7 +250,7 @@ void FileSystemAccessHandleBase::DoRename( - } - } - -- if (!FileSystemAccessDirectoryHandleImpl::IsSafePathComponent( -+ if (!manager()->IsSafePathComponent( - new_entry_name)) { - std::move(callback).Run(file_system_access_error::FromStatus( - blink::mojom::FileSystemAccessStatus::kInvalidArgument)); -diff --git a/chromium/content/browser/file_system_access/file_system_access_manager_impl.cc b/chromium/content/browser/file_system_access/file_system_access_manager_impl.cc -index faa3f12e452..c0d16224f11 100644 ---- src/3rdparty/chromium/content/browser/file_system_access/file_system_access_manager_impl.cc -+++ src/3rdparty/chromium/content/browser/file_system_access/file_system_access_manager_impl.cc -@@ -15,9 +15,11 @@ - #include "base/functional/bind.h" - #include "base/functional/callback_forward.h" - #include "base/functional/callback_helpers.h" -+#include "base/i18n/file_util_icu.h" - #include "base/notreached.h" - #include "base/ranges/algorithm.h" - #include "base/strings/string_util.h" -+#include "base/strings/utf_string_conversions.h" - #include "base/task/sequenced_task_runner.h" - #include "base/task/task_traits.h" - #include "base/task/thread_pool.h" -@@ -296,6 +298,32 @@ void DidCheckIfDefaultDirectoryExists( - } - } - -+// Returns whether the specified extension receives special handling by the -+// Windows shell. -+bool IsShellIntegratedExtension(const base::FilePath::StringType& extension) { -+ base::FilePath::StringType extension_lower = base::ToLowerASCII(extension); -+ -+ // .lnk and .scf files may be used to execute arbitrary code (see -+ // https://nvd.nist.gov/vuln/detail/CVE-2010-2568 and -+ // https://crbug.com/1227995, respectively). '.url' files can be used to read -+ // arbitrary files (see https://crbug.com/1307930 and -+ // https://crbug.com/1354518). -+ if (extension_lower == FILE_PATH_LITERAL("lnk") || -+ extension_lower == FILE_PATH_LITERAL("scf") || -+ extension_lower == FILE_PATH_LITERAL("url")) { -+ return true; -+ } -+ -+ // Setting a file's extension to a CLSID may conceal its actual file type on -+ // some Windows versions (see https://nvd.nist.gov/vuln/detail/CVE-2004-0420). -+ if (!extension_lower.empty() && -+ (extension_lower.front() == FILE_PATH_LITERAL('{')) && -+ (extension_lower.back() == FILE_PATH_LITERAL('}'))) { -+ return true; -+ } -+ return false; -+} -+ - } // namespace - - FileSystemAccessManagerImpl::SharedHandleState::SharedHandleState( -@@ -1749,4 +1777,69 @@ FileSystemAccessManagerImpl::AsWeakPtr() { - return weak_factory_.GetWeakPtr(); - } - -+bool FileSystemAccessManagerImpl::IsSafePathComponent( -+ const std::string& name) { -+ // This method is similar to net::IsSafePortablePathComponent, with a few -+ // notable differences where the net version does not consider names safe -+ // while here we do want to allow them. These cases are: -+ // - Names starting with a '.'. These would be hidden files in most file -+ // managers, but are something we explicitly want to support for the -+ // File System Access API, for names like .git. -+ // - Names that end in '.local'. For downloads writing to such files is -+ // dangerous since it might modify what code is executed when an executable -+ // is ran from the same directory. For the File System Access API this -+ // isn't really a problem though, since if a website can write to a .local -+ // file via a FileSystemDirectoryHandle they can also just modify the -+ // -+ // TODO(crbug.com/40159607): Unify this with -+ // net::IsSafePortablePathComponent, with the result probably ending up in -+ // base/i18n/file_util_icu.h. -+ -+ const base::FilePath component = storage::StringToFilePath(name); -+ // Empty names, or names that contain path separators are invalid. -+ if (component.empty() || component != component.BaseName() || -+ component != component.StripTrailingSeparators()) { -+ return false; -+ } -+ -+ std::u16string component16; -+#if BUILDFLAG(IS_WIN) -+ component16.assign(component.value().begin(), component.value().end()); -+#else -+ std::string component8 = component.AsUTF8Unsafe(); -+ if (!base::UTF8ToUTF16(component8.c_str(), component8.size(), &component16)) { -+ return false; -+ } -+#endif -+ // base::i18n::IsFilenameLegal blocks names that start with '.', so strip out -+ // a leading '.' before passing it to that method. -+ // TODO(mek): Consider making IsFilenameLegal more flexible to support this -+ // use case. -+ if (component16[0] == '.') { -+ component16 = component16.substr(1); -+ } -+ if (!base::i18n::IsFilenameLegal(component16)) { -+ return false; -+ } -+ -+ base::FilePath::StringType extension = component.Extension(); -+ if (!extension.empty()) { -+ extension.erase(extension.begin()); // Erase preceding '.'. -+ } -+ if (IsShellIntegratedExtension(extension)) { -+ return false; -+ } -+ -+ if (base::TrimString(component.value(), FILE_PATH_LITERAL("."), -+ base::TRIM_TRAILING) != component.value()) { -+ return false; -+ } -+ -+ if (net::IsReservedNameOnWindows(component.value())) { -+ return false; -+ } -+ -+ return true; -+} -+ - } // namespace content -diff --git a/chromium/content/browser/file_system_access/file_system_access_manager_impl.h b/chromium/content/browser/file_system_access/file_system_access_manager_impl.h -index 2b6828054b7..eeda10526b8 100644 ---- src/3rdparty/chromium/content/browser/file_system_access/file_system_access_manager_impl.h -+++ src/3rdparty/chromium/content/browser/file_system_access/file_system_access_manager_impl.h -@@ -359,6 +359,14 @@ class CONTENT_EXPORT FileSystemAccessManagerImpl - - void Shutdown(); - -+ // The File System Access API should not give access to files that might -+ // trigger special handling from the operating system. This method is used to -+ // validate that all paths passed to GetFileHandle/GetDirectoryHandle are safe -+ // to be exposed to the web. -+ // TODO(crbug.com/40159607): Merge this with -+ // net::IsSafePortablePathComponent. -+ bool IsSafePathComponent(const std::string& name); -+ - // Invokes `method` on the correct sequence on the FileSystemOperationRunner, - // passing `args` and a callback to the method. - // The passed in `callback` is wrapped to make sure it is called on the -diff --git a/chromium/content/browser/renderer_host/cross_process_frame_connector.cc b/chromium/content/browser/renderer_host/cross_process_frame_connector.cc -index 00eb0fb1348..2944d939029 100644 ---- src/3rdparty/chromium/content/browser/renderer_host/cross_process_frame_connector.cc -+++ src/3rdparty/chromium/content/browser/renderer_host/cross_process_frame_connector.cc -@@ -60,10 +60,11 @@ CrossProcessFrameConnector::~CrossProcessFrameConnector() { - } - - // Notify the view of this object being destroyed, if the view still exists. -- SetView(nullptr); -+ SetView(nullptr, /*allow_paint_holding=*/false); - } - --void CrossProcessFrameConnector::SetView(RenderWidgetHostViewChildFrame* view) { -+void CrossProcessFrameConnector::SetView(RenderWidgetHostViewChildFrame* view, -+ bool allow_paint_holding) { - // Detach ourselves from the previous |view_|. - if (view_) { - RenderWidgetHostViewBase* root_view = GetRootRenderWidgetHostView(); -@@ -110,7 +111,7 @@ void CrossProcessFrameConnector::SetView(RenderWidgetHostViewChildFrame* view) { - if (frame_proxy_in_parent_renderer_ && - frame_proxy_in_parent_renderer_->is_render_frame_proxy_live()) { - frame_proxy_in_parent_renderer_->GetAssociatedRemoteFrame() -- ->SetFrameSinkId(view_->GetFrameSinkId()); -+ ->SetFrameSinkId(view_->GetFrameSinkId(), allow_paint_holding); - } - } - } -diff --git a/chromium/content/browser/renderer_host/cross_process_frame_connector.h b/chromium/content/browser/renderer_host/cross_process_frame_connector.h -index 05ecb60aebe..4436cd1fba7 100644 ---- src/3rdparty/chromium/content/browser/renderer_host/cross_process_frame_connector.h -+++ src/3rdparty/chromium/content/browser/renderer_host/cross_process_frame_connector.h -@@ -100,7 +100,7 @@ class CONTENT_EXPORT CrossProcessFrameConnector { - // above. - RenderWidgetHostViewChildFrame* get_view_for_testing() { return view_; } - -- void SetView(RenderWidgetHostViewChildFrame* view); -+ void SetView(RenderWidgetHostViewChildFrame* view, bool allow_paint_holding); - - // Returns the parent RenderWidgetHostView or nullptr if it doesn't have one. - virtual RenderWidgetHostViewBase* GetParentRenderWidgetHostView(); -diff --git a/chromium/content/browser/renderer_host/delegated_frame_host.cc b/chromium/content/browser/renderer_host/delegated_frame_host.cc -index 3ea56e0e536..499a23b5209 100644 ---- src/3rdparty/chromium/content/browser/renderer_host/delegated_frame_host.cc -+++ src/3rdparty/chromium/content/browser/renderer_host/delegated_frame_host.cc -@@ -503,7 +503,10 @@ void DelegatedFrameHost::ContinueDelegatedFrameEviction( - // preventing the FrameTree from being traversed. This could happen during - // navigation involving BFCache. This should not occur with - // features::kEvictSubtree. -- DCHECK(!surface_ids.empty() || -+ // We do allow the surface ids to be empty if we -+ // don't have a local surface id, since that means we don't have memory -+ // allocated in viz. -+ DCHECK(!surface_ids.empty() || !local_surface_id_.is_valid() || - !base::FeatureList::IsEnabled(features::kEvictSubtree)); - if (!surface_ids.empty()) { - DCHECK(host_frame_sink_manager_); -diff --git a/chromium/content/browser/renderer_host/navigation_controller_impl.cc b/chromium/content/browser/renderer_host/navigation_controller_impl.cc -index db818eb83e9..084fd00eeae 100644 ---- src/3rdparty/chromium/content/browser/renderer_host/navigation_controller_impl.cc -+++ src/3rdparty/chromium/content/browser/renderer_host/navigation_controller_impl.cc -@@ -1826,6 +1826,7 @@ void NavigationControllerImpl::UpdateNavigationEntryDetails( - params.method, params.post_id, nullptr /* blob_url_loader_factory */, - ComputePolicyContainerPoliciesForFrameEntry( - rfh, request && request->IsSameDocument(), -+ request ? request->DidEncounterError() : false, - request ? request->common_params().url : params.url)); - - if (rfh->GetParent()) { -@@ -2288,6 +2289,7 @@ void NavigationControllerImpl::RendererDidNavigateNewSubframe( - } - std::unique_ptr policy_container_policies = - ComputePolicyContainerPoliciesForFrameEntry(rfh, is_same_document, -+ request->DidEncounterError(), - request->GetURL()); - bool protect_url_in_navigation_api = false; - if (is_same_document) { -@@ -4474,7 +4476,14 @@ std::unique_ptr - NavigationControllerImpl::ComputePolicyContainerPoliciesForFrameEntry( - RenderFrameHostImpl* rfh, - bool is_same_document, -+ bool navigation_encountered_error, - const GURL& url) { -+ if (navigation_encountered_error) { -+ // We should never reload the policy container of an error page from -+ // history, see https://crbug.com/364773822. -+ return nullptr; -+ } -+ - if (is_same_document) { - DCHECK(GetLastCommittedEntry()); - FrameNavigationEntry* previous_frame_entry = -diff --git a/chromium/content/browser/renderer_host/navigation_controller_impl.h b/chromium/content/browser/renderer_host/navigation_controller_impl.h -index ba9be480a81..987963d4bf4 100644 ---- src/3rdparty/chromium/content/browser/renderer_host/navigation_controller_impl.h -+++ src/3rdparty/chromium/content/browser/renderer_host/navigation_controller_impl.h -@@ -835,6 +835,7 @@ class CONTENT_EXPORT NavigationControllerImpl : public NavigationController { - std::unique_ptr - ComputePolicyContainerPoliciesForFrameEntry(RenderFrameHostImpl* rfh, - bool is_same_document, -+ bool navigation_encountered_error, - const GURL& url); - - // Adds details from a committed navigation to `entry` and the -diff --git a/chromium/content/browser/renderer_host/navigator.cc b/chromium/content/browser/renderer_host/navigator.cc -index e4cdb82d559..fd5e2eb26c3 100644 ---- src/3rdparty/chromium/content/browser/renderer_host/navigator.cc -+++ src/3rdparty/chromium/content/browser/renderer_host/navigator.cc -@@ -32,6 +32,7 @@ - #include "content/browser/web_package/prefetched_signed_exchange_cache.h" - #include "content/browser/webui/web_ui_controller_factory_registry.h" - #include "content/browser/webui/web_ui_impl.h" -+#include "content/common/features.h" - #include "content/common/navigation_params_utils.h" - #include "content/public/browser/browser_context.h" - #include "content/public/browser/content_browser_client.h" -@@ -516,17 +517,56 @@ void Navigator::DidNavigate( - // Store this information before DidNavigateFrame() potentially swaps RFHs. - url::Origin old_frame_origin = old_frame_host->GetLastCommittedOrigin(); - -+ // RenderFrameHostImpl::DidNavigate will update the url, and may cause the -+ // node to consider itself no longer on the initial empty document. Record -+ // whether we're leaving the initial empty document before that. -+ bool was_on_initial_empty_document = -+ frame_tree_node->is_on_initial_empty_document(); -+ -+ // Allow main frame paint holding in the following cases: -+ // - We don't have an animated transition. See crbug.com/360844863. -+ // - At least one of the following conditions is true: -+ // - This is a navigation from the initial document. This part helps with -+ // tests. See crbug.com/367623929. -+ // - This is a same origin navigation (or we're not limiting cross-origin -+ // paint holding) -+ // - There is a user activation. This means that the user interacted with -+ // the page. Commonly used attacks are done without user activation -- -+ // which will not enable paint holding. However, if the user interacts -+ // with the page, we treat it as a valid case for paint holding. -+ // - The client allows non-activated cross origin paintholding, which is -+ // currently the case with webview. -+ // -+ // See https://issues.chromium.org/40942531 for reasons we limit paint -+ // holding. -+ ContentBrowserClient* client = GetContentClient()->browser(); -+ const bool allow_main_frame_paint_holding = -+ (was_on_initial_empty_document || -+ old_frame_origin.IsSameOriginWith(params.origin) || -+ old_frame_host->HasStickyUserActivation() || -+ client->AllowNonActivatedCrossOriginPaintHolding() || -+ !base::FeatureList::IsEnabled( -+ kLimitCrossOriginNonActivatedPaintHolding)); -+ -+ // Only allow subframe paint holding for same origin. -+ const bool allow_subframe_paint_holding = -+ old_frame_origin.IsSameOriginWith(params.origin); -+ - // DidNavigateFrame() must be called before replicating the new origin and - // other properties to proxies. This is because it destroys the subframes of - // the frame we're navigating from, which might trigger those subframes to - // run unload handlers. Those unload handlers should still see the old - // frame's origin. See https://crbug.com/825283. -+ const bool allow_paint_holding = frame_tree_node->IsMainFrame() -+ ? allow_main_frame_paint_holding -+ : allow_subframe_paint_holding; -+ - frame_tree_node->render_manager()->DidNavigateFrame( - render_frame_host, navigation_request->common_params().has_user_gesture, - was_within_same_document, - navigation_request->browsing_context_group_swap() - .ShouldClearProxiesOnCommit(), -- navigation_request->commit_params().frame_policy); -+ navigation_request->commit_params().frame_policy, allow_paint_holding); - - // The main frame, same site, and cross-site navigation checks for user - // activation mirror the checks in DocumentLoader::CommitNavigation() (note: -@@ -593,12 +633,6 @@ void Navigator::DidNavigate( - render_frame_host->GetPage().SetContentsMimeType(params.contents_mime_type); - } - -- // RenderFrameHostImpl::DidNavigate will update the url, and may cause the -- // node to consider itself no longer on the initial empty document. Record -- // whether we're leaving the initial empty document before that. -- bool was_on_initial_empty_document = -- frame_tree_node->is_on_initial_empty_document(); -- - render_frame_host->DidNavigate(params, navigation_request.get(), - was_within_same_document); - -diff --git a/chromium/content/browser/renderer_host/render_frame_host_impl.cc b/chromium/content/browser/renderer_host/render_frame_host_impl.cc -index d1d0efb398b..a45f586a3c4 100644 ---- src/3rdparty/chromium/content/browser/renderer_host/render_frame_host_impl.cc -+++ src/3rdparty/chromium/content/browser/renderer_host/render_frame_host_impl.cc -@@ -8546,7 +8546,8 @@ void RenderFrameHostImpl::AdoptPortal( - ->render_manager() - ->GetRenderWidgetHostView() - ->GetFrameSinkId(); -- proxy_host->GetAssociatedRemoteFrame()->SetFrameSinkId(frame_sink_id); -+ // generally disallow paint holding for security reasons -+ proxy_host->GetAssociatedRemoteFrame()->SetFrameSinkId(frame_sink_id, /*allow_paint_holding*/ false); - - std::move(callback).Run( - proxy_host->frame_tree_node()->current_replication_state().Clone(), -diff --git a/chromium/content/browser/renderer_host/render_frame_host_manager.cc b/chromium/content/browser/renderer_host/render_frame_host_manager.cc -index 9f5cddd99a0..91114140ea4 100644 ---- src/3rdparty/chromium/content/browser/renderer_host/render_frame_host_manager.cc -+++ src/3rdparty/chromium/content/browser/renderer_host/render_frame_host_manager.cc -@@ -731,10 +731,11 @@ void RenderFrameHostManager::DidNavigateFrame( - bool was_caused_by_user_gesture, - bool is_same_document_navigation, - bool clear_proxies_on_commit, -- const blink::FramePolicy& frame_policy) { -+ const blink::FramePolicy& frame_policy, -+ bool allow_paint_holding) { - CommitPendingIfNecessary(render_frame_host, was_caused_by_user_gesture, -- is_same_document_navigation, -- clear_proxies_on_commit); -+ is_same_document_navigation, clear_proxies_on_commit, -+ allow_paint_holding); - - // Make sure any dynamic changes to this frame's sandbox flags and permissions - // policy that were made prior to navigation take effect. This should only -@@ -770,7 +771,8 @@ void RenderFrameHostManager::CommitPendingIfNecessary( - RenderFrameHostImpl* render_frame_host, - bool was_caused_by_user_gesture, - bool is_same_document_navigation, -- bool clear_proxies_on_commit) { -+ bool clear_proxies_on_commit, -+ bool allow_paint_holding) { - if (!speculative_render_frame_host_) { - // There's no speculative RenderFrameHost so it must be that the current - // RenderFrameHost completed a navigation. -@@ -784,7 +786,8 @@ void RenderFrameHostManager::CommitPendingIfNecessary( - if (render_frame_host == speculative_render_frame_host_.get()) { - // A cross-RenderFrameHost navigation completed, so show the new renderer. - CommitPending(std::move(speculative_render_frame_host_), -- std::move(stored_page_to_restore_), clear_proxies_on_commit); -+ std::move(stored_page_to_restore_), clear_proxies_on_commit, -+ allow_paint_holding); - - if (GetNavigationQueueingFeatureLevel() >= - NavigationQueueingFeatureLevel::kAvoidRedundantCancellations) { -@@ -841,9 +844,26 @@ void RenderFrameHostManager::CommitPendingIfNecessary( - // output on prerender activation. - if (render_frame_host_->lifecycle_state() != - LifecycleStateImpl::kPrerendering) { -- static_cast( -- render_frame_host_->GetView()->GetRenderWidgetHost()) -- ->StartNewContentRenderingTimeout(); -+ auto* rwhi = static_cast( -+ render_frame_host_->GetView()->GetRenderWidgetHost()); -+ -+ rwhi->StartNewContentRenderingTimeout(); -+ // Force the timer to expire immediately if we don't allow main frame -+ // paint holding. -+ if (frame_tree_node_->IsMainFrame() && !allow_paint_holding) { -+ // We post task here, since this evicts a surface but the embedding of a -+ // new surface would be done in the same stack as this call. The -+ // ordering of whether the new surface has or has not yet been embedded -+ // differs for different platforms, and we always want the new surface -+ // to be embedded before we evict. Hence, we post a task. In practice -+ // this still disables paint holding unless this task is delayed for a -+ // long time. -+ GetUIThreadTaskRunner({})->PostTask( -+ FROM_HERE, -+ base::BindOnce( -+ &RenderWidgetHostImpl::ForceFirstFrameAfterNavigationTimeout, -+ rwhi->GetWeakPtr())); -+ } - } - } - -@@ -1467,7 +1487,8 @@ void RenderFrameHostManager::PerformEarlyRenderFrameHostSwapIfNeeded( - - CommitPending( - std::move(speculative_render_frame_host_), nullptr, -- request->browsing_context_group_swap().ShouldClearProxiesOnCommit()); -+ request->browsing_context_group_swap().ShouldClearProxiesOnCommit(), -+ /* allow_paint_holding */ false); - request->SetAssociatedRFHType( - NavigationRequest::AssociatedRenderFrameHostType::CURRENT); - -@@ -4028,7 +4049,8 @@ void RenderFrameHostManager::SetRWHViewForInnerFrameTree( - RenderWidgetHostViewChildFrame* child_rwhv) { - DCHECK(IsMainFrameForInnerDelegate()); - DCHECK(GetProxyToOuterDelegate()); -- GetProxyToOuterDelegate()->SetChildRWHView(child_rwhv, nullptr); -+ GetProxyToOuterDelegate()->SetChildRWHView(child_rwhv, nullptr, -+ /*allow_paint_holding=*/false); - } - - bool RenderFrameHostManager::InitRenderView( -@@ -4340,7 +4362,8 @@ RenderFrameHostManager::GetFrameTokenForSiteInstanceGroup( - void RenderFrameHostManager::CommitPending( - std::unique_ptr pending_rfh, - std::unique_ptr pending_stored_page, -- bool clear_proxies_on_commit) { -+ bool clear_proxies_on_commit, -+ bool allow_paint_holding) { - TRACE_EVENT1("navigation", "RenderFrameHostManager::CommitPending", - "FrameTreeNode id", frame_tree_node_->frame_tree_node_id()); - CHECK(pending_rfh); -@@ -4593,9 +4616,10 @@ void RenderFrameHostManager::CommitPending( - // valid surface id, because it already has that surface embedded through - // `RenderFrameHostImpl::WillLeaveBackForwardCache` and the timeout that - // would be set here will clear that frame (incorrectly). -- if (is_main_frame && old_view && old_view != new_view) { -- // We should take the fallback if we're not coming from BFCache or if we -- // don't have a valid surface id to display. -+ if (is_main_frame && allow_paint_holding && old_view && old_view != new_view) { -+ // If allowed, we should take the fallback in any of the following cases: -+ // - We're not coming from BFCache -+ // - We don't have a valid surface id to display. - auto* render_widget_host_view_base = - static_cast(render_frame_host_->GetView()); - should_take_fallback_content = -@@ -4730,7 +4754,7 @@ void RenderFrameHostManager::CommitPending( - if (proxy_to_parent_or_outer_delegate) { - proxy_to_parent_or_outer_delegate->SetChildRWHView( - static_cast(new_view), -- old_size ? &*old_size : nullptr); -+ old_size ? &*old_size : nullptr, allow_paint_holding); - } - - if (render_frame_host_->is_local_root()) { -@@ -5136,8 +5160,10 @@ void RenderFrameHostManager::CreateNewFrameForInnerDelegateAttachIfNecessary() { - // Swap in the speculative frame. It will later be replaced when - // WebContents::AttachToOuterWebContentsFrame is called. - speculative_render_frame_host_->SwapIn(); -+ - CommitPending(std::move(speculative_render_frame_host_), nullptr, -- false /* clear_proxies_on_commit */); -+ false /* clear_proxies_on_commit */, -+ /* allow_paint_holding */ false); - NotifyPrepareForInnerDelegateAttachComplete(true /* success */); - } - -diff --git a/chromium/content/browser/renderer_host/render_frame_host_manager.h b/chromium/content/browser/renderer_host/render_frame_host_manager.h -index 9257b8c5f93..46acf6a9380 100644 ---- src/3rdparty/chromium/content/browser/renderer_host/render_frame_host_manager.h -+++ src/3rdparty/chromium/content/browser/renderer_host/render_frame_host_manager.h -@@ -322,7 +322,8 @@ class CONTENT_EXPORT RenderFrameHostManager { - bool was_caused_by_user_gesture, - bool is_same_document_navigation, - bool clear_proxies_on_commit, -- const blink::FramePolicy& frame_policy); -+ const blink::FramePolicy& frame_policy, -+ bool allow_paint_holding); - - // Called when this frame's opener is changed to the frame specified by - // |opener_frame_token| in |source_site_instance_group|'s process. This -@@ -971,15 +972,18 @@ class CONTENT_EXPORT RenderFrameHostManager { - // |clear_proxies_on_commit| Indicates if the proxies and opener must be - // removed during the commit. This can happen following some BrowsingInstance - // swaps, such as those for COOP. -+ // |allow_paint_holding| Indicates whether paint holding is allowed. - void CommitPending(std::unique_ptr pending_rfh, - std::unique_ptr pending_stored_page, -- bool clear_proxies_on_commit); -+ bool clear_proxies_on_commit, -+ bool allow_paint_holding); - - // Helper to call CommitPending() in all necessary cases. - void CommitPendingIfNecessary(RenderFrameHostImpl* render_frame_host, - bool was_caused_by_user_gesture, - bool is_same_document_navigation, -- bool clear_proxies_on_commit); -+ bool clear_proxies_on_commit, -+ bool allow_paint_holding); - - // Runs the unload handler in the old RenderFrameHost, after the new - // RenderFrameHost has committed. |old_render_frame_host| will either be -diff --git a/chromium/content/browser/renderer_host/render_frame_proxy_host.cc b/chromium/content/browser/renderer_host/render_frame_proxy_host.cc -index 2ac59af2958..6ac750e7155 100644 ---- src/3rdparty/chromium/content/browser/renderer_host/render_frame_proxy_host.cc -+++ src/3rdparty/chromium/content/browser/renderer_host/render_frame_proxy_host.cc -@@ -192,10 +192,10 @@ RenderFrameProxyHost::~RenderFrameProxyHost() { - TRACE_EVENT_END("navigation", perfetto::Track::FromPointer(this)); - } - --void RenderFrameProxyHost::SetChildRWHView( -- RenderWidgetHostViewChildFrame* view, -- const gfx::Size* initial_frame_size) { -- cross_process_frame_connector_->SetView(view); -+void RenderFrameProxyHost::SetChildRWHView(RenderWidgetHostViewChildFrame* view, -+ const gfx::Size* initial_frame_size, -+ bool allow_paint_holding) { -+ cross_process_frame_connector_->SetView(view, allow_paint_holding); - if (initial_frame_size) - cross_process_frame_connector_->SetLocalFrameSize(*initial_frame_size); - } -diff --git a/chromium/content/browser/renderer_host/render_frame_proxy_host.h b/chromium/content/browser/renderer_host/render_frame_proxy_host.h -index 08c1d72af90..c63589a7c31 100644 ---- src/3rdparty/chromium/content/browser/renderer_host/render_frame_proxy_host.h -+++ src/3rdparty/chromium/content/browser/renderer_host/render_frame_proxy_host.h -@@ -164,7 +164,8 @@ class CONTENT_EXPORT RenderFrameProxyHost - // receives its size from the parent via FrameHostMsg_UpdateResizeParams - // before it begins parsing the content. - void SetChildRWHView(RenderWidgetHostViewChildFrame* view, -- const gfx::Size* initial_frame_size); -+ const gfx::Size* initial_frame_size, -+ bool allow_paint_holding); - - RenderViewHostImpl* GetRenderViewHost(); - -diff --git a/chromium/content/browser/renderer_host/render_widget_host_impl.cc b/chromium/content/browser/renderer_host/render_widget_host_impl.cc -index f27648e12c1..a337dd6a96b 100644 ---- src/3rdparty/chromium/content/browser/renderer_host/render_widget_host_impl.cc -+++ src/3rdparty/chromium/content/browser/renderer_host/render_widget_host_impl.cc -@@ -117,6 +117,7 @@ - #include "third_party/blink/public/common/input/synthetic_web_input_event_builders.h" - #include "third_party/blink/public/common/storage_key/storage_key.h" - #include "third_party/blink/public/common/web_preferences/web_preferences.h" -+#include "third_party/blink/public/common/widget/constants.h" - #include "third_party/blink/public/common/widget/visual_properties.h" - #include "third_party/blink/public/mojom/drag/drag.mojom.h" - #include "third_party/blink/public/mojom/frame/intrinsic_sizing_info.mojom.h" -@@ -165,10 +166,6 @@ using blink::WebMouseWheelEvent; - namespace content { - namespace { - --// How long to wait for newly loaded content to send a compositor frame --// before clearing previously displayed graphics. --constexpr base::TimeDelta kNewContentRenderingDelay = base::Seconds(4); -- - constexpr gfx::Rect kInvalidScreenRect(std::numeric_limits::max(), - std::numeric_limits::max(), - 0, -@@ -438,7 +435,7 @@ RenderWidgetHostImpl::RenderWidgetHostImpl( - switches::kDisableHangMonitor)), - latency_tracker_(delegate_), - hung_renderer_delay_(kHungRendererDelay), -- new_content_rendering_delay_(kNewContentRenderingDelay), -+ new_content_rendering_delay_(blink::kNewContentRenderingDelay), - frame_token_message_queue_(std::move(frame_token_message_queue)), - render_frame_metadata_provider_( - #if BUILDFLAG(IS_MAC) -diff --git a/chromium/content/browser/renderer_host/render_widget_host_view_child_frame.cc b/chromium/content/browser/renderer_host/render_widget_host_view_child_frame.cc -index b190c86708d..632973c779e 100644 ---- src/3rdparty/chromium/content/browser/renderer_host/render_widget_host_view_child_frame.cc -+++ src/3rdparty/chromium/content/browser/renderer_host/render_widget_host_view_child_frame.cc -@@ -406,7 +406,7 @@ void RenderWidgetHostViewChildFrame::Destroy() { - // have already been cleared when RenderWidgetHostViewBase notified its - // observers of our impending destruction. - if (frame_connector_) { -- frame_connector_->SetView(nullptr); -+ frame_connector_->SetView(nullptr, /*allow_paint_holding=*/false); - SetFrameConnector(nullptr); - } - -diff --git a/chromium/content/common/features.cc b/chromium/content/common/features.cc -index 52443a0118c..e80454c2edd 100644 ---- src/3rdparty/chromium/content/common/features.cc -+++ src/3rdparty/chromium/content/common/features.cc -@@ -59,6 +59,11 @@ BASE_FEATURE(kWindowOpenFileSelectFix, - "WindowOpenFileSelectFix", - base::FEATURE_ENABLED_BY_DEFAULT); - -+// Flag guard for fix for crbug.com/40942531. -+BASE_FEATURE(kLimitCrossOriginNonActivatedPaintHolding, -+ "LimitCrossOriginNonActivatedPaintHolding", -+ base::FEATURE_ENABLED_BY_DEFAULT); -+ - // Please keep features in alphabetical order. - - } // namespace content -diff --git a/chromium/content/common/features.h b/chromium/content/common/features.h -index 5b5feb19663..92d7b515f86 100644 ---- src/3rdparty/chromium/content/common/features.h -+++ src/3rdparty/chromium/content/common/features.h -@@ -72,6 +72,8 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kSpeculativeServiceWorkerStartup); - // Flag guard for fix for crbug.com/1414936. - CONTENT_EXPORT BASE_DECLARE_FEATURE(kWindowOpenFileSelectFix); - -+CONTENT_EXPORT BASE_DECLARE_FEATURE(kLimitCrossOriginNonActivatedPaintHolding); -+ - // Please keep features in alphabetical order. - - } // namespace content -diff --git a/chromium/content/public/browser/content_browser_client.cc b/chromium/content/public/browser/content_browser_client.cc -index f30e5094533..59d3cc16e25 100644 ---- src/3rdparty/chromium/content/public/browser/content_browser_client.cc -+++ src/3rdparty/chromium/content/public/browser/content_browser_client.cc -@@ -1593,4 +1593,8 @@ bool ContentBrowserClient:: - return true; - } - -+bool ContentBrowserClient::AllowNonActivatedCrossOriginPaintHolding() { -+ return false; -+} -+ - } // namespace content -diff --git a/chromium/content/public/browser/content_browser_client.h b/chromium/content/public/browser/content_browser_client.h -index 3ae26ba017f..ded95892ab6 100644 ---- src/3rdparty/chromium/content/public/browser/content_browser_client.h -+++ src/3rdparty/chromium/content/public/browser/content_browser_client.h -@@ -2619,6 +2619,10 @@ class CONTENT_EXPORT ContentBrowserClient { - // "Cache-control: no-store" header in BFCache. - virtual bool ShouldAllowBackForwardCacheForCacheControlNoStorePage( - content::BrowserContext* browser_context); -+ -+ // Indicates whether this client allows paint holding in cross-origin -+ // navigations even if there was no user activation. -+ virtual bool AllowNonActivatedCrossOriginPaintHolding(); - }; - - } // namespace content -diff --git a/chromium/content/renderer/media/media_factory.cc b/chromium/content/renderer/media/media_factory.cc -index a6859aa3532..3316f1aaedc 100644 ---- src/3rdparty/chromium/content/renderer/media/media_factory.cc -+++ src/3rdparty/chromium/content/renderer/media/media_factory.cc -@@ -690,7 +690,7 @@ MediaFactory::CreateRendererFactorySelector( - - media::ObserveOverlayStateCB observe_overlay_state_cb = - base::BindRepeating(&OverlayStateObserverImpl::Create, -- render_thread->GetOverlayStateServiceProvider()); -+ base::RetainedRef(render_thread->GetOverlayStateServiceProvider())); - - factory_selector->AddFactory( - RendererType::kMediaFoundation, -diff --git a/chromium/content/renderer/media/win/overlay_state_observer_impl.cc b/chromium/content/renderer/media/win/overlay_state_observer_impl.cc -index 7cb6729a1e2..1de0ddc46ab 100644 ---- src/3rdparty/chromium/content/renderer/media/win/overlay_state_observer_impl.cc -+++ src/3rdparty/chromium/content/renderer/media/win/overlay_state_observer_impl.cc -@@ -16,7 +16,7 @@ OverlayStateObserverImpl::Create( - StateChangedCB state_changed_cb) { - if (overlay_state_service_provider) { - return base::WrapUnique(new OverlayStateObserverImpl( -- overlay_state_service_provider, mailbox, state_changed_cb)); -+ overlay_state_service_provider, mailbox, std::move(state_changed_cb))); - } - return nullptr; - } -diff --git a/chromium/content/renderer/media/win/overlay_state_service_provider.h b/chromium/content/renderer/media/win/overlay_state_service_provider.h -index a1b97b4429f..491a44ba2ea 100644 ---- src/3rdparty/chromium/content/renderer/media/win/overlay_state_service_provider.h -+++ src/3rdparty/chromium/content/renderer/media/win/overlay_state_service_provider.h -@@ -15,11 +15,19 @@ class GpuChannelHost; - - namespace content { - --class OverlayStateServiceProvider { -+class OverlayStateServiceProvider -+ : public base::RefCountedThreadSafe { - public: - virtual bool RegisterObserver( - mojo::PendingRemote pending_remote, - const gpu::Mailbox& mailbox) = 0; -+ -+ protected: -+ friend class base::RefCountedThreadSafe; -+ OverlayStateServiceProvider() = default; -+ OverlayStateServiceProvider(const OverlayStateServiceProvider&) = delete; -+ OverlayStateServiceProvider& operator=(const OverlayStateServiceProvider&) = -+ delete; - virtual ~OverlayStateServiceProvider() = default; - }; - -@@ -29,7 +37,6 @@ class OverlayStateServiceProviderImpl : public OverlayStateServiceProvider { - public: - explicit OverlayStateServiceProviderImpl( - scoped_refptr channel); -- ~OverlayStateServiceProviderImpl() override; - - bool RegisterObserver( - mojo::PendingRemote pending_remote, -@@ -43,6 +50,7 @@ class OverlayStateServiceProviderImpl : public OverlayStateServiceProvider { - delete; - OverlayStateServiceProviderImpl& operator=( - const OverlayStateServiceProviderImpl&) = delete; -+ ~OverlayStateServiceProviderImpl() override; - - scoped_refptr channel_; - }; -diff --git a/chromium/content/renderer/render_thread_impl.cc b/chromium/content/renderer/render_thread_impl.cc -index 328ed025f6b..f44428ecb13 100644 ---- src/3rdparty/chromium/content/renderer/render_thread_impl.cc -+++ src/3rdparty/chromium/content/renderer/render_thread_impl.cc -@@ -1268,7 +1268,7 @@ scoped_refptr RenderThreadImpl::GetDCOMPTextureFactory() { - return dcomp_texture_factory_; - } - --OverlayStateServiceProvider* -+scoped_refptr - RenderThreadImpl::GetOverlayStateServiceProvider() { - DCHECK(IsMainThread()); - // Only set 'overlay_state_service_provider_' if Media Foundation for clear -@@ -1282,11 +1282,12 @@ RenderThreadImpl::GetOverlayStateServiceProvider() { - return nullptr; - } - overlay_state_service_provider_ = -- std::make_unique(std::move(channel)); -+ base::MakeRefCounted( -+ std::move(channel)); - } - } - -- return overlay_state_service_provider_.get(); -+ return overlay_state_service_provider_; - } - #endif // BUILDFLAG(IS_WIN) - -diff --git a/chromium/content/renderer/render_thread_impl.h b/chromium/content/renderer/render_thread_impl.h -index 0d91d61008a..1e3a986f9e7 100644 ---- src/3rdparty/chromium/content/renderer/render_thread_impl.h -+++ src/3rdparty/chromium/content/renderer/render_thread_impl.h -@@ -265,7 +265,7 @@ class CONTENT_EXPORT RenderThreadImpl - // The OverlayStateService is only available where Media Foundation for - // clear is supported, otherwise GetOverlayStateServiceProvider will return - // nullptr. -- OverlayStateServiceProvider* GetOverlayStateServiceProvider(); -+ scoped_refptr GetOverlayStateServiceProvider(); - #endif - - blink::WebVideoCaptureImplManager* video_capture_impl_manager() const { -@@ -530,7 +530,7 @@ class CONTENT_EXPORT RenderThreadImpl - - #if BUILDFLAG(IS_WIN) - scoped_refptr dcomp_texture_factory_; -- std::unique_ptr -+ scoped_refptr - overlay_state_service_provider_; - #endif - -diff --git a/chromium/gpu/config/software_rendering_list.json b/chromium/gpu/config/software_rendering_list.json -index a2f6aa5f2cf..0878fb2599e 100644 ---- src/3rdparty/chromium/gpu/config/software_rendering_list.json -+++ src/3rdparty/chromium/gpu/config/software_rendering_list.json -@@ -1396,23 +1396,6 @@ - "accelerated_webgl2" - ] - }, -- { -- "id": 158, -- "description": "Canvas rendering issues with Intel drivers on Windows since 94-based: https://bugreports.qt.io/browse/QTBUG-104065", -- "cr_bugs": [1316442], -- "os": { -- "type": "win" -- }, -- "exceptions": [ -- { -- "gl_renderer": "ANGLE.*" -- } -- ], -- "vendor_id": "0x8086", -- "features": [ -- "accelerated_2d_canvas" -- ] -- }, - { - "id": 159, - "cr_bugs": [902247], -diff --git a/chromium/third_party/blink/common/widget/constants.cc b/chromium/third_party/blink/common/widget/constants.cc -index 212050c1221..2b27ca8d7e9 100644 ---- src/3rdparty/chromium/third_party/blink/common/widget/constants.cc -+++ src/3rdparty/chromium/third_party/blink/common/widget/constants.cc -@@ -8,4 +8,6 @@ namespace blink { - - const int kMinimumWindowSize = 100; - -+const base::TimeDelta kNewContentRenderingDelay = base::Seconds(4); -+ - } // namespace blink -diff --git a/chromium/third_party/blink/public/common/widget/constants.h b/chromium/third_party/blink/public/common/widget/constants.h -index 95749573237..69aedfbc137 100644 ---- src/3rdparty/chromium/third_party/blink/public/common/widget/constants.h -+++ src/3rdparty/chromium/third_party/blink/public/common/widget/constants.h -@@ -5,6 +5,7 @@ - #ifndef THIRD_PARTY_BLINK_PUBLIC_COMMON_WIDGET_CONSTANTS_H_ - #define THIRD_PARTY_BLINK_PUBLIC_COMMON_WIDGET_CONSTANTS_H_ - -+#include "base/time/time.h" - #include "third_party/blink/public/common/common_export.h" - - namespace blink { -@@ -13,6 +14,9 @@ namespace blink { - // window object - BLINK_COMMON_EXPORT extern const int kMinimumWindowSize; - -+// The timeout for clearing old paint for a cross-document navigation. -+BLINK_COMMON_EXPORT extern const base::TimeDelta kNewContentRenderingDelay; -+ - } // namespace blink - - #endif // THIRD_PARTY_BLINK_PUBLIC_COMMON_WIDGET_CONSTANTS_H_ -diff --git a/chromium/third_party/blink/public/mojom/frame/remote_frame.mojom b/chromium/third_party/blink/public/mojom/frame/remote_frame.mojom -index 4d891d46b67..e3c22c2059b 100644 ---- src/3rdparty/chromium/third_party/blink/public/mojom/frame/remote_frame.mojom -+++ src/3rdparty/chromium/third_party/blink/public/mojom/frame/remote_frame.mojom -@@ -404,7 +404,11 @@ interface RemoteFrame { - - // Notifies this remote frame that its associated compositing - // destination (RenderWidgetHostView) has changed. -- SetFrameSinkId(viz.mojom.FrameSinkId frame_sink_id); -+ // -+ // The embedder can keep using the painted content from the previous frame -+ // sink until the new frame sink produces a new frame, i.e., paint holding. -+ // `allow_paint_holding` is used to limit this to same-origin navigations. -+ SetFrameSinkId(viz.mojom.FrameSinkId frame_sink_id, bool allow_paint_holding); - - // Notifies the remote frame that the process rendering the child frame's - // contents has terminated. -diff --git a/chromium/third_party/blink/renderer/core/dom/element_rare_data_vector.cc b/chromium/third_party/blink/renderer/core/dom/element_rare_data_vector.cc -index 5680187326b..66abc46ca6a 100644 ---- src/3rdparty/chromium/third_party/blink/renderer/core/dom/element_rare_data_vector.cc -+++ src/3rdparty/chromium/third_party/blink/renderer/core/dom/element_rare_data_vector.cc -@@ -45,12 +45,21 @@ ElementRareDataVector::~ElementRareDataVector() { - unsigned ElementRareDataVector::GetFieldIndex(FieldId field_id) const { - unsigned field_id_int = static_cast(field_id); - DCHECK(fields_bitfield_ & (static_cast(1) << field_id_int)); --#ifdef _MSC_VER -- return __popcnt(fields_bitfield_ & -- ~(~static_cast(0) << field_id_int)); --#else -+#if defined(__GNUC__) || defined(__clang__) - return __builtin_popcount(fields_bitfield_ & - ~(~static_cast(0) << field_id_int)); -+#elif _MSVC_LANG >= 202002L // C++20 -+ return std::popcount(fields_bitfield_ & -+ ~(~static_cast(0) << field_id_int)); -+#else -+ uint32_t v = (fields_bitfield_ & -+ ~(~static_cast(0) << field_id_int)); -+ uint32_t c = v - ((v >> 1) & 0x55555555); -+ c = ((c >> 2) & 0x33333333) + (c & 0x33333333); -+ c = ((c >> 4) + c) & 0x0F0F0F0F; -+ c = ((c >> 8) + c) & 0x00FF00FF; -+ c = ((c >> 16) + c) & 0x0000FFFF; -+ return c; - #endif - } - -diff --git a/chromium/third_party/blink/renderer/core/frame/child_frame_compositing_helper.cc b/chromium/third_party/blink/renderer/core/frame/child_frame_compositing_helper.cc -index 632bc8d5aa3..d5afeae18a8 100644 ---- src/3rdparty/chromium/third_party/blink/renderer/core/frame/child_frame_compositing_helper.cc -+++ src/3rdparty/chromium/third_party/blink/renderer/core/frame/child_frame_compositing_helper.cc -@@ -12,7 +12,10 @@ - #include "cc/paint/paint_image.h" - #include "cc/paint/paint_image_builder.h" - #include "skia/ext/image_operations.h" -+#include "third_party/blink/public/common/widget/constants.h" - #include "third_party/blink/renderer/core/frame/child_frame_compositor.h" -+#include "third_party/blink/renderer/platform/runtime_enabled_features.h" -+#include "third_party/blink/renderer/platform/wtf/functional.h" - #include "third_party/skia/include/core/SkBitmap.h" - #include "third_party/skia/include/core/SkImage.h" - #include "ui/gfx/geometry/point_f.h" -@@ -46,11 +49,14 @@ void ChildFrameCompositingHelper::ChildFrameGone(float device_scale_factor) { - - void ChildFrameCompositingHelper::SetSurfaceId( - const viz::SurfaceId& surface_id, -- bool capture_sequence_number_changed) { -+ CaptureSequenceNumberChanged capture_sequence_number_changed, -+ AllowPaintHolding allow_paint_holding) { - if (surface_id_ == surface_id) - return; - -+ const auto current_surface_id = surface_id_; - surface_id_ = surface_id; -+ paint_holding_timer_.Stop(); - - surface_layer_ = cc::SurfaceLayer::Create(); - surface_layer_->SetMasksToBounds(true); -@@ -59,10 +65,12 @@ void ChildFrameCompositingHelper::SetSurfaceId( - - // If we're synchronizing surfaces, then use an infinite deadline to ensure - // everything is synchronized. -- cc::DeadlinePolicy deadline = capture_sequence_number_changed -- ? cc::DeadlinePolicy::UseInfiniteDeadline() -- : cc::DeadlinePolicy::UseDefaultDeadline(); -+ cc::DeadlinePolicy deadline = -+ capture_sequence_number_changed == CaptureSequenceNumberChanged::kYes -+ ? cc::DeadlinePolicy::UseInfiniteDeadline() -+ : cc::DeadlinePolicy::UseDefaultDeadline(); - surface_layer_->SetSurfaceId(surface_id, deadline); -+ MaybeSetUpPaintHolding(current_surface_id, allow_paint_holding); - - // TODO(lfg): Investigate if it's possible to propagate the information - // about the child surface's opacity. https://crbug.com/629851. -@@ -72,6 +80,33 @@ void ChildFrameCompositingHelper::SetSurfaceId( - UpdateVisibility(true); - } - -+void ChildFrameCompositingHelper::MaybeSetUpPaintHolding( -+ const viz::SurfaceId& fallback_id, -+ AllowPaintHolding allow_paint_holding) { -+ if (!RuntimeEnabledFeatures::PaintHoldingForIframesEnabled()) { -+ return; -+ } -+ -+ if (fallback_id.is_valid() && -+ allow_paint_holding == AllowPaintHolding::kYes) { -+ surface_layer_->SetOldestAcceptableFallback(fallback_id); -+ -+ paint_holding_timer_.Start( -+ FROM_HERE, kNewContentRenderingDelay, -+ WTF::BindOnce(&ChildFrameCompositingHelper::PaintHoldingTimerFired, -+ base::Unretained(this))); -+ } else { -+ surface_layer_->SetOldestAcceptableFallback(viz::SurfaceId()); -+ } -+} -+ -+void ChildFrameCompositingHelper::PaintHoldingTimerFired() { -+ CHECK(RuntimeEnabledFeatures::PaintHoldingForIframesEnabled()); -+ if (surface_layer_) { -+ surface_layer_->SetOldestAcceptableFallback(viz::SurfaceId()); -+ } -+} -+ - void ChildFrameCompositingHelper::UpdateVisibility(bool visible) { - const scoped_refptr& layer = child_frame_compositor_->GetCcLayer(); - if (layer) { -diff --git a/chromium/third_party/blink/renderer/core/frame/child_frame_compositing_helper.h b/chromium/third_party/blink/renderer/core/frame/child_frame_compositing_helper.h -index 2717a66a18d..4f870564916 100644 ---- src/3rdparty/chromium/third_party/blink/renderer/core/frame/child_frame_compositing_helper.h -+++ src/3rdparty/chromium/third_party/blink/renderer/core/frame/child_frame_compositing_helper.h -@@ -7,6 +7,7 @@ - - #include - -+#include "base/timer/timer.h" - #include "cc/layers/content_layer_client.h" - #include "cc/layers/surface_layer.h" - #include "components/viz/common/surfaces/surface_id.h" -@@ -29,8 +30,12 @@ class CORE_EXPORT ChildFrameCompositingHelper : public cc::ContentLayerClient { - delete; - ~ChildFrameCompositingHelper() override; - -- void SetSurfaceId(const viz::SurfaceId& surface_id, -- bool capture_sequence_number_changed); -+ enum class CaptureSequenceNumberChanged { kYes, kNo }; -+ enum class AllowPaintHolding { kYes, kNo }; -+ void SetSurfaceId( -+ const viz::SurfaceId& surface_id, -+ CaptureSequenceNumberChanged capture_sequence_number_changed, -+ AllowPaintHolding allow_paint_holding); - void UpdateVisibility(bool visible); - void ChildFrameGone(float device_scale_factor); - -@@ -43,10 +48,15 @@ class CORE_EXPORT ChildFrameCompositingHelper : public cc::ContentLayerClient { - scoped_refptr PaintContentsToDisplayList() override; - bool FillsBoundsCompletely() const override; - -+ void MaybeSetUpPaintHolding(const viz::SurfaceId& fallback_id, -+ AllowPaintHolding allow_paint_holding); -+ void PaintHoldingTimerFired(); -+ - ChildFrameCompositor* const child_frame_compositor_; - viz::SurfaceId surface_id_; - scoped_refptr surface_layer_; - scoped_refptr crash_ui_layer_; -+ base::OneShotTimer paint_holding_timer_; - float device_scale_factor_ = 1.f; - }; - -diff --git a/chromium/third_party/blink/renderer/core/frame/child_frame_compositing_helper_test.cc b/chromium/third_party/blink/renderer/core/frame/child_frame_compositing_helper_test.cc -index 47d094c4e8d..cb961013332 100644 ---- src/3rdparty/chromium/third_party/blink/renderer/core/frame/child_frame_compositing_helper_test.cc -+++ src/3rdparty/chromium/third_party/blink/renderer/core/frame/child_frame_compositing_helper_test.cc -@@ -4,6 +4,7 @@ - - #include "third_party/blink/renderer/core/frame/child_frame_compositing_helper.h" - -+#include "base/test/task_environment.h" - #include "cc/layers/layer.h" - #include "testing/gtest/include/gtest/gtest.h" - #include "third_party/blink/renderer/core/frame/child_frame_compositor.h" -@@ -61,6 +62,9 @@ class ChildFrameCompositingHelperTest : public testing::Test { - ChildFrameCompositingHelper* compositing_helper() { - return &compositing_helper_; - } -+ const cc::SurfaceLayer& GetSurfaceLayer() { -+ return *static_cast(compositor_.GetCcLayer().get()); -+ } - - private: - MockChildFrameCompositor compositor_; -@@ -74,7 +78,10 @@ TEST_F(ChildFrameCompositingHelperTest, ChildFrameGoneClearsFallback) { - EXPECT_FALSE(compositing_helper()->surface_id().is_valid()); - - const viz::SurfaceId surface_id = MakeSurfaceId(viz::FrameSinkId(1, 1), 1); -- compositing_helper()->SetSurfaceId(surface_id, false); -+ compositing_helper()->SetSurfaceId( -+ surface_id, -+ ChildFrameCompositingHelper::CaptureSequenceNumberChanged::kNo, -+ ChildFrameCompositingHelper::AllowPaintHolding::kNo); - EXPECT_EQ(surface_id, compositing_helper()->surface_id()); - - // Reporting that the child frame is gone should clear the surface id. -@@ -82,4 +89,33 @@ TEST_F(ChildFrameCompositingHelperTest, ChildFrameGoneClearsFallback) { - EXPECT_FALSE(compositing_helper()->surface_id().is_valid()); - } - -+TEST_F(ChildFrameCompositingHelperTest, PaintHoldingTimeout) { -+ base::test::SingleThreadTaskEnvironment task_environment{ -+ base::test::TaskEnvironment::MainThreadType::UI, -+ base::test::TaskEnvironment::TimeSource::MOCK_TIME}; -+ EXPECT_FALSE(compositing_helper()->surface_id().is_valid()); -+ -+ const viz::SurfaceId surface_id = MakeSurfaceId(viz::FrameSinkId(1, 1), 1); -+ compositing_helper()->SetSurfaceId( -+ surface_id, -+ ChildFrameCompositingHelper::CaptureSequenceNumberChanged::kNo, -+ ChildFrameCompositingHelper::AllowPaintHolding::kNo); -+ EXPECT_EQ(surface_id, GetSurfaceLayer().surface_id()); -+ EXPECT_FALSE(GetSurfaceLayer().oldest_acceptable_fallback()); -+ -+ const viz::SurfaceId new_surface_id = -+ MakeSurfaceId(viz::FrameSinkId(1, 1), 2); -+ compositing_helper()->SetSurfaceId( -+ new_surface_id, -+ ChildFrameCompositingHelper::CaptureSequenceNumberChanged::kNo, -+ ChildFrameCompositingHelper::AllowPaintHolding::kYes); -+ EXPECT_EQ(new_surface_id, GetSurfaceLayer().surface_id()); -+ ASSERT_TRUE(GetSurfaceLayer().oldest_acceptable_fallback()); -+ EXPECT_EQ(surface_id, GetSurfaceLayer().oldest_acceptable_fallback().value()); -+ -+ task_environment.FastForwardUntilNoTasksRemain(); -+ EXPECT_EQ(new_surface_id, GetSurfaceLayer().surface_id()); -+ EXPECT_FALSE(GetSurfaceLayer().oldest_acceptable_fallback()); -+} -+ - } // namespace blink -diff --git a/chromium/third_party/blink/renderer/core/frame/location_report_body.cc b/chromium/third_party/blink/renderer/core/frame/location_report_body.cc -index ccd47126403..6aa5c56f92b 100644 ---- src/3rdparty/chromium/third_party/blink/renderer/core/frame/location_report_body.cc -+++ src/3rdparty/chromium/third_party/blink/renderer/core/frame/location_report_body.cc -@@ -3,7 +3,10 @@ - // found in the LICENSE file. - - #include "third_party/blink/renderer/core/frame/location_report_body.h" -+ -+#include "third_party/blink/public/common/scheme_registry.h" - #include "third_party/blink/renderer/bindings/core/v8/capture_source_location.h" -+#include "third_party/blink/renderer/platform/weborigin/kurl.h" - #include "third_party/blink/renderer/platform/wtf/hash_functions.h" - - namespace blink { -@@ -49,4 +52,16 @@ unsigned LocationReportBody::MatchId() const { - return hash; - } - -+bool LocationReportBody::IsExtensionSource() const { -+ // TODO(crbug.com/356098278): Either remove this KURL instantiation completely -+ // or store `source_file_` as a KURL and only convert to string when sending -+ // reports. -+ KURL source_file_url(source_file_); -+ if (!source_file_url.IsValid()) { -+ return false; -+ } -+ return CommonSchemeRegistry::IsExtensionScheme( -+ source_file_url.Protocol().Utf8()); -+} -+ - } // namespace blink -diff --git a/chromium/third_party/blink/renderer/core/frame/location_report_body.h b/chromium/third_party/blink/renderer/core/frame/location_report_body.h -index dea5e9232f4..8dd27eed8f5 100644 ---- src/3rdparty/chromium/third_party/blink/renderer/core/frame/location_report_body.h -+++ src/3rdparty/chromium/third_party/blink/renderer/core/frame/location_report_body.h -@@ -59,6 +59,8 @@ class CORE_EXPORT LocationReportBody : public ReportBody { - - unsigned MatchId() const override; - -+ bool IsExtensionSource() const override; -+ - protected: - const String source_file_; - const absl::optional line_number_; -diff --git a/chromium/third_party/blink/renderer/core/frame/location_report_body_test.cc b/chromium/third_party/blink/renderer/core/frame/location_report_body_test.cc -index 19eea3f8c71..c5ada318dbc 100644 ---- src/3rdparty/chromium/third_party/blink/renderer/core/frame/location_report_body_test.cc -+++ src/3rdparty/chromium/third_party/blink/renderer/core/frame/location_report_body_test.cc -@@ -8,6 +8,7 @@ - #include - - #include "testing/gtest/include/gtest/gtest.h" -+#include "third_party/blink/public/common/scheme_registry.h" - - namespace blink { - namespace { -@@ -89,5 +90,24 @@ TEST(LocationReportBodyMatchIdTest, - } - } - -+TEST(LocationReportBodyTest, ExtensionURLsAreIdentified) { -+ const char* kExtensionUrl = -+ "chrome-extension://abcdefghijklmnopabcdefghijklmnop/scripts/" -+ "script.js"; -+ const char* kAboutBlankUrl = "about:blank"; -+ const char* kHttpsUrl = "https://example.com/"; -+ -+ EXPECT_FALSE(TestLocationReportBody(kExtensionUrl, 1, 1).IsExtensionSource()); -+ EXPECT_FALSE( -+ TestLocationReportBody(kAboutBlankUrl, 1, 1).IsExtensionSource()); -+ EXPECT_FALSE(TestLocationReportBody(kHttpsUrl, 1, 1).IsExtensionSource()); -+ -+ CommonSchemeRegistry::RegisterURLSchemeAsExtension("chrome-extension"); -+ EXPECT_TRUE(TestLocationReportBody(kExtensionUrl, 1, 1).IsExtensionSource()); -+ EXPECT_FALSE( -+ TestLocationReportBody(kAboutBlankUrl, 1, 1).IsExtensionSource()); -+ EXPECT_FALSE(TestLocationReportBody(kHttpsUrl, 1, 1).IsExtensionSource()); -+} -+ - } // namespace - } // namespace blink -diff --git a/chromium/third_party/blink/renderer/core/frame/remote_frame.cc b/chromium/third_party/blink/renderer/core/frame/remote_frame.cc -index 7f3f457261d..3d744cda68d 100644 ---- src/3rdparty/chromium/third_party/blink/renderer/core/frame/remote_frame.cc -+++ src/3rdparty/chromium/third_party/blink/renderer/core/frame/remote_frame.cc -@@ -28,7 +28,6 @@ - #include "third_party/blink/renderer/core/accessibility/ax_object_cache.h" - #include "third_party/blink/renderer/core/events/message_event.h" - #include "third_party/blink/renderer/core/exported/web_view_impl.h" --#include "third_party/blink/renderer/core/frame/child_frame_compositing_helper.h" - #include "third_party/blink/renderer/core/frame/local_dom_window.h" - #include "third_party/blink/renderer/core/frame/local_frame.h" - #include "third_party/blink/renderer/core/frame/local_frame_client.h" -@@ -860,7 +859,8 @@ viz::FrameSinkId RemoteFrame::GetFrameSinkId() { - return frame_sink_id_; - } - --void RemoteFrame::SetFrameSinkId(const viz::FrameSinkId& frame_sink_id) { -+void RemoteFrame::SetFrameSinkId(const viz::FrameSinkId& frame_sink_id, -+ bool allow_paint_holding) { - remote_process_gone_ = false; - - // The same ParentLocalSurfaceIdAllocator cannot provide LocalSurfaceIds for -@@ -873,7 +873,10 @@ void RemoteFrame::SetFrameSinkId(const viz::FrameSinkId& frame_sink_id) { - - // Resend the FrameRects and allocate a new viz::LocalSurfaceId when the view - // changes. -- ResendVisualProperties(); -+ ResendVisualPropertiesInternal( -+ allow_paint_holding -+ ? ChildFrameCompositingHelper::AllowPaintHolding::kYes -+ : ChildFrameCompositingHelper::AllowPaintHolding::kNo); - } - - void RemoteFrame::ChildProcessGone() { -@@ -922,14 +925,18 @@ void RemoteFrame::ApplyReplicatedPermissionsPolicyHeader() { - permissions_policy_header_, container_policy, parent_permissions_policy); - } - --bool RemoteFrame::SynchronizeVisualProperties(bool propagate) { -+bool RemoteFrame::SynchronizeVisualProperties( -+ bool propagate, -+ ChildFrameCompositingHelper::AllowPaintHolding allow_paint_holding) { - if (!GetFrameSinkId().is_valid() || remote_process_gone_) - return false; - -- bool capture_sequence_number_changed = -- sent_visual_properties_ && -- sent_visual_properties_->capture_sequence_number != -- pending_visual_properties_.capture_sequence_number; -+ auto capture_sequence_number_changed = -+ (sent_visual_properties_ && -+ sent_visual_properties_->capture_sequence_number != -+ pending_visual_properties_.capture_sequence_number) -+ ? ChildFrameCompositingHelper::CaptureSequenceNumberChanged::kYes -+ : ChildFrameCompositingHelper::CaptureSequenceNumberChanged::kNo; - - if (view_) { - pending_visual_properties_.compositor_viewport = -@@ -981,8 +988,8 @@ bool RemoteFrame::SynchronizeVisualProperties(bool propagate) { - DCHECK(surface_id.is_valid()); - DCHECK(!remote_process_gone_); - -- compositing_helper_->SetSurfaceId(surface_id, -- capture_sequence_number_changed); -+ compositing_helper_->SetSurfaceId(surface_id, capture_sequence_number_changed, -+ allow_paint_holding); - - bool rect_changed = !sent_visual_properties_ || - sent_visual_properties_->rect_in_local_root != -@@ -1011,8 +1018,14 @@ void RemoteFrame::RecordSentVisualProperties() { - } - - void RemoteFrame::ResendVisualProperties() { -+ ResendVisualPropertiesInternal( -+ ChildFrameCompositingHelper::AllowPaintHolding::kNo); -+} -+ -+void RemoteFrame::ResendVisualPropertiesInternal( -+ ChildFrameCompositingHelper::AllowPaintHolding allow_paint_holding) { - sent_visual_properties_ = absl::nullopt; -- SynchronizeVisualProperties(); -+ SynchronizeVisualProperties(/*propagate=*/true, allow_paint_holding); - } - - void RemoteFrame::DidUpdateVisualProperties( -diff --git a/chromium/third_party/blink/renderer/core/frame/remote_frame.h b/chromium/third_party/blink/renderer/core/frame/remote_frame.h -index 9585ac3d502..2209822b702 100644 ---- src/3rdparty/chromium/third_party/blink/renderer/core/frame/remote_frame.h -+++ src/3rdparty/chromium/third_party/blink/renderer/core/frame/remote_frame.h -@@ -16,6 +16,7 @@ - #include "third_party/blink/public/mojom/security_context/insecure_request_policy.mojom-blink-forward.h" - #include "third_party/blink/renderer/core/core_export.h" - #include "third_party/blink/renderer/core/execution_context/remote_security_context.h" -+#include "third_party/blink/renderer/core/frame/child_frame_compositing_helper.h" - #include "third_party/blink/renderer/core/frame/child_frame_compositor.h" - #include "third_party/blink/renderer/core/frame/frame.h" - #include "third_party/blink/renderer/core/frame/remote_frame_view.h" -@@ -129,7 +130,13 @@ class CORE_EXPORT RemoteFrame final : public Frame, - void InitializeFrameVisualProperties(const FrameVisualProperties& properties); - // If 'propagate' is true, updated properties will be sent to the browser. - // Returns true if visual properties have changed. -- bool SynchronizeVisualProperties(bool propagate = true); -+ // If 'allow_paint_holding' is yes, the remote frame will display stale paint -+ // (for a timeout) until a frame with the newly synchronized visual properties -+ // has been produced by the child. -+ bool SynchronizeVisualProperties( -+ bool propagate = true, -+ ChildFrameCompositingHelper::AllowPaintHolding allow_paint_holding = -+ ChildFrameCompositingHelper::AllowPaintHolding::kNo); - void ResendVisualProperties(); - void SetViewportIntersection(const mojom::blink::ViewportIntersectionState&); - void UpdateCompositedLayerBounds(); -@@ -208,7 +215,8 @@ class CORE_EXPORT RemoteFrame final : public Frame, - void DisableAutoResize() override; - void DidUpdateVisualProperties( - const cc::RenderFrameMetadata& metadata) override; -- void SetFrameSinkId(const viz::FrameSinkId& frame_sink_id) override; -+ void SetFrameSinkId(const viz::FrameSinkId& frame_sink_id, -+ bool allow_paint_holding) override; - void ChildProcessGone() override; - void CreateRemoteChild( - const RemoteFrameToken& token, -@@ -274,6 +282,9 @@ class CORE_EXPORT RemoteFrame final : public Frame, - void ApplyReplicatedPermissionsPolicyHeader(); - void RecordSentVisualProperties(); - -+ void ResendVisualPropertiesInternal( -+ ChildFrameCompositingHelper::AllowPaintHolding allow_paint_holding); -+ - Member view_; - RemoteSecurityContext security_context_; - absl::optional sent_visual_properties_; -diff --git a/chromium/third_party/blink/renderer/core/frame/report.cc b/chromium/third_party/blink/renderer/core/frame/report.cc -index f854ddfdc18..4106efeba4a 100644 ---- src/3rdparty/chromium/third_party/blink/renderer/core/frame/report.cc -+++ src/3rdparty/chromium/third_party/blink/renderer/core/frame/report.cc -@@ -30,4 +30,11 @@ unsigned Report::MatchId() const { - return hash; - } - -+bool Report::ShouldSendReport() const { -+ // Don't report any URLs from extension code. -+ // TODO(356098278): Investigate whether extension URLs should be reported to -+ // an extension-defined endpoint, if the extension opts in to reporting. -+ return !body()->IsExtensionSource(); -+} -+ - } // namespace blink -diff --git a/chromium/third_party/blink/renderer/core/frame/report.h b/chromium/third_party/blink/renderer/core/frame/report.h -index 2dcc85fe99a..0e97c298e1d 100644 ---- src/3rdparty/chromium/third_party/blink/renderer/core/frame/report.h -+++ src/3rdparty/chromium/third_party/blink/renderer/core/frame/report.h -@@ -50,6 +50,12 @@ class CORE_EXPORT Report : public ScriptWrappable { - // Collision of match id is possible. - unsigned MatchId() const; - -+ // Determines whether this report is allowed to be sent to observers or the -+ // reporting endpoints. This should return false if the report should not be -+ // sent, for example, if the body of the report would reveal private -+ // information, such as extension URLs. -+ bool ShouldSendReport() const; -+ - private: - const String type_; - const String url_; -diff --git a/chromium/third_party/blink/renderer/core/frame/report_body.h b/chromium/third_party/blink/renderer/core/frame/report_body.h -index 73a07fa7355..ea19d190b71 100644 ---- src/3rdparty/chromium/third_party/blink/renderer/core/frame/report_body.h -+++ src/3rdparty/chromium/third_party/blink/renderer/core/frame/report_body.h -@@ -25,6 +25,10 @@ class CORE_EXPORT ReportBody : public ScriptWrappable { - // Provides a hash-like value for identifying reports with same content. - // Collision of match id is possible. - virtual unsigned MatchId() const { return 0; } -+ -+ // Returns true if this report body would contain an extension URL as the -+ // report source. -+ virtual bool IsExtensionSource() const { return false; } - }; - - } // namespace blink -diff --git a/chromium/third_party/blink/renderer/core/frame/report_test.cc b/chromium/third_party/blink/renderer/core/frame/report_test.cc -index 1fbaa2bfa3f..2d14342315a 100644 ---- src/3rdparty/chromium/third_party/blink/renderer/core/frame/report_test.cc -+++ src/3rdparty/chromium/third_party/blink/renderer/core/frame/report_test.cc -@@ -7,6 +7,7 @@ - #include - - #include "testing/gtest/include/gtest/gtest.h" -+#include "third_party/blink/public/common/scheme_registry.h" - #include "third_party/blink/renderer/core/frame/document_policy_violation_report_body.h" - #include "third_party/blink/renderer/core/frame/location_report_body.h" - #include "third_party/blink/renderer/core/frame/permissions_policy_violation_report_body.h" -@@ -87,5 +88,32 @@ TEST(ReportMatchIdTest, MatchIdGeneratedShouldNotBeZero) { - } - } - -+TEST(ReportTest, ExtensionURLsAreNotReported) { -+ CommonSchemeRegistry::RegisterURLSchemeAsExtension("chrome-extension"); -+ EXPECT_TRUE(Report(ReportType::kDocumentPolicyViolation, -+ "https://example.com/", -+ MakeGarbageCollected( -+ "feature", "message", "disposition", -+ "https://example.com/script.js")) -+ .ShouldSendReport()); -+ EXPECT_FALSE(Report(ReportType::kDocumentPolicyViolation, -+ "https://example.com/", -+ MakeGarbageCollected( -+ "feature", "message", "disposition", -+ "chrome-extension://abcdefghijklmnopabcdefghijklmnop/" -+ "scripts/script.js")) -+ .ShouldSendReport()); -+ // This is false for now; all reports from extension scripts are blocked, even -+ // if the report comes from the extension itself. -+ EXPECT_FALSE(Report(ReportType::kDocumentPolicyViolation, -+ "chrome-extension://abcdefghijklmnopabcdefghijklmnop/" -+ "background_page.html", -+ MakeGarbageCollected( -+ "feature", "message", "disposition", -+ "chrome-extension://abcdefghijklmnopabcdefghijklmnop/" -+ "scripts/script.js")) -+ .ShouldSendReport()); -+} -+ - } // namespace - } // namespace blink -diff --git a/chromium/third_party/blink/renderer/core/frame/reporting_context.cc b/chromium/third_party/blink/renderer/core/frame/reporting_context.cc -index dc32fd90d94..c4ade3b35c8 100644 ---- src/3rdparty/chromium/third_party/blink/renderer/core/frame/reporting_context.cc -+++ src/3rdparty/chromium/third_party/blink/renderer/core/frame/reporting_context.cc -@@ -76,6 +76,10 @@ void ReportingContext::Bind( - - void ReportingContext::QueueReport(Report* report, - const Vector& endpoints) { -+ if (!report->ShouldSendReport()) { -+ return; -+ } -+ - CountReport(report); - - NotifyInternal(report); -diff --git a/chromium/third_party/blink/renderer/core/html/parser/html_srcset_parser.cc b/chromium/third_party/blink/renderer/core/html/parser/html_srcset_parser.cc -index 1767d68d92f..06a51f5e1a6 100644 ---- src/3rdparty/chromium/third_party/blink/renderer/core/html/parser/html_srcset_parser.cc -+++ src/3rdparty/chromium/third_party/blink/renderer/core/html/parser/html_srcset_parser.cc -@@ -413,7 +413,7 @@ static unsigned AvoidDownloadIfHigherDensityResourceIsInCache( - KURL url = document->CompleteURL( - StripLeadingAndTrailingHTMLSpaces(image_candidates[i]->Url())); - if (MemoryCache::Get()->ResourceForURL( -- url, document->Fetcher()->GetCacheIdentifier(url)) || -+ url, document->Fetcher()->GetCacheIdentifier(url, /*skip_service_worker=*/false)) || - url.ProtocolIsData()) - return i; - } -diff --git a/chromium/third_party/blink/renderer/core/inspector/inspector_network_agent.cc b/chromium/third_party/blink/renderer/core/inspector/inspector_network_agent.cc -index fb7a567f9f5..e9863d53647 100644 ---- src/3rdparty/chromium/third_party/blink/renderer/core/inspector/inspector_network_agent.cc -+++ src/3rdparty/chromium/third_party/blink/renderer/core/inspector/inspector_network_agent.cc -@@ -2315,7 +2315,8 @@ bool InspectorNetworkAgent::FetchResourceContent(Document* document, - Resource* cached_resource = document->Fetcher()->CachedResource(url); - if (!cached_resource) { - cached_resource = MemoryCache::Get()->ResourceForURL( -- url, document->Fetcher()->GetCacheIdentifier(url)); -+ url, document->Fetcher()->GetCacheIdentifier( -+ url, /*skip_service_worker=*/false)); - } - if (cached_resource && InspectorPageAgent::CachedResourceContent( - cached_resource, content, base64_encoded)) { -diff --git a/chromium/third_party/blink/renderer/core/inspector/inspector_page_agent.cc b/chromium/third_party/blink/renderer/core/inspector/inspector_page_agent.cc -index 0767cdd734f..809aa7ceda5 100644 ---- src/3rdparty/chromium/third_party/blink/renderer/core/inspector/inspector_page_agent.cc -+++ src/3rdparty/chromium/third_party/blink/renderer/core/inspector/inspector_page_agent.cc -@@ -167,7 +167,8 @@ Resource* CachedResource(LocalFrame* frame, - Resource* cached_resource = document->Fetcher()->CachedResource(url); - if (!cached_resource) { - cached_resource = MemoryCache::Get()->ResourceForURL( -- url, document->Fetcher()->GetCacheIdentifier(url)); -+ url, document->Fetcher()->GetCacheIdentifier( -+ url, /*skip_service_worker=*/false)); - } - if (!cached_resource) - cached_resource = loader->ResourceForURL(url); -diff --git a/chromium/third_party/blink/renderer/core/loader/image_loader.cc b/chromium/third_party/blink/renderer/core/loader/image_loader.cc -index c647f154a13..76d72a7bc49 100644 ---- src/3rdparty/chromium/third_party/blink/renderer/core/loader/image_loader.cc -+++ src/3rdparty/chromium/third_party/blink/renderer/core/loader/image_loader.cc -@@ -741,7 +741,8 @@ bool ImageLoader::ShouldLoadImmediately(const KURL& url) const { - // content when style recalc is over and DOM mutation is allowed again. - if (!url.IsNull()) { - Resource* resource = MemoryCache::Get()->ResourceForURL( -- url, element_->GetDocument().Fetcher()->GetCacheIdentifier(url)); -+ url, element_->GetDocument().Fetcher()->GetCacheIdentifier( -+ url, /*skip_service_worker=*/false)); - - if (resource && !resource->ErrorOccurred() && - CanReuseFromListOfAvailableImages( -diff --git a/chromium/third_party/blink/renderer/core/loader/modulescript/module_script_loader.cc b/chromium/third_party/blink/renderer/core/loader/modulescript/module_script_loader.cc -index e6138a68698..1bd0a69801d 100644 ---- src/3rdparty/chromium/third_party/blink/renderer/core/loader/modulescript/module_script_loader.cc -+++ src/3rdparty/chromium/third_party/blink/renderer/core/loader/modulescript/module_script_loader.cc -@@ -116,11 +116,18 @@ void ModuleScriptLoader::FetchInternal( - url_ = module_request.Url(); - #endif - -+ DOMWrapperWorld& request_world = modulator_->GetScriptState()->World(); -+ // Prevents web service workers from intercepting isolated world dynamic -+ // script imports requests and responding with different contents. -+ // TODO(crbug.com/1296102): Link to documentation that describes the criteria -+ // where module imports are handled by service worker fetch handler. -+ resource_request.SetSkipServiceWorker(request_world.IsIsolatedWorld()); -+ - // ... destination is destination, ... - resource_request.SetRequestContext(module_request.ContextType()); - resource_request.SetRequestDestination(module_request.Destination()); - -- ResourceLoaderOptions options(&modulator_->GetScriptState()->World()); -+ ResourceLoaderOptions options(&request_world); - - // Set up the module script request given request and - // options. -diff --git a/chromium/third_party/blink/renderer/core/paint/sparse_vector.h b/chromium/third_party/blink/renderer/core/paint/sparse_vector.h -index 983d49f249e..ebc1c2a17bc 100644 ---- src/3rdparty/chromium/third_party/blink/renderer/core/paint/sparse_vector.h -+++ src/3rdparty/chromium/third_party/blink/renderer/core/paint/sparse_vector.h -@@ -108,10 +108,18 @@ class CORE_EXPORT SparseVector { - // Then count the total population of field IDs lower than that one we - // are looking for. The target field ID should be located at the index of - // of the total population. --#ifdef _MSC_VER -- return __popcnt(fields_bitfield_ & mask); --#else -+#if defined(__GNUC__) || defined(__clang__) - return __builtin_popcount(fields_bitfield_ & mask); -+#elif _MSVC_LANG >= 202002L // C++20 -+ return std::popcount(fields_bitfield_ & mask); -+#else -+ uint32_t v = (fields_bitfield_ & mask); -+ uint32_t c = v - ((v >> 1) & 0x55555555); -+ c = ((c >> 2) & 0x33333333) + (c & 0x33333333); -+ c = ((c >> 4) + c) & 0x0F0F0F0F; -+ c = ((c >> 8) + c) & 0x00FF00FF; -+ c = ((c >> 16) + c) & 0x0000FFFF; -+ return c; - #endif - } - -diff --git a/chromium/third_party/blink/renderer/core/testing/internals.cc b/chromium/third_party/blink/renderer/core/testing/internals.cc -index e3bda97e583..a56b6d8fbb3 100644 ---- src/3rdparty/chromium/third_party/blink/renderer/core/testing/internals.cc -+++ src/3rdparty/chromium/third_party/blink/renderer/core/testing/internals.cc -@@ -883,8 +883,8 @@ bool Internals::isLoading(const String& url) { - if (!document_) - return false; - const KURL full_url = document_->CompleteURL(url); -- const String cache_identifier = -- document_->Fetcher()->GetCacheIdentifier(full_url); -+ const String cache_identifier = document_->Fetcher()->GetCacheIdentifier( -+ full_url, /*skip_service_worker=*/false); - Resource* resource = - MemoryCache::Get()->ResourceForURL(full_url, cache_identifier); - // We check loader() here instead of isLoading(), because a multipart -@@ -896,8 +896,8 @@ bool Internals::isLoadingFromMemoryCache(const String& url) { - if (!document_) - return false; - const KURL full_url = document_->CompleteURL(url); -- const String cache_identifier = -- document_->Fetcher()->GetCacheIdentifier(full_url); -+ const String cache_identifier = document_->Fetcher()->GetCacheIdentifier( -+ full_url, /*skip_service_worker=*/false); - Resource* resource = - MemoryCache::Get()->ResourceForURL(full_url, cache_identifier); - return resource && resource->GetStatus() == ResourceStatus::kCached; -diff --git a/chromium/third_party/blink/renderer/modules/serial/serial_port_underlying_sink.cc b/chromium/third_party/blink/renderer/modules/serial/serial_port_underlying_sink.cc -index 136f27f1ab0..97bb637e329 100644 ---- src/3rdparty/chromium/third_party/blink/renderer/modules/serial/serial_port_underlying_sink.cc -+++ src/3rdparty/chromium/third_party/blink/renderer/modules/serial/serial_port_underlying_sink.cc -@@ -266,4 +266,10 @@ void SerialPortUnderlyingSink::PipeClosed() { - abort_handle_.Clear(); - } - -+void SerialPortUnderlyingSink::Dispose() { -+ // Ensure that `watcher_` is disarmed so that `OnHandleReady()` is not called -+ // after this object becomes garbage. -+ PipeClosed(); -+} -+ - } // namespace blink -diff --git a/chromium/third_party/blink/renderer/modules/serial/serial_port_underlying_sink.h b/chromium/third_party/blink/renderer/modules/serial/serial_port_underlying_sink.h -index 0b2070f01aa..a3ff78fc45c 100644 ---- src/3rdparty/chromium/third_party/blink/renderer/modules/serial/serial_port_underlying_sink.h -+++ src/3rdparty/chromium/third_party/blink/renderer/modules/serial/serial_port_underlying_sink.h -@@ -20,6 +20,8 @@ class SerialPort; - class WritableStreamDefaultController; - - class SerialPortUnderlyingSink final : public UnderlyingSinkBase { -+ USING_PRE_FINALIZER(SerialPortUnderlyingSink, Dispose); -+ - public: - SerialPortUnderlyingSink(SerialPort*, mojo::ScopedDataPipeProducerHandle); - -@@ -46,6 +48,7 @@ class SerialPortUnderlyingSink final : public UnderlyingSinkBase { - void OnFlushOrDrain(); - void WriteData(); - void PipeClosed(); -+ void Dispose(); - - mojo::ScopedDataPipeProducerHandle data_pipe_; - mojo::SimpleWatcher watcher_; -diff --git a/chromium/third_party/blink/renderer/modules/serial/serial_port_underlying_source.cc b/chromium/third_party/blink/renderer/modules/serial/serial_port_underlying_source.cc -index 1f4440001bf..c7d17260ddb 100644 ---- src/3rdparty/chromium/third_party/blink/renderer/modules/serial/serial_port_underlying_source.cc -+++ src/3rdparty/chromium/third_party/blink/renderer/modules/serial/serial_port_underlying_source.cc -@@ -225,4 +225,10 @@ void SerialPortUnderlyingSource::Close() { - data_pipe_.reset(); - } - -+void SerialPortUnderlyingSource::Dispose() { -+ // Ensure that `watcher_` is disarmed so that `OnHandleReady()` is not called -+ // after this object becomes garbage. -+ Close(); -+} -+ - } // namespace blink -diff --git a/chromium/third_party/blink/renderer/modules/serial/serial_port_underlying_source.h b/chromium/third_party/blink/renderer/modules/serial/serial_port_underlying_source.h -index 2ca0f471f54..eed40684716 100644 ---- src/3rdparty/chromium/third_party/blink/renderer/modules/serial/serial_port_underlying_source.h -+++ src/3rdparty/chromium/third_party/blink/renderer/modules/serial/serial_port_underlying_source.h -@@ -11,6 +11,7 @@ - #include "third_party/blink/renderer/bindings/core/v8/script_value.h" - #include "third_party/blink/renderer/core/execution_context/execution_context_lifecycle_observer.h" - #include "third_party/blink/renderer/core/streams/underlying_byte_source_base.h" -+#include "third_party/blink/renderer/platform/heap/prefinalizer.h" - - namespace blink { - -@@ -20,6 +21,8 @@ class SerialPort; - - class SerialPortUnderlyingSource : public UnderlyingByteSourceBase, - ExecutionContextLifecycleObserver { -+ USING_PRE_FINALIZER(SerialPortUnderlyingSource, Dispose); -+ - public: - SerialPortUnderlyingSource(ScriptState*, - SerialPort*, -@@ -46,6 +49,7 @@ class SerialPortUnderlyingSource : public UnderlyingByteSourceBase, - void OnFlush(ScriptPromiseResolver*); - void PipeClosed(); - void Close(); -+ void Dispose(); - - // TODO(crbug.com/1457493) : Remove when debugging is done. - MojoResult invalid_data_pipe_read_result_ = MOJO_RESULT_OK; -diff --git a/chromium/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.cc b/chromium/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.cc -index 5bfbe590f32..248c049c62c 100644 ---- src/3rdparty/chromium/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.cc -+++ src/3rdparty/chromium/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.cc -@@ -860,7 +860,8 @@ Resource* ResourceFetcher::CreateResourceForStaticData( - if (!archive_ && factory.GetType() == ResourceType::kRaw) - return nullptr; - -- const String cache_identifier = GetCacheIdentifier(url); -+ const String cache_identifier = GetCacheIdentifier( -+ url, params.GetResourceRequest().GetSkipServiceWorker()); - // Most off-main-thread resource fetches use Resource::kRaw and don't reach - // this point, but off-main-thread module fetches might. - if (IsMainThread()) { -@@ -1347,7 +1348,10 @@ Resource* ResourceFetcher::RequestResource(FetchParameters& params, - resource = nullptr; - } else { - resource = MemoryCache::Get()->ResourceForURL( -- params.Url(), GetCacheIdentifier(params.Url())); -+ params.Url(), -+ GetCacheIdentifier( -+ params.Url(), -+ params.GetResourceRequest().GetSkipServiceWorker())); - } - if (resource) { - policy = DetermineRevalidationPolicy(resource_type, params, *resource, -@@ -1604,7 +1608,8 @@ Resource* ResourceFetcher::CreateResourceForLoading( - const FetchParameters& params, - const ResourceFactory& factory) { - const String cache_identifier = -- GetCacheIdentifier(params.GetResourceRequest().Url()); -+ GetCacheIdentifier(params.GetResourceRequest().Url(), -+ params.GetResourceRequest().GetSkipServiceWorker()); - if (!base::FeatureList::IsEnabled( - blink::features::kScopeMemoryCachePerContext)) { - DCHECK(!IsMainThread() || params.IsStaleRevalidation() || -@@ -2605,9 +2610,11 @@ void ResourceFetcher::UpdateAllImageResourcePriorities() { - to_be_removed.clear(); - } - --String ResourceFetcher::GetCacheIdentifier(const KURL& url) const { -- if (properties_->GetControllerServiceWorkerMode() != -- mojom::ControllerServiceWorkerMode::kNoController) { -+String ResourceFetcher::GetCacheIdentifier(const KURL& url, -+ bool skip_service_worker) const { -+ if (!skip_service_worker && -+ properties_->GetControllerServiceWorkerMode() != -+ mojom::ControllerServiceWorkerMode::kNoController) { - return String::Number(properties_->ServiceWorkerId()); - } - -diff --git a/chromium/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.h b/chromium/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.h -index c437d854203..31e9774c178 100644 ---- src/3rdparty/chromium/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.h -+++ src/3rdparty/chromium/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.h -@@ -260,7 +260,11 @@ class PLATFORM_EXPORT ResourceFetcher - uint32_t inflight_keepalive_bytes); - blink::mojom::ControllerServiceWorkerMode IsControlledByServiceWorker() const; - -- String GetCacheIdentifier(const KURL& url) const; -+ // Returns a cache identifier for MemoryCache. -+ // `url` is used for finding a matching WebBundle. -+ // If `skip_service_worker` is true, the identifier won't be a ServiceWorker's -+ // identifier to keep the cache separated. -+ String GetCacheIdentifier(const KURL& url, bool skip_service_worker) const; - - // If `url` exists as a resource in a subresource bundle in this frame, - // returns its UnguessableToken; otherwise, returns absl::nullopt. -diff --git a/chromium/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/chromium/third_party/blink/renderer/platform/runtime_enabled_features.json5 -index c8c9459fad4..ff8dbd47b82 100644 ---- src/3rdparty/chromium/third_party/blink/renderer/platform/runtime_enabled_features.json5 -+++ src/3rdparty/chromium/third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -2749,6 +2749,10 @@ - base_feature: "none", - settable_from_internals: true, - }, -+ { -+ name: "PaintHoldingForIframes", -+ status: "test", -+ }, - { - // PARAKEET ad serving runtime flag/JS API. - name: "Parakeet", -diff --git a/chromium/third_party/dawn/src/tint/lang/wgsl/ast/transform/packed_vec3.cc b/chromium/third_party/dawn/src/tint/lang/wgsl/ast/transform/packed_vec3.cc -index c6f47805657..53ac72c89fb 100644 ---- src/3rdparty/chromium/third_party/dawn/src/tint/lang/wgsl/ast/transform/packed_vec3.cc -+++ src/3rdparty/chromium/third_party/dawn/src/tint/lang/wgsl/ast/transform/packed_vec3.cc -@@ -66,6 +66,14 @@ struct PackedVec3::State { - /// A map from type to the name of a helper function used to unpack that type. - Hashmap unpack_helpers; - -+ /// @returns true if @p addrspace requires vec3 types to be packed -+ bool AddressSpaceNeedsPacking(core::AddressSpace addrspace) { -+ // Host-shareable address spaces need to be packed to match the memory layout on the host. -+ // The workgroup address space needs to be packed so that the size of generated threadgroup -+ // variables matches the size of the original WGSL declarations. -+ return core::IsHostShareable(addrspace) || addrspace == core::AddressSpace::kWorkgroup; -+ } -+ - /// @param ty the type to test - /// @returns true if `ty` is a vec3, false otherwise - bool IsVec3(const core::type::Type* ty) { -@@ -342,7 +350,7 @@ struct PackedVec3::State { - // if the transform is necessary. - for (auto* decl : src->AST().GlobalVariables()) { - auto* var = sem.Get(decl); -- if (var && core::IsHostShareable(var->AddressSpace()) && -+ if (var && AddressSpaceNeedsPacking(var->AddressSpace()) && - ContainsVec3(var->Type()->UnwrapRef())) { - return true; - } -@@ -379,7 +387,7 @@ struct PackedVec3::State { - [&](const sem::TypeExpression* type) { - // Rewrite pointers to types that contain vec3s. - auto* ptr = type->Type()->As(); -- if (ptr && core::IsHostShareable(ptr->AddressSpace())) { -+ if (ptr && AddressSpaceNeedsPacking(ptr->AddressSpace())) { - auto new_store_type = RewriteType(ptr->StoreType()); - if (new_store_type) { - auto access = ptr->AddressSpace() == core::AddressSpace::kStorage -@@ -392,7 +400,7 @@ struct PackedVec3::State { - } - }, - [&](const sem::Variable* var) { -- if (!core::IsHostShareable(var->AddressSpace())) { -+ if (!AddressSpaceNeedsPacking(var->AddressSpace())) { - return; - } - -@@ -408,7 +416,7 @@ struct PackedVec3::State { - auto* lhs = sem.GetVal(assign->lhs); - auto* rhs = sem.GetVal(assign->rhs); - if (!ContainsVec3(rhs->Type()) || -- !core::IsHostShareable( -+ !AddressSpaceNeedsPacking( - lhs->Type()->As()->AddressSpace())) { - // Skip assignments to address spaces that are not host-shareable, or - // that do not contain vec3 types. -@@ -436,7 +444,7 @@ struct PackedVec3::State { - [&](const sem::Load* load) { - // Unpack loads of types that contain vec3s in host-shareable address spaces. - if (ContainsVec3(load->Type()) && -- core::IsHostShareable(load->ReferenceType()->AddressSpace())) { -+ AddressSpaceNeedsPacking(load->ReferenceType()->AddressSpace())) { - to_unpack.Add(load); - } - }, -@@ -446,7 +454,7 @@ struct PackedVec3::State { - // struct. - if (auto* ref = accessor->Type()->As()) { - if (IsVec3(ref->StoreType()) && -- core::IsHostShareable(ref->AddressSpace())) { -+ AddressSpaceNeedsPacking(ref->AddressSpace())) { - ctx.Replace(node, b.MemberAccessor(ctx.Clone(accessor->Declaration()), - kStructMemberName)); - } -diff --git a/chromium/third_party/dawn/src/tint/lang/wgsl/resolver/validator.cc b/chromium/third_party/dawn/src/tint/lang/wgsl/resolver/validator.cc -index 42f7e840d1d..f15bb8095f4 100644 ---- src/3rdparty/chromium/third_party/dawn/src/tint/lang/wgsl/resolver/validator.cc -+++ src/3rdparty/chromium/third_party/dawn/src/tint/lang/wgsl/resolver/validator.cc -@@ -438,10 +438,6 @@ bool Validator::AddressSpaceLayout(const core::type::Type* store_ty, - return true; - } - -- if (!core::IsHostShareable(address_space)) { -- return true; -- } -- - auto note_usage = [&] { - AddNote("'" + store_ty->FriendlyName() + "' used in address space '" + - tint::ToString(address_space) + "' here", -@@ -518,6 +514,22 @@ bool Validator::AddressSpaceLayout(const core::type::Type* store_ty, - return false; - } - } -+ -+ // If an alignment was explicitly specified, we need to validate that it satisfies the -+ // alignment requirement of the address space. -+ auto* align_attr = -+ ast::GetAttribute(m->Declaration()->attributes); -+ if (align_attr && !enabled_extensions_.Contains( -+ wgsl::Extension::kChromiumInternalRelaxedUniformLayout)) { -+ auto align = sem_.GetVal(align_attr->expr)->ConstantValue()->ValueAs(); -+ if (align % required_align != 0) { -+ AddError(align_attr->expr->source) -+ << "alignment must be a multiple of " << style::Literal(required_align) -+ << " bytes for the " << style::Enum(address_space) << " address space"; -+ note_usage(); -+ return false; -+ } -+ } - } - } - -diff --git a/chromium/third_party/dawn/third_party/dxc/lib/Transforms/Scalar/DxilConditionalMem2Reg.cpp b/chromium/third_party/dawn/third_party/dxc/lib/Transforms/Scalar/DxilConditionalMem2Reg.cpp -index 79a250de94f..026d2aacd0c 100644 ---- src/3rdparty/chromium/third_party/dawn/third_party/dxc/lib/Transforms/Scalar/DxilConditionalMem2Reg.cpp -+++ src/3rdparty/chromium/third_party/dawn/third_party/dxc/lib/Transforms/Scalar/DxilConditionalMem2Reg.cpp -@@ -257,14 +257,17 @@ class DxilConditionalMem2Reg : public FunctionPass { - static bool ScalarizePreciseVectorAlloca(Function &F) { - BasicBlock *Entry = &*F.begin(); - -- bool Changed = false; -+ SmallVector PreciseAllocaInsts; - for (auto it = Entry->begin(); it != Entry->end();) { - Instruction *I = &*(it++); - AllocaInst *AI = dyn_cast(I); - if (!AI || !AI->getAllocatedType()->isVectorTy()) continue; - if (!HLModule::HasPreciseAttributeWithMetadata(AI)) continue; -+ PreciseAllocaInsts.push_back(AI); -+ } - -- -+ bool Changed = false; -+ for (auto AI : PreciseAllocaInsts) { - IRBuilder<> B(AI); - VectorType *VTy = cast(AI->getAllocatedType()); - Type *ScalarTy = VTy->getVectorElementType(); -diff --git a/chromium/third_party/devtools-frontend/src/front_end/panels/network/NetworkLogView.ts b/chromium/third_party/devtools-frontend/src/front_end/panels/network/NetworkLogView.ts -index f2cc8ca2ef3..73d6e02d1fe 100644 ---- src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/panels/network/NetworkLogView.ts -+++ src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/panels/network/NetworkLogView.ts -@@ -2184,8 +2184,7 @@ export class NetworkLogView extends Common.ObjectWrapper.eventMixin(['accept-encoding', 'host', 'method', 'path', 'scheme', 'version']); - - function escapeStringWin(str: string): string { -- /* If there are no new line characters do not escape the " characters -- since it only uglifies the command. -+ /* Always escape the " characters so that we can use caret escaping. - - Because cmd.exe parser and MS Crt arguments parsers use some of the - same escape characters, they can interact with each other in -@@ -2211,11 +2210,11 @@ export class NetworkLogView extends Common.ObjectWrapper.eventMixinm_errorCode = XML_ERROR_INVALID_ARGUMENT; -+ return XML_STATUS_ERROR; -+ } -+ - switch (parser->m_parsingStatus.parsing) { - case XML_SUSPENDED: - parser->m_errorCode = XML_ERROR_SUSPENDED; -@@ -6886,6 +6892,16 @@ dtdCopy(XML_Parser oldParser, DTD *newDtd, const DTD *oldDtd, - if (! newE) - return 0; - if (oldE->nDefaultAtts) { -+ /* Detect and prevent integer overflow. -+ * The preprocessor guard addresses the "always false" warning -+ * from -Wtype-limits on platforms where -+ * sizeof(int) < sizeof(size_t), e.g. on x86_64. */ -+#if UINT_MAX >= SIZE_MAX -+ if ((size_t)oldE->nDefaultAtts -+ > ((size_t)(-1) / sizeof(DEFAULT_ATTRIBUTE))) { -+ return 0; -+ } -+#endif - newE->defaultAtts - = ms->malloc_fcn(oldE->nDefaultAtts * sizeof(DEFAULT_ATTRIBUTE)); - if (! newE->defaultAtts) { -@@ -7428,6 +7444,15 @@ nextScaffoldPart(XML_Parser parser) { - int next; - - if (! dtd->scaffIndex) { -+ /* Detect and prevent integer overflow. -+ * The preprocessor guard addresses the "always false" warning -+ * from -Wtype-limits on platforms where -+ * sizeof(unsigned int) < sizeof(size_t), e.g. on x86_64. */ -+#if UINT_MAX >= SIZE_MAX -+ if (parser->m_groupSize > ((size_t)(-1) / sizeof(int))) { -+ return -1; -+ } -+#endif - dtd->scaffIndex = (int *)MALLOC(parser, parser->m_groupSize * sizeof(int)); - if (! dtd->scaffIndex) - return -1; -diff --git a/chromium/third_party/ipcz/src/ipcz/node_link.cc b/chromium/third_party/ipcz/src/ipcz/node_link.cc -index 2fe981a9a2e..fc7b186eda0 100644 ---- src/3rdparty/chromium/third_party/ipcz/src/ipcz/node_link.cc -+++ src/3rdparty/chromium/third_party/ipcz/src/ipcz/node_link.cc -@@ -36,21 +36,6 @@ - - namespace ipcz { - --namespace { -- --template --FragmentRef MaybeAdoptFragmentRef(NodeLinkMemory& memory, -- const FragmentDescriptor& descriptor) { -- if (descriptor.is_null() || descriptor.size() < sizeof(T) || -- descriptor.offset() % 8 != 0) { -- return {}; -- } -- -- return memory.AdoptFragmentRef(memory.GetFragment(descriptor)); --} -- --} // namespace -- - // static - Ref NodeLink::CreateActive(Ref node, - LinkSide link_side, -@@ -702,8 +687,8 @@ bool NodeLink::OnAcceptBypassLink(msg::AcceptBypassLink& accept) { - return true; - } - -- auto link_state = MaybeAdoptFragmentRef( -- memory(), accept.params().new_link_state_fragment); -+ auto link_state = memory().AdoptFragmentRefIfValid( -+ accept.params().new_link_state_fragment); - if (link_state.is_null()) { - // Bypass links must always come with a valid fragment for their - // RouterLinkState. If one has not been provided, that's a validation -@@ -745,8 +730,8 @@ bool NodeLink::OnBypassPeerWithLink(msg::BypassPeerWithLink& bypass) { - return true; - } - -- auto link_state = MaybeAdoptFragmentRef( -- memory(), bypass.params().new_link_state_fragment); -+ auto link_state = memory().AdoptFragmentRefIfValid( -+ bypass.params().new_link_state_fragment); - if (link_state.is_null()) { - return false; - } -diff --git a/chromium/third_party/ipcz/src/ipcz/node_link_memory.h b/chromium/third_party/ipcz/src/ipcz/node_link_memory.h -index df8010b595f..ba04a7c03da 100644 ---- src/3rdparty/chromium/third_party/ipcz/src/ipcz/node_link_memory.h -+++ src/3rdparty/chromium/third_party/ipcz/src/ipcz/node_link_memory.h -@@ -86,14 +86,29 @@ class NodeLinkMemory : public RefCounted { - // with the same BufferId and dimensions as `descriptor`. - Fragment GetFragment(const FragmentDescriptor& descriptor); - -- // Adopts an existing reference to a RefCountedFragment within `fragment`. -- // This does NOT increment the ref count of the RefCountedFragment. -+ // Adopts an existing reference to a RefCountedFragment within `fragment`, -+ // which must be a valid, properly aligned, and sufficiently sized fragment to -+ // hold a T. This does NOT increment the ref count of the RefCountedFragment. - template - FragmentRef AdoptFragmentRef(const Fragment& fragment) { - ABSL_ASSERT(sizeof(T) <= fragment.size()); - return FragmentRef(kAdoptExistingRef, WrapRefCounted(this), fragment); - } - -+ // Attempts to adopt an existing reference to a RefCountedFragment located at -+ // `fragment`. Returns null if the fragment descriptor is null, misaligned, -+ // or of insufficient size. This does NOT increment the ref count of the -+ // RefCountedFragment. -+ template -+ FragmentRef AdoptFragmentRefIfValid(const FragmentDescriptor& descriptor) { -+ if (descriptor.is_null() || descriptor.size() < sizeof(T) || -+ descriptor.offset() % 8 != 0) { -+ return {}; -+ } -+ -+ return AdoptFragmentRef(GetFragment(descriptor)); -+ } -+ - // Adds a new buffer to the underlying BufferPool to use as additional - // allocation capacity for blocks of size `block_size`. Note that the - // contents of the mapped region must already be initialized as a -diff --git a/chromium/third_party/ipcz/src/ipcz/router.cc b/chromium/third_party/ipcz/src/ipcz/router.cc -index 09988c04fe9..45ab0135459 100644 ---- src/3rdparty/chromium/third_party/ipcz/src/ipcz/router.cc -+++ src/3rdparty/chromium/third_party/ipcz/src/ipcz/router.cc -@@ -764,12 +764,17 @@ Ref Router::Deserialize(const RouterDescriptor& descriptor, - ? descriptor.decaying_incoming_sequence_length - : descriptor.next_incoming_sequence_number); - -+ auto link_state = -+ from_node_link.memory().AdoptFragmentRefIfValid( -+ descriptor.new_link_state_fragment); -+ if (link_state.is_null()) { -+ // Central links require a valid link state fragment. -+ return nullptr; -+ } - new_outward_link = from_node_link.AddRemoteRouterLink( - context, descriptor.new_sublink, -- from_node_link.memory().AdoptFragmentRef( -- from_node_link.memory().GetFragment( -- descriptor.new_link_state_fragment)), -- LinkType::kCentral, LinkSide::kB, router); -+ std::move(link_state), LinkType::kCentral, -+ LinkSide::kB, router); - if (!new_outward_link) { - return nullptr; - } -diff --git a/chromium/third_party/perfetto/include/perfetto/base/compiler.h b/chromium/third_party/perfetto/include/perfetto/base/compiler.h -index 85678cc768c..ae7bf0aa10a 100644 ---- src/3rdparty/chromium/third_party/perfetto/include/perfetto/base/compiler.h -+++ src/3rdparty/chromium/third_party/perfetto/include/perfetto/base/compiler.h -@@ -76,9 +76,31 @@ - - #if defined(__GNUC__) || defined(__clang__) - #define PERFETTO_POPCOUNT(x) __builtin_popcountll(x) --#else -+#elif defined(__AVX__) || defined(__SSE4_2__) || defined(__POPCNT__) - #include - #define PERFETTO_POPCOUNT(x) __popcnt64(x) -+#else -+#if _MSVC_LANG >= 202002L || (__cplusplus > 201703L && __has_include()) // C++20 -+#include -+#endif -+template , int> = 0> -+inline uint32_t qPopulationCount(ValueType v) noexcept -+{ -+#if defined(__cpp_lib_bitops) -+ return std::popcount(v); -+#else -+ // we static_cast these bit patterns in order to truncate them to the correct size -+ v = static_cast(v - ((v >> 1) & static_cast(0x5555'5555'5555'5555ull))); -+ v = static_cast((v & static_cast(0x3333'3333'3333'3333ull)) -+ + ((v >> 2) & static_cast(0x3333'3333'3333'3333ull))); -+ v = static_cast((v + (v >> 4)) & static_cast(0x0F0F'0F0F'0F0F'0F0Full)); -+ // Multiply by one in each byte, so that it will have the sum of all source bytes in the highest byte -+ v = static_cast(v * static_cast(0x0101'0101'0101'0101ull)); -+ // Extract highest byte -+ return static_cast(v >> (sizeof(ValueType) * CHAR_BIT - 8)); -+#endif -+} -+#define PERFETTO_POPCOUNT(x) qPopulationCount(x) - #endif - - #if defined(__clang__) -diff --git a/chromium/third_party/skia/src/gpu/ganesh/ops/DrawAtlasOp.cpp b/chromium/third_party/skia/src/gpu/ganesh/ops/DrawAtlasOp.cpp -index a3d7e4ddabb..7faa16de5df 100644 ---- src/3rdparty/chromium/third_party/skia/src/gpu/ganesh/ops/DrawAtlasOp.cpp -+++ src/3rdparty/chromium/third_party/skia/src/gpu/ganesh/ops/DrawAtlasOp.cpp -@@ -112,6 +112,7 @@ DrawAtlasOpImpl::DrawAtlasOpImpl(GrProcessorSet* processorSet, const SkPMColor4f - : GrMeshDrawOp(ClassID()), fHelper(processorSet, aaType), fColor(color) { - SkASSERT(xforms); - SkASSERT(rects); -+ SkASSERT(spriteCount >= 0); - - fViewMatrix = viewMatrix; - Geometry& installedGeo = fGeoData.push_back(); -@@ -127,6 +128,11 @@ DrawAtlasOpImpl::DrawAtlasOpImpl(GrProcessorSet* processorSet, const SkPMColor4f - vertexStride += sizeof(GrColor); - } - -+ // Bail out if we'd overflow from a really large draw -+ if (spriteCount > SK_MaxS32 / static_cast(4 * vertexStride)) { -+ return; -+ } -+ - // Compute buffer size and alloc buffer - fQuadCount = spriteCount; - int allocSize = static_cast(4 * vertexStride * spriteCount); -diff --git a/chromium/third_party/webrtc/modules/desktop_capture/mac/screen_capturer_mac.mm b/chromium/third_party/webrtc/modules/desktop_capture/mac/screen_capturer_mac.mm -index 8f0c68d48b4..1cf029186b0 100644 ---- src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/mac/screen_capturer_mac.mm -+++ src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/mac/screen_capturer_mac.mm -@@ -20,6 +20,11 @@ - #include "rtc_base/trace_event.h" - #include "sdk/objc/helpers/scoped_cftyperef.h" - -+// Build fix for macOS SDK 15 and newer -+#if !defined(CG_AVAILABLE_BUT_DEPRECATED) -+#define CG_AVAILABLE_BUT_DEPRECATED(a,b,c) -+#endif -+ - // All these symbols have incorrect availability annotations in the 13.3 SDK. - // These have the correct annotation. See https://crbug.com/1431897. - // TODO(thakis): Remove this once FB12109479 is fixed and we updated to an SDK -diff --git a/chromium/ui/views/views_features.cc b/chromium/ui/views/views_features.cc -index 9c296ba65e0..2641a68539b 100644 ---- src/3rdparty/chromium/ui/views/views_features.cc -+++ src/3rdparty/chromium/ui/views/views_features.cc -@@ -17,6 +17,14 @@ BASE_FEATURE(kEnablePlatformHighContrastInkDrop, - "EnablePlatformHighContrastInkDrop", - base::FEATURE_DISABLED_BY_DEFAULT); - -+// Handle mouse cursor being out sync with a touch drag operation. If mouse -+// cursor is over different window, drag will not start, and cursor will be -+// moved to the window where the touch drag started. This is a kill switch -+// for this new logic, crbug.com/370856871. -+BASE_FEATURE(kEnableTouchDragCursorSync, -+ "EnableTouchDragCursorSync", -+ base::FEATURE_ENABLED_BY_DEFAULT); -+ - // Only paint views that are invalidated/dirty (i.e. a paint was directly - // scheduled on those views) as opposed to painting all views that intersect - // an invalid rectangle on the layer. -diff --git a/chromium/ui/views/views_features.h b/chromium/ui/views/views_features.h -index 3aa4134a57b..682a2cec4df 100644 ---- src/3rdparty/chromium/ui/views/views_features.h -+++ src/3rdparty/chromium/ui/views/views_features.h -@@ -13,6 +13,7 @@ namespace views::features { - - // Please keep alphabetized. - VIEWS_EXPORT BASE_DECLARE_FEATURE(kEnablePlatformHighContrastInkDrop); -+VIEWS_EXPORT BASE_DECLARE_FEATURE(kEnableTouchDragCursorSync); - VIEWS_EXPORT BASE_DECLARE_FEATURE(kEnableViewPaintOptimization); - VIEWS_EXPORT BASE_DECLARE_FEATURE(kWidgetLayering); - -diff --git a/chromium/ui/views/widget/desktop_aura/desktop_drag_drop_client_win.cc b/chromium/ui/views/widget/desktop_aura/desktop_drag_drop_client_win.cc -index da61095385f..450530b6058 100644 ---- src/3rdparty/chromium/ui/views/widget/desktop_aura/desktop_drag_drop_client_win.cc -+++ src/3rdparty/chromium/ui/views/widget/desktop_aura/desktop_drag_drop_client_win.cc -@@ -8,6 +8,7 @@ - - #include "base/metrics/histogram_macros.h" - #include "base/threading/hang_watcher.h" -+#include "ui/aura/env.h" - #include "ui/base/dragdrop/drag_drop_types.h" - #include "ui/base/dragdrop/drag_source_win.h" - #include "ui/base/dragdrop/drop_target_event.h" -@@ -15,6 +16,7 @@ - #include "ui/base/dragdrop/os_exchange_data_provider_win.h" - #include "ui/base/win/event_creation_utils.h" - #include "ui/display/win/screen_win.h" -+#include "ui/views/views_features.h" - #include "ui/views/widget/desktop_aura/desktop_drop_target_win.h" - #include "ui/views/widget/desktop_aura/desktop_window_tree_host_win.h" - -@@ -42,12 +44,34 @@ ui::mojom::DragOperation DesktopDragDropClientWin::StartDragAndDrop( - const gfx::Point& screen_location, - int allowed_operations, - ui::mojom::DragEventSource source) { -- drag_drop_in_progress_ = true; - gfx::Point touch_screen_point; - if (source == ui::mojom::DragEventSource::kTouch) { -+ display::Screen* screen = display::Screen::GetScreen(); -+ CHECK(screen); -+ aura::Window* window = -+ screen->GetWindowAtScreenPoint(screen->GetCursorScreenPoint()); - touch_screen_point = - screen_location + source_window->GetBoundsInScreen().OffsetFromOrigin(); - source_window->GetHost()->ConvertDIPToPixels(&touch_screen_point); -+ bool touch_down = aura::Env::GetInstance()->is_touch_down(); -+ bool touch_over_other_window = -+ !window || window->GetRootWindow() != root_window; -+ bool touch_drag_cursor_sync = -+ base::FeatureList::IsEnabled(features::kEnableTouchDragCursorSync); -+ // If attempting to start a touch drag with the cursor over another window, -+ // move cursor to this window so the next drag attempt will succeed. -+ // TODO(crbug.com/40312079): Mouse cursor needs to follow long press touch -+ // events for this to be smoother, but ::SetCursorPos needs to be called -+ // well before calling ::DoDragDrop. -+ if (touch_drag_cursor_sync && touch_down && touch_over_other_window) { -+ ::SetCursorPos(touch_screen_point.x(), touch_screen_point.y()); -+ } -+ // Check that the cursor is over the window being dragged from. If not, -+ // don't start the drag because ::DoDragDrop will not do the drag. -+ if (touch_drag_cursor_sync && (!touch_down || touch_over_other_window)) { -+ return ui::PreferredDragOperation( -+ ui::DragDropTypes::DropEffectToDragOperation(DROPEFFECT_NONE)); -+ } - desktop_host_->StartTouchDrag(touch_screen_point); - // Gesture state gets left in a state where you can't start - // another drag, unless it's cleaned up. Cleaning it up before starting -@@ -57,6 +81,7 @@ ui::mojom::DragOperation DesktopDragDropClientWin::StartDragAndDrop( - } - base::WeakPtr alive(weak_factory_.GetWeakPtr()); - -+ drag_drop_in_progress_ = true; - drag_source_ = ui::DragSourceWin::Create(); - Microsoft::WRL::ComPtr drag_source_copy = drag_source_; - drag_source_copy->set_data(data.get()); -diff --git a/chromium/ui/views/widget/root_view.cc b/chromium/ui/views/widget/root_view.cc -index ace679c7cc9..1dd799a55c2 100644 ---- src/3rdparty/chromium/ui/views/widget/root_view.cc -+++ src/3rdparty/chromium/ui/views/widget/root_view.cc -@@ -60,37 +60,6 @@ class MouseEnterExitEvent : public ui::MouseEvent { - } - }; - --// TODO(crbug.com/1295290): This class is for debug purpose only. --// Remove it after resolving the issue. --class DanglingMouseMoveHandlerOnViewDestroyingChecker -- : public views::ViewObserver { -- public: -- explicit DanglingMouseMoveHandlerOnViewDestroyingChecker( -- const raw_ptr& -- mouse_move_handler) -- : mouse_move_handler_(mouse_move_handler) { -- scoped_observation.Observe(mouse_move_handler_); -- } -- -- // views::ViewObserver: -- void OnViewIsDeleting(views::View* view) override { -- // `mouse_move_handler_` should be nulled before `view` dies. Otherwise -- // `mouse_move_handler_` will become a dangling pointer. -- CHECK(!mouse_move_handler_); -- scoped_observation.Reset(); -- } -- -- private: -- base::ScopedObservation scoped_observation{ -- this}; -- // Excluded from `raw_ref` rewriter which would otherwise turn this -- // into a `raw_ref>`. The current `raw_ptr&` setup is -- // intentional and used to observe the pointer without counting as a -- // live reference to the underlying memory. -- RAW_PTR_EXCLUSION const raw_ptr& -- mouse_move_handler_; --}; -- - } // namespace - - // Used by RootView to create a hidden child that can be used to make screen -@@ -667,16 +636,21 @@ void RootView::ViewHierarchyChanged( - widget_->ViewHierarchyChanged(details); - - if (!details.is_add && !details.move_view) { -- if (!explicit_mouse_handler_ && mouse_pressed_handler_ == details.child) -- mouse_pressed_handler_ = nullptr; -- if (mouse_move_handler_ == details.child) -+ if (mouse_pressed_handler_ == details.child) { -+ SetMouseHandler(nullptr); -+ } -+ if (mouse_move_handler_ == details.child) { - mouse_move_handler_ = nullptr; -- if (gesture_handler_ == details.child) -+ } -+ if (gesture_handler_ == details.child) { - gesture_handler_ = nullptr; -- if (event_dispatch_target_ == details.child) -+ } -+ if (event_dispatch_target_ == details.child) { - event_dispatch_target_ = nullptr; -- if (old_dispatch_target_ == details.child) -+ } -+ if (old_dispatch_target_ == details.child) { - old_dispatch_target_ = nullptr; -+ } - } - } - -@@ -779,8 +753,6 @@ void RootView::HandleMouseEnteredOrMoved(const ui::MouseEvent& event) { - mouse_move_handler_ = v; - // TODO(crbug.com/1295290): This is for debug purpose only. - // Remove it after resolving the issue. -- DanglingMouseMoveHandlerOnViewDestroyingChecker -- mouse_move_handler_dangling_checker(mouse_move_handler_); - if (!mouse_move_handler_->GetNotifyEnterExitOnChild() || - !mouse_move_handler_->Contains(old_handler)) { - MouseEnterExitEvent entered(event, ui::ET_MOUSE_ENTERED); -diff --git a/chromium/ui/views/widget/root_view.h b/chromium/ui/views/widget/root_view.h -index 80fc491f87a..4daee866abf 100644 ---- src/3rdparty/chromium/ui/views/widget/root_view.h -+++ src/3rdparty/chromium/ui/views/widget/root_view.h -@@ -132,6 +132,9 @@ class VIEWS_EXPORT RootView : public View, - const views::View* gesture_handler_for_testing() const { - return gesture_handler_; - } -+ const views::View* mouse_pressed_handler_for_testing() const { -+ return mouse_pressed_handler_.get(); -+ } - - protected: - // View: -@@ -205,7 +208,7 @@ class VIEWS_EXPORT RootView : public View, - // ViewTargeter / RootViewTargeter. - - // The view currently handing down - drag - up -- raw_ptr mouse_pressed_handler_ = nullptr; -+ raw_ptr mouse_pressed_handler_ = nullptr; - - // The view currently handling enter / exit - raw_ptr mouse_move_handler_ = nullptr; -diff --git a/chromium/ui/views/widget/root_view_unittest.cc b/chromium/ui/views/widget/root_view_unittest.cc -index 388dd6f1125..68a691b348a 100644 ---- src/3rdparty/chromium/ui/views/widget/root_view_unittest.cc -+++ src/3rdparty/chromium/ui/views/widget/root_view_unittest.cc -@@ -228,10 +228,12 @@ TEST_F(RootViewTest, EventHandlersResetWhenDeleted) { - View* event_handler = state.AddChildView(std::make_unique()); - root_view->SetMouseAndGestureHandler(event_handler); - ASSERT_EQ(event_handler, root_view->gesture_handler_for_testing()); -+ ASSERT_EQ(event_handler, root_view->mouse_pressed_handler_for_testing()); - - // Delete the child and expect that there is no longer a mouse handler. - root_view->GetContentsView()->RemoveChildViewT(event_handler); - EXPECT_EQ(nullptr, root_view->gesture_handler_for_testing()); -+ EXPECT_EQ(nullptr, root_view->mouse_pressed_handler_for_testing()); - } - - TEST_F(RootViewTest, EventHandlersNotResetWhenReparented) { -diff --git a/chromium/v8/src/compiler/access-info.cc b/chromium/v8/src/compiler/access-info.cc -index 92405188f28..ac19b0a2178 100644 ---- src/3rdparty/chromium/v8/src/compiler/access-info.cc -+++ src/3rdparty/chromium/v8/src/compiler/access-info.cc -@@ -919,6 +919,7 @@ PropertyAccessInfo AccessInfoFactory::ComputePropertyAccessInfo( - return PropertyAccessInfo::NotFound(zone(), receiver_map, holder); - } - -+ CHECK(prototype.IsJSObject()); - holder = prototype.AsJSObject(); - map = map_prototype_map; - -diff --git a/chromium/v8/src/compiler/heap-refs.cc b/chromium/v8/src/compiler/heap-refs.cc -index 932f0be7872..4c7d00d6a4d 100644 ---- src/3rdparty/chromium/v8/src/compiler/heap-refs.cc -+++ src/3rdparty/chromium/v8/src/compiler/heap-refs.cc -@@ -1610,6 +1610,7 @@ HolderLookupResult FunctionTemplateInfoRef::LookupHolderOfExpectedType( - if (!expected_receiver_type->IsTemplateFor(prototype.object()->map())) { - return not_found; - } -+ CHECK(prototype.IsJSObject()); - return HolderLookupResult(CallOptimization::kHolderFound, - prototype.AsJSObject()); - } -diff --git a/chromium/v8/src/compiler/js-call-reducer.cc b/chromium/v8/src/compiler/js-call-reducer.cc -index caec49b87c5..e7f89542a46 100644 ---- src/3rdparty/chromium/v8/src/compiler/js-call-reducer.cc -+++ src/3rdparty/chromium/v8/src/compiler/js-call-reducer.cc -@@ -3715,14 +3715,13 @@ bool CanInlineJSToWasmCall(const wasm::FunctionSig* wasm_signature) { - return false; - } - -- wasm::ValueType externRefNonNull = wasm::kWasmExternRef.AsNonNull(); - for (auto type : wasm_signature->all()) { - #if defined(V8_TARGET_ARCH_32_BIT) - if (type == wasm::kWasmI64) return false; - #endif - if (type != wasm::kWasmI32 && type != wasm::kWasmI64 && - type != wasm::kWasmF32 && type != wasm::kWasmF64 && -- type != wasm::kWasmExternRef && type != externRefNonNull) { -+ type != wasm::kWasmExternRef) { - return false; - } - } -diff --git a/chromium/v8/src/compiler/js-native-context-specialization.cc b/chromium/v8/src/compiler/js-native-context-specialization.cc -index 8f37860aefe..089b6410528 100644 ---- src/3rdparty/chromium/v8/src/compiler/js-native-context-specialization.cc -+++ src/3rdparty/chromium/v8/src/compiler/js-native-context-specialization.cc -@@ -878,7 +878,9 @@ JSNativeContextSpecialization::InferHasInPrototypeChain( - // might be a different object each time, so it's much simpler to include - // {prototype}. That does, however, mean that we must check {prototype}'s - // map stability. -- if (!prototype.map(broker()).is_stable()) return kMayBeInPrototypeChain; -+ if (!prototype.IsJSObject() || !prototype.map(broker()).is_stable()) { -+ return kMayBeInPrototypeChain; -+ } - last_prototype = prototype.AsJSObject(); - } - WhereToStart start = result == NodeProperties::kUnreliableMaps -diff --git a/chromium/v8/src/execution/local-isolate.cc b/chromium/v8/src/execution/local-isolate.cc -index ca5ed58ae63..568a6fe0cf9 100644 ---- src/3rdparty/chromium/v8/src/execution/local-isolate.cc -+++ src/3rdparty/chromium/v8/src/execution/local-isolate.cc -@@ -64,8 +64,7 @@ bool StackLimitCheck::HasOverflowed(LocalIsolate* local_isolate) { - #ifdef V8_INTL_SUPPORT - // WARNING: This might be out-of-sync with the main-thread. - const std::string& LocalIsolate::DefaultLocale() { -- const std::string& res = -- is_main_thread() ? isolate_->DefaultLocale() : default_locale_; -+ const std::string& res = isolate_->DefaultLocale(); - DCHECK(!res.empty()); - return res; - } -diff --git a/chromium/v8/src/execution/local-isolate.h b/chromium/v8/src/execution/local-isolate.h -index b9cdec9e703..08aa92d712d 100644 ---- src/3rdparty/chromium/v8/src/execution/local-isolate.h -+++ src/3rdparty/chromium/v8/src/execution/local-isolate.h -@@ -185,9 +185,6 @@ class V8_EXPORT_PRIVATE LocalIsolate final : private HiddenLocalFactory { - base::Optional rcs_scope_; - RuntimeCallStats* runtime_call_stats_; - #endif --#ifdef V8_INTL_SUPPORT -- std::string default_locale_; --#endif - }; - - template -diff --git a/chromium/v8/src/maglev/maglev-graph-builder.cc b/chromium/v8/src/maglev/maglev-graph-builder.cc -index 2e7756703f4..406f436a44c 100644 ---- src/3rdparty/chromium/v8/src/maglev/maglev-graph-builder.cc -+++ src/3rdparty/chromium/v8/src/maglev/maglev-graph-builder.cc -@@ -5080,15 +5080,21 @@ void MaglevGraphBuilder::VisitDeletePropertySloppy() { - - void MaglevGraphBuilder::VisitGetSuperConstructor() { - ValueNode* active_function = GetAccumulatorTagged(); -- ValueNode* map_proto; -+ // TODO(victorgomes): Maybe BuildLoadTaggedField should support constants -+ // instead. - if (compiler::OptionalHeapObjectRef constant = - TryGetConstant(active_function)) { -- map_proto = GetConstant(constant->map(broker()).prototype(broker())); -- } else { -- ValueNode* map = -- AddNewNode({active_function}, HeapObject::kMapOffset); -- map_proto = AddNewNode({map}, Map::kPrototypeOffset); -+ compiler::MapRef map = constant->map(broker()); -+ if (map.is_stable()) { -+ broker()->dependencies()->DependOnStableMap(map); -+ ValueNode* map_proto = GetConstant(map.prototype(broker())); -+ StoreRegister(iterator_.GetRegisterOperand(0), map_proto); -+ return; -+ } - } -+ ValueNode* map = -+ AddNewNode({active_function}, HeapObject::kMapOffset); -+ ValueNode* map_proto = AddNewNode({map}, Map::kPrototypeOffset); - StoreRegister(iterator_.GetRegisterOperand(0), map_proto); - } - -diff --git a/chromium/v8/src/runtime/runtime-wasm.cc b/chromium/v8/src/runtime/runtime-wasm.cc -index 34851fe10da..6d4d445bc60 100644 ---- src/3rdparty/chromium/v8/src/runtime/runtime-wasm.cc -+++ src/3rdparty/chromium/v8/src/runtime/runtime-wasm.cc -@@ -468,7 +468,16 @@ RUNTIME_FUNCTION(Runtime_TierUpWasmToJSWrapper) { - isolate); - if (IsTuple2(*origin)) { - Handle tuple = Handle::cast(origin); -- instance = handle(WasmInstanceObject::cast(tuple->value1()), isolate); -+ Handle call_origin_instance(handle(WasmInstanceObject::cast(tuple->value1()), isolate)); -+ if (call_origin_instance->module() != instance->module()) { -+ for (wasm::ValueType type : sig.all()) { -+ if (type.has_index()) { -+ ref->set_wrapper_budget(Smi::kMaxValue); -+ return ReadOnlyRoots(isolate).undefined_value(); -+ } -+ } -+ } -+ instance = call_origin_instance; - origin = handle(tuple->value2(), isolate); - } - -diff --git a/chromium/v8/src/wasm/baseline/x64/liftoff-assembler-x64.h b/chromium/v8/src/wasm/baseline/x64/liftoff-assembler-x64.h -index 46a756bbae2..1d4fc72fe50 100644 ---- src/3rdparty/chromium/v8/src/wasm/baseline/x64/liftoff-assembler-x64.h -+++ src/3rdparty/chromium/v8/src/wasm/baseline/x64/liftoff-assembler-x64.h -@@ -66,7 +66,7 @@ inline Operand GetMemOp(LiftoffAssembler* assm, Register addr, - : Operand(addr, offset_reg, scale_factor, offset_imm32); - } - // Offset immediate does not fit in 31 bits. -- Register scratch = kScratchRegister; -+ Register scratch = kScratchRegister2; - assm->MacroAssembler::Move(scratch, offset_imm); - if (offset_reg != no_reg) assm->addq(scratch, offset_reg); - return Operand(addr, scratch, scale_factor, 0); -diff --git a/chromium/v8/src/wasm/streaming-decoder.cc b/chromium/v8/src/wasm/streaming-decoder.cc -index 786c5aa250f..9eb2d2fb9f1 100644 ---- src/3rdparty/chromium/v8/src/wasm/streaming-decoder.cc -+++ src/3rdparty/chromium/v8/src/wasm/streaming-decoder.cc -@@ -294,6 +294,10 @@ void AsyncStreamingDecoder::Finish(bool can_use_compiled_module) { - if (!full_wire_bytes_.back().empty()) { - size_t total_length = 0; - for (auto& bytes : full_wire_bytes_) total_length += bytes.size(); -+ if (ok()) { -+ // {DecodeSectionLength} enforces this with graceful error reporting. -+ CHECK_LE(total_length, max_module_size()); -+ } - auto all_bytes = base::OwnedVector::NewForOverwrite(total_length); - uint8_t* ptr = all_bytes.begin(); - for (auto& bytes : full_wire_bytes_) { -@@ -627,6 +631,18 @@ std::unique_ptr - AsyncStreamingDecoder::DecodeSectionLength::NextWithValue( - AsyncStreamingDecoder* streaming) { - TRACE_STREAMING("DecodeSectionLength(%zu)\n", value_); -+ // Check if this section fits into the overall module length limit. -+ // Note: {this->module_offset_} is the position of the section ID byte, -+ // {streaming->module_offset_} is the start of the section's payload (i.e. -+ // right after the just-decoded section length varint). -+ // The latter can already exceed the max module size, when the previous -+ // section barely fit into it, and this new section's ID or length crossed -+ // the threshold. -+ uint32_t payload_start = streaming->module_offset(); -+ size_t max_size = max_module_size(); -+ if (payload_start > max_size || max_size - payload_start < value_) { -+ return streaming->ToErrorState(); -+ } - SectionBuffer* buf = - streaming->CreateNewBuffer(module_offset_, section_id_, value_, - buffer().SubVector(0, bytes_consumed_)); -diff --git a/chromium/v8/src/wasm/wasm-engine.cc b/chromium/v8/src/wasm/wasm-engine.cc -index 688a0741cb6..6898538c9e4 100644 ---- src/3rdparty/chromium/v8/src/wasm/wasm-engine.cc -+++ src/3rdparty/chromium/v8/src/wasm/wasm-engine.cc -@@ -1855,10 +1855,11 @@ uint32_t max_table_init_entries() { - - // {max_module_size} is declared in wasm-limits.h. - size_t max_module_size() { -- // Clamp the value of --wasm-max-module-size between 16 and just below 2GB. -+ // Clamp the value of --wasm-max-module-size between 16 and the maximum -+ // that the implementation supports. - constexpr size_t kMin = 16; -- constexpr size_t kMax = RoundDown(size_t{kMaxInt}); -- static_assert(kMin <= kV8MaxWasmModuleSize && kV8MaxWasmModuleSize <= kMax); -+ constexpr size_t kMax = kV8MaxWasmModuleSize; -+ static_assert(kMin <= kV8MaxWasmModuleSize); - return std::clamp(v8_flags.wasm_max_module_size.value(), kMin, kMax); - } - -diff --git a/chromium/v8/src/wasm/wasm-js.cc b/chromium/v8/src/wasm/wasm-js.cc -index 8710727207a..5e2427cde30 100644 ---- src/3rdparty/chromium/v8/src/wasm/wasm-js.cc -+++ src/3rdparty/chromium/v8/src/wasm/wasm-js.cc -@@ -189,8 +189,8 @@ GET_FIRST_ARGUMENT_AS(Tag) - #undef GET_FIRST_ARGUMENT_AS - - i::wasm::ModuleWireBytes GetFirstArgumentAsBytes( -- const v8::FunctionCallbackInfo& info, ErrorThrower* thrower, -- bool* is_shared) { -+ const v8::FunctionCallbackInfo& info, size_t max_length, -+ ErrorThrower* thrower, bool* is_shared) { - DCHECK(i::ValidateCallbackInfo(info)); - const uint8_t* start = nullptr; - size_t length = 0; -@@ -221,7 +221,6 @@ i::wasm::ModuleWireBytes GetFirstArgumentAsBytes( - if (length == 0) { - thrower->CompileError("BufferSource argument is empty"); - } -- size_t max_length = i::wasm::max_module_size(); - if (length > max_length) { - // The spec requires a CompileError for implementation-defined limits, see - // https://webassembly.github.io/spec/js-api/index.html#limits. -@@ -534,7 +533,8 @@ void WebAssemblyCompile(const v8::FunctionCallbackInfo& info) { - new AsyncCompilationResolver(isolate, context, promise_resolver)); - - bool is_shared = false; -- auto bytes = GetFirstArgumentAsBytes(info, &thrower, &is_shared); -+ auto bytes = GetFirstArgumentAsBytes(info, i::wasm::max_module_size(), -+ &thrower, &is_shared); - if (thrower.error()) { - resolver->OnCompilationFailed(thrower.Reify()); - return; -@@ -559,8 +559,11 @@ void WasmStreamingCallbackForTesting( - v8::WasmStreaming::Unpack(info.GetIsolate(), info.Data()); - - bool is_shared = false; -+ // We don't check the buffer length up front, to allow d8 to test that the -+ // streaming decoder implementation handles overly large inputs correctly. -+ size_t unlimited = std::numeric_limits::max(); - i::wasm::ModuleWireBytes bytes = -- GetFirstArgumentAsBytes(info, &thrower, &is_shared); -+ GetFirstArgumentAsBytes(info, unlimited, &thrower, &is_shared); - if (thrower.error()) { - streaming->Abort(Utils::ToLocal(thrower.Reify())); - return; -@@ -653,7 +656,8 @@ void WebAssemblyValidate(const v8::FunctionCallbackInfo& info) { - ScheduledErrorThrower thrower(i_isolate, "WebAssembly.validate()"); - - bool is_shared = false; -- auto bytes = GetFirstArgumentAsBytes(info, &thrower, &is_shared); -+ auto bytes = GetFirstArgumentAsBytes(info, i::wasm::max_module_size(), -+ &thrower, &is_shared); - - v8::ReturnValue return_value = info.GetReturnValue(); - -@@ -725,7 +729,8 @@ void WebAssemblyModule(const v8::FunctionCallbackInfo& info) { - } - - bool is_shared = false; -- auto bytes = GetFirstArgumentAsBytes(info, &thrower, &is_shared); -+ auto bytes = GetFirstArgumentAsBytes(info, i::wasm::max_module_size(), -+ &thrower, &is_shared); - - if (thrower.error()) { - return; -@@ -1023,7 +1028,8 @@ void WebAssemblyInstantiate(const v8::FunctionCallbackInfo& info) { - } - - bool is_shared = false; -- auto bytes = GetFirstArgumentAsBytes(info, &thrower, &is_shared); -+ auto bytes = GetFirstArgumentAsBytes(info, i::wasm::max_module_size(), -+ &thrower, &is_shared); - if (thrower.error()) { - resolver->OnInstantiationFailed(thrower.Reify()); - return; -@@ -1155,9 +1161,10 @@ i::Handle DefaultReferenceValue(i::Isolate* isolate, - DCHECK(type.is_object_reference()); - // Use undefined for JS type (externref) but null for wasm types as wasm does - // not know undefined. -- if (type.heap_representation() == i::wasm::HeapType::kExtern || -- type.heap_representation() == i::wasm::HeapType::kNoExtern) { -+ if (type.heap_representation() == i::wasm::HeapType::kExtern) { - return isolate->factory()->undefined_value(); -+ } else if (type.heap_representation() == i::wasm::HeapType::kNoExtern) { -+ return isolate->factory()->null_value(); - } - return isolate->factory()->wasm_null(); - } -diff --git a/chromium/v8/src/wasm/wasm-objects.cc b/chromium/v8/src/wasm/wasm-objects.cc -index 4c5050a56b8..5698a8f49de 100644 ---- src/3rdparty/chromium/v8/src/wasm/wasm-objects.cc -+++ src/3rdparty/chromium/v8/src/wasm/wasm-objects.cc -@@ -1850,8 +1850,8 @@ Handle WasmTagObject::New(Isolate* isolate, - } - - bool WasmTagObject::MatchesSignature(uint32_t expected_canonical_type_index) { -- return wasm::GetWasmEngine()->type_canonicalizer()->IsCanonicalSubtype( -- this->canonical_type_index(), expected_canonical_type_index); -+ return static_cast(this->canonical_type_index()) == -+ expected_canonical_type_index; - } - - const wasm::FunctionSig* WasmCapiFunction::GetSignature(Zone* zone) const { 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 0f0336991402..86d1b13290b8 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 2023-12-12 22:08:45 UTC +--- src/3rdparty/chromium/BUILD.gn.orig 2024-07-03 01:14:49 UTC +++ src/3rdparty/chromium/BUILD.gn -@@ -62,7 +62,7 @@ declare_args() { +@@ -64,7 +64,7 @@ declare_args() { qtwebengine_target = "//tools/gn" } @@ -17,7 +17,7 @@ "//net:net_unittests", "//sandbox:sandbox_unittests", "//services:services_unittests", -@@ -418,7 +417,7 @@ group("gn_all") { +@@ -426,7 +425,7 @@ group("gn_all") { } } @@ -26,7 +26,7 @@ deps += [ "//third_party/breakpad:breakpad_unittests", "//third_party/breakpad:core-2-minidump", -@@ -618,6 +617,15 @@ group("gn_all") { +@@ -626,6 +625,15 @@ group("gn_all") { } } @@ -42,7 +42,7 @@ if (is_mac) { deps += [ "//third_party/breakpad:dump_syms", -@@ -667,7 +675,7 @@ group("gn_all") { +@@ -672,7 +680,7 @@ group("gn_all") { host_os == "win") { deps += [ "//chrome/test/mini_installer:mini_installer_tests" ] } @@ -51,16 +51,16 @@ deps += [ "//third_party/breakpad:symupload($host_toolchain)" ] } -@@ -1095,7 +1103,7 @@ if (use_blink && !is_cronet_build) { +@@ -1093,7 +1101,7 @@ if (use_blink && !is_cronet_build) { ] } - if (!is_chromeos_ash && !is_ios && !is_fuchsia && !is_android && !is_castos) { + if (!is_chromeos_ash && !is_ios && !is_fuchsia && !is_android && !is_castos && !is_bsd) { - script_test("webdriver_wpt_tests") { + script_test("chrome_wpt_tests") { script = "//third_party/blink/tools/run_wpt_tests.py" args = [ -@@ -1185,7 +1193,7 @@ if (use_blink && !is_cronet_build) { +@@ -1184,7 +1192,7 @@ if (use_blink && !is_cronet_build) { data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ] } @@ -69,7 +69,7 @@ data_deps += [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ] } -@@ -1194,7 +1202,7 @@ if (use_blink && !is_cronet_build) { +@@ -1193,7 +1201,7 @@ if (use_blink && !is_cronet_build) { data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } @@ -78,7 +78,7 @@ data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } -@@ -1654,7 +1662,7 @@ group("chromium_builder_perf") { +@@ -1643,7 +1651,7 @@ group("chromium_builder_perf") { data_deps += [ "//chrome/test:performance_browser_tests" ] } 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 07baa903ce0a..ebadb159749f 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,6 +1,6 @@ ---- src/3rdparty/chromium/base/BUILD.gn.orig 2023-12-12 22:08:45 UTC +--- src/3rdparty/chromium/base/BUILD.gn.orig 2024-07-03 01:14:49 UTC +++ src/3rdparty/chromium/base/BUILD.gn -@@ -199,7 +199,7 @@ buildflag_header("ios_cronet_buildflags") { +@@ -188,7 +188,7 @@ buildflag_header("ios_cronet_buildflags") { flags = [ "CRONET_BUILD=$is_cronet_build" ] } @@ -9,7 +9,7 @@ buildflag_header("message_pump_buildflags") { header = "message_pump_buildflags.h" header_dir = "base/message_loop" -@@ -1117,11 +1117,23 @@ jumbo_component("base") { +@@ -1125,11 +1125,23 @@ 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. @@ -34,7 +34,7 @@ if (use_allocator_shim) { if (is_apple) { sources += [ "allocator/early_zone_registration_apple.h" ] -@@ -1141,7 +1153,7 @@ jumbo_component("base") { +@@ -1149,7 +1161,7 @@ jumbo_component("base") { # Allow more direct string conversions on platforms with native utf8 # strings @@ -43,7 +43,7 @@ defines += [ "SYSTEM_NATIVE_UTF8" ] } -@@ -2091,6 +2103,22 @@ jumbo_component("base") { +@@ -2100,6 +2112,22 @@ jumbo_component("base") { ] } @@ -66,7 +66,7 @@ # iOS if (is_ios) { sources += [ -@@ -2223,6 +2251,29 @@ jumbo_component("base") { +@@ -2230,6 +2258,31 @@ jumbo_component("base") { } } @@ -84,6 +84,8 @@ + "profiler/thread_delegate_posix.cc", + "profiler/thread_delegate_posix.h", + "threading/platform_thread_linux.cc", ++ "stack_canary_linux.cc", ++ "stack_canary_linux.h", + ] + sources += [ + "files/file_path_watcher_kqueue.cc", @@ -96,7 +98,7 @@ if (use_blink) { sources += [ "files/file_path_watcher.cc", -@@ -2233,7 +2284,7 @@ jumbo_component("base") { +@@ -2240,7 +2293,7 @@ jumbo_component("base") { } if (dep_libevent) { @@ -105,7 +107,16 @@ } if (use_libevent) { -@@ -3607,7 +3658,7 @@ test("base_unittests") { +@@ -3005,7 +3058,7 @@ if (is_apple) { + } + } + +-if (!is_nacl && (is_linux || is_chromeos)) { ++if (!is_nacl && !is_bsd && (is_linux || is_chromeos)) { + # This test must compile with -fstack-protector-all + source_set("stack_canary_linux_unittests") { + testonly = true +@@ -3642,14 +3695,14 @@ test("base_unittests") { ] } @@ -114,7 +125,15 @@ sources += [ "debug/proc_maps_linux_unittest.cc", "files/scoped_file_linux_unittest.cc", -@@ -3628,7 +3679,7 @@ test("base_unittests") { + "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") { "posix/file_descriptor_shuffle_unittest.cc", "posix/unix_domain_socket_unittest.cc", ] @@ -123,7 +142,7 @@ sources += [ "profiler/stack_base_address_posix_unittest.cc", "profiler/stack_copier_signal_unittest.cc", -@@ -3639,7 +3690,7 @@ test("base_unittests") { +@@ -3675,7 +3728,7 @@ test("base_unittests") { # Allow more direct string conversions on platforms with native utf8 # strings @@ -132,7 +151,7 @@ defines += [ "SYSTEM_NATIVE_UTF8" ] } -@@ -3895,7 +3946,7 @@ test("base_unittests") { +@@ -3938,7 +3991,7 @@ test("base_unittests") { } } 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 e31181bb5508..2fe6ae1d70c6 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,6 +1,6 @@ ---- src/3rdparty/chromium/base/allocator/dispatcher/tls.h.orig 2023-05-31 08:12:17 UTC +--- src/3rdparty/chromium/base/allocator/dispatcher/tls.h.orig 2023-11-03 10:09:45 UTC +++ src/3rdparty/chromium/base/allocator/dispatcher/tls.h -@@ -50,7 +50,7 @@ struct BASE_EXPORT MMapAllocator { +@@ -74,7 +74,7 @@ struct BASE_EXPORT MMapAllocator { partition_alloc::PartitionPageSize(); #elif BUILDFLAG(IS_APPLE) constexpr static size_t AllocationChunkSize = 16384; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_BUILD.gn deleted file mode 100644 index 16dc80d6f2e1..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_BUILD.gn +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/base/allocator/partition_allocator/BUILD.gn.orig 2023-10-11 18:22:24 UTC -+++ src/3rdparty/chromium/base/allocator/partition_allocator/BUILD.gn -@@ -562,7 +562,7 @@ source_set("allocator_shim") { - ] - configs += [ ":mac_no_default_new_delete_symbols" ] - } -- if (is_chromeos || is_linux) { -+ if ((is_chromeos || is_linux) && !is_bsd) { - sources += [ - "shim/allocator_shim_override_cpp_symbols.h", - "shim/allocator_shim_override_glibc_weak_symbols.h", diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_page__allocator.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_page__allocator.h deleted file mode 100644 index 3eb4f28da567..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_page__allocator.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/base/allocator/partition_allocator/page_allocator.h.orig 2023-09-13 12:11:42 UTC -+++ src/3rdparty/chromium/base/allocator/partition_allocator/page_allocator.h -@@ -258,7 +258,7 @@ void DecommitAndZeroSystemPages(void* address, - // recommitted. Do not assume that this will not change over time. - constexpr PA_COMPONENT_EXPORT( - PARTITION_ALLOC) bool DecommittedMemoryIsAlwaysZeroed() { --#if BUILDFLAG(IS_APPLE) -+#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD) - return false; - #else - return true; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__address__space.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__address__space.cc deleted file mode 100644 index 9171c87c625d..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__address__space.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/base/allocator/partition_allocator/partition_address_space.cc.orig 2023-07-16 15:47:57 UTC -+++ src/3rdparty/chromium/base/allocator/partition_allocator/partition_address_space.cc -@@ -420,7 +420,7 @@ void PartitionAddressSpace::UninitThreadIsolatedPoolFo - } - #endif - --#if BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64) -+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64) - - PageCharacteristics page_characteristics; - diff --git a/www/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 7cf907ee908d..46a2e18c9559 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,11 +1,20 @@ ---- src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc.gni.orig 2023-10-11 18:22:24 UTC +--- 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 -@@ -328,7 +328,7 @@ declare_args() { - # pkeys support is explicitly disabled in all Cronet builds, as some test +@@ -30,7 +30,7 @@ if (is_nacl) { + } + + has_memory_tagging = +- current_cpu == "arm64" && is_clang && !is_asan && (is_linux || is_android) ++ current_cpu == "arm64" && is_clang && !is_asan && !is_bsd && (is_linux || is_android) + + declare_args() { + # Causes all the allocations to be routed via allocator_shim.cc. Usually, +@@ -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 && target_cpu == "x64" && !is_cronet_build -+ enable_pkeys = (is_linux && !is_bsd) && target_cpu == "x64" && !is_cronet_build + enable_pkeys = +- (is_linux || is_chromeos) && target_cpu == "x64" && !is_cronet_build ++ !is_bsd && (is_linux || is_chromeos) && target_cpu == "x64" && !is_cronet_build } - assert(!enable_pkeys || (is_linux && target_cpu == "x64"), - "Pkeys are only supported on x64 linux") + assert(!enable_pkeys || ((is_linux || is_chromeos) && target_cpu == "x64"), + "Pkeys are only supported on x64 linux and ChromeOS") diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__base_compiler__specific.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__base_compiler__specific.h deleted file mode 100644 index 2577bd6e1d7a..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__base_compiler__specific.h +++ /dev/null @@ -1,32 +0,0 @@ ---- src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_base/compiler_specific.h.orig 2023-04-28 17:01:32 UTC -+++ src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_base/compiler_specific.h -@@ -24,9 +24,9 @@ - // Annotate a function indicating it should not be inlined. - // Use like: - // NOINLINE void DoStuff() { ... } --#if defined(__clang__) && PA_HAS_ATTRIBUTE(noinline) -+#if defined(__clang__) && (__clang_major__ >= 15) && PA_HAS_ATTRIBUTE(noinline) - #define PA_NOINLINE [[clang::noinline]] --#elif defined(COMPILER_GCC) && PA_HAS_ATTRIBUTE(noinline) -+#elif (defined(COMPILER_GCC) || defined(__clang__)) && PA_HAS_ATTRIBUTE(noinline) - #define PA_NOINLINE __attribute__((noinline)) - #elif defined(COMPILER_MSVC) - #define PA_NOINLINE __declspec(noinline) -@@ -34,7 +34,7 @@ - #define PA_NOINLINE - #endif - --#if defined(__clang__) && defined(NDEBUG) && PA_HAS_ATTRIBUTE(always_inline) -+#if defined(__clang__) && (__clang_major__ >= 15) && defined(NDEBUG) && PA_HAS_ATTRIBUTE(always_inline) - #define PA_ALWAYS_INLINE [[clang::always_inline]] inline - #elif defined(COMPILER_GCC) && defined(NDEBUG) && \ - PA_HAS_ATTRIBUTE(always_inline) -@@ -53,7 +53,7 @@ - // prevent code folding, see NO_CODE_FOLDING() in base/debug/alias.h. - // Use like: - // void NOT_TAIL_CALLED FooBar(); --#if defined(__clang__) && PA_HAS_ATTRIBUTE(not_tail_called) -+#if defined(__clang__) && (__clang_major__ >= 15) && PA_HAS_ATTRIBUTE(not_tail_called) - #define PA_NOT_TAIL_CALLED [[clang::not_tail_called]] - #else - #define PA_NOT_TAIL_CALLED diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__base_rand__util__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__base_rand__util__posix.cc deleted file mode 100644 index 1c070033462d..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__base_rand__util__posix.cc +++ /dev/null @@ -1,13 +0,0 @@ ---- src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_base/rand_util_posix.cc.orig 2023-09-13 12:11:42 UTC -+++ src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_base/rand_util_posix.cc -@@ -90,6 +90,10 @@ void RandBytes(void* output, size_t output_length) { - if (getentropy(output, output_length) == 0) { - return; - } -+#elif BUILDFLAG(IS_BSD) -+ if (getentropy(output, output_length) == 0) { -+ return; -+ } - #endif - // If getrandom(2) above returned with an error and the /dev/urandom fallback - // took place on Linux/ChromeOS bots, they would fail with a CHECK in diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__base_threading_platform__thread__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__base_threading_platform__thread__posix.cc deleted file mode 100644 index 997f5720ecc8..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__base_threading_platform__thread__posix.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_base/threading/platform_thread_posix.cc.orig 2022-07-22 17:30:31 UTC -+++ src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_base/threading/platform_thread_posix.cc -@@ -17,7 +17,7 @@ - #include "base/allocator/partition_allocator/partition_alloc_base/threading/platform_thread_internal_posix.h" - #include "build/build_config.h" - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - #include - #include - #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__config.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__config.h deleted file mode 100644 index cd7f463a4040..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__config.h +++ /dev/null @@ -1,29 +0,0 @@ ---- src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_config.h.orig 2023-10-11 18:22:24 UTC -+++ src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_config.h -@@ -94,7 +94,7 @@ static_assert(sizeof(void*) != 8, ""); - // POSIX is not only UNIX, e.g. macOS and other OSes. We do use Linux-specific - // features such as futex(2). - #define PA_CONFIG_HAS_LINUX_KERNEL() \ -- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)) -+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)) - - // On some platforms, we implement locking by spinning in userspace, then going - // into the kernel only if there is contention. This requires platform support, -@@ -237,7 +237,7 @@ constexpr bool kUseLazyCommit = false; - // On these platforms, lock all the partitions before fork(), and unlock after. - // This may be required on more platforms in the future. - #define PA_CONFIG_HAS_ATFORK_HANDLER() \ -- (BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) -+ (BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) - - // PartitionAlloc uses PartitionRootEnumerator to acquire all - // PartitionRoots at BeforeFork and to release at AfterFork. -@@ -284,7 +284,7 @@ constexpr bool kUseLazyCommit = false; - // Also enabled on ARM64 macOS, as the 16kiB pages on this platform lead to - // larger slot spans. - #define PA_CONFIG_PREFER_SMALLER_SLOT_SPANS() \ -- (BUILDFLAG(IS_LINUX) || (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64))) -+ (BUILDFLAG(IS_LINUX) || (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64)) || BUILDFLAG(IS_BSD)) - - // Enable shadow metadata. - // diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__constants.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__constants.h deleted file mode 100644 index 397135e90aa3..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__constants.h +++ /dev/null @@ -1,21 +0,0 @@ ---- src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_constants.h.orig 2023-09-13 12:11:42 UTC -+++ src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_constants.h -@@ -95,7 +95,7 @@ PartitionPageShift() { - return 18; // 256 KiB - } - #elif (BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_64_BITS)) || \ -- (BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64)) -+ ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64)) - PA_ALWAYS_INLINE PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR size_t - PartitionPageShift() { - return PageAllocationGranularityShift() + 2; -@@ -297,7 +297,8 @@ constexpr size_t kNumPools = kMaxPoolHandle - 1; - // 8GB for each of the glued pools). - #if BUILDFLAG(HAS_64_BIT_POINTERS) - #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) || \ -- BUILDFLAG(ENABLE_POINTER_COMPRESSION) -+ BUILDFLAG(ENABLE_POINTER_COMPRESSION) || \ -+ BUILDFLAG(IS_BSD) - constexpr size_t kPoolMaxSize = 8 * kGiB; - #else - constexpr size_t kPoolMaxSize = 16 * kGiB; diff --git a/www/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 new file mode 100644 index 000000000000..4885eb86cba7 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_BUILD.gn @@ -0,0 +1,11 @@ +--- 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 +@@ -856,7 +856,7 @@ if (is_clang_or_gcc || is_msvc || is_mingw) { + configs -= [ "//build/config/compiler:enable_arc" ] + } + } +- if (is_chromeos || is_linux) { ++ if ((is_chromeos || is_linux) && !is_bsd) { + shim_headers += [ + "shim/allocator_shim_override_cpp_symbols.h", + "shim/allocator_shim_override_glibc_weak_symbols.h", diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_address__space__randomization.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_address__space__randomization.h similarity index 68% rename from www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_address__space__randomization.h rename to www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_address__space__randomization.h index c48328b2fae5..cfb2742ca500 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_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,5 +1,5 @@ ---- src/3rdparty/chromium/base/allocator/partition_allocator/address_space_randomization.h.orig 2023-09-13 12:11:42 UTC -+++ src/3rdparty/chromium/base/allocator/partition_allocator/address_space_randomization.h +--- 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 @@ -38,7 +38,7 @@ AslrMask(uintptr_t bits) { #if defined(ARCH_CPU_64_BITS) @@ -9,7 +9,7 @@ // We shouldn't allocate system pages at all for sanitizer builds. However, // we do, and if random hint addresses interfere with address ranges -@@ -124,7 +124,7 @@ AslrMask(uintptr_t bits) { +@@ -126,7 +126,7 @@ AslrMask(uintptr_t bits) { return AslrAddress(0x20000000ULL); } 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 new file mode 100644 index 000000000000..24009d850968 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_page__allocator.h @@ -0,0 +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 +@@ -256,7 +256,7 @@ bool DecommitAndZeroSystemPages(void* address, + // recommitted. Do not assume that this will not change over time. + constexpr PA_COMPONENT_EXPORT( + PARTITION_ALLOC) bool DecommittedMemoryIsAlwaysZeroed() { +-#if BUILDFLAG(IS_APPLE) ++#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD) + return false; + #else + return true; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_page__allocator__constants.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_page__allocator__constants.h similarity index 57% rename from www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_page__allocator__constants.h rename to www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_page__allocator__constants.h index 272faad2da2b..369c01827f4b 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_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,11 +1,11 @@ ---- src/3rdparty/chromium/base/allocator/partition_allocator/page_allocator_constants.h.orig 2023-09-13 12:11:42 UTC -+++ src/3rdparty/chromium/base/allocator/partition_allocator/page_allocator_constants.h +--- 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 @@ -25,7 +25,7 @@ // elimination. #define PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR __attribute__((const)) --#elif BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64) -+#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64) +-#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) // 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 @@ -13,8 +13,8 @@ return 14; // 16kB #elif BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_64_BITS) return static_cast(vm_page_shift); --#elif BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64) -+#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64) +-#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); @@ -22,17 +22,17 @@ // This is literally equivalent to |1 << PageAllocationGranularityShift()| // below, but was separated out for IS_APPLE to avoid << on a non-constexpr. return vm_page_size; --#elif BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64) -+#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64) +-#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); -@@ -152,7 +152,7 @@ SystemPageShift() { - PA_ALWAYS_INLINE PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR size_t +@@ -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 Linux to avoid << on a - // non-constexpr. + // 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_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 similarity index 59% rename from www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_page__allocator__internals__posix.h rename to www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_page__allocator__internals__posix.h index b0e1fabca7e2..c93b1be7c587 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_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,6 +1,6 @@ ---- src/3rdparty/chromium/base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2023-09-13 12:11:42 UTC -+++ src/3rdparty/chromium/base/allocator/partition_allocator/page_allocator_internals_posix.h -@@ -403,8 +403,12 @@ bool TryRecommitSystemPagesInternal( +--- 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 +@@ -411,8 +411,12 @@ bool TryRecommitSystemPagesInternal( void DiscardSystemPagesInternal(uintptr_t address, size_t length) { void* ptr = reinterpret_cast(address); 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 new file mode 100644 index 000000000000..5170b78750fb --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_partition__address__space.cc @@ -0,0 +1,11 @@ +--- 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_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 similarity index 50% rename from www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__base_debug_stack__trace__posix.cc rename to www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_debug_stack__trace__posix.cc index 4f82b1eff27f..5c9b69b52e1c 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_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,8 +1,8 @@ ---- src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_base/debug/stack_trace_posix.cc.orig 2023-10-11 18:22:24 UTC -+++ src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_base/debug/stack_trace_posix.cc -@@ -12,11 +12,11 @@ - #include - #include +--- 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 +@@ -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) @@ -11,9 +11,9 @@ -#if BUILDFLAG(IS_APPLE) +#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD) - #define HAVE_DLADDR #include #endif + @@ -25,7 +25,7 @@ namespace partition_alloc::internal::base::debug { namespace { @@ -21,9 +21,9 @@ -#if !BUILDFLAG(IS_APPLE) +#if !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD) - constexpr size_t kBufferSize = 4096u; - -@@ -359,7 +359,7 @@ void PrintStackTraceInternal(void* const* trace, size_ + // 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) @@ -31,4 +31,4 @@ +#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD) // Since /proc/self/maps is not available, use dladdr() to obtain module // names and offsets inside the modules from the given addresses. - void PrintStackTraceInternal(void* const* trace, size_t size) { + 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 new file mode 100644 index 000000000000..ff0aabe6289c --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_rand__util__posix.cc @@ -0,0 +1,13 @@ +--- 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 +@@ -102,6 +102,10 @@ void RandBytes(void* output, size_t output_length) { + if (getentropy(output, output_length) == 0) { + return; + } ++#elif BUILDFLAG(IS_BSD) ++ if (getentropy(output, output_length) == 0) { ++ return; ++ } + #endif + // If getrandom(2) above returned with an error and the /dev/urandom fallback + // took place on Linux/ChromeOS bots, they would fail with a CHECK in diff --git a/www/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 new file mode 100644 index 000000000000..f584ea6e1009 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread.h @@ -0,0 +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 +@@ -37,6 +37,8 @@ typedef DWORD PlatformThreadId; + typedef zx_handle_t PlatformThreadId; + #elif BUILDFLAG(IS_APPLE) + typedef mach_port_t PlatformThreadId; ++#elif BUILDFLAG(IS_BSD) ++typedef uint64_t PlatformThreadId; + #elif BUILDFLAG(IS_POSIX) + typedef pid_t PlatformThreadId; + #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_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 similarity index 57% rename from www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__base_threading_platform__thread__internal__posix.h rename to 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 de39dc518e85..f7b3d31f7b5f 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_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,5 +1,5 @@ ---- src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_base/threading/platform_thread_internal_posix.h.orig 2022-07-22 17:30:31 UTC -+++ src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_base/threading/platform_thread_internal_posix.h +--- 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 @@ -10,7 +10,7 @@ namespace partition_alloc::internal::base::internal { 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 new file mode 100644 index 000000000000..0e72a3f867e1 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread__posix.cc @@ -0,0 +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 +@@ -18,7 +18,7 @@ + #include "partition_alloc/partition_alloc_base/logging.h" + #include "partition_alloc/partition_alloc_base/threading/platform_thread_internal_posix.h" + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #include + #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 new file mode 100644 index 000000000000..7558a814bd88 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_partition__alloc__config.h @@ -0,0 +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 +@@ -251,7 +251,7 @@ constexpr bool kUseLazyCommit = false; + // On these platforms, lock all the partitions before fork(), and unlock after. + // This may be required on more platforms in the future. + #define PA_CONFIG_HAS_ATFORK_HANDLER() \ +- (BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) ++ (BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) + + // PartitionAlloc uses PartitionRootEnumerator to acquire all + // PartitionRoots at BeforeFork and to release at AfterFork. +@@ -299,7 +299,7 @@ constexpr bool kUseLazyCommit = false; + // + // Also enabled on ARM64 macOS, as the 16kiB pages on this platform lead to + // larger slot spans. +-#if BUILDFLAG(IS_LINUX) || (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64)) ++#if BUILDFLAG(IS_LINUX) || (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64)) || BUILDFLAG(IS_BSD) + #define PA_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 new file mode 100644 index 000000000000..900822e4d013 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_partition__alloc__constants.h @@ -0,0 +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 +@@ -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) + constexpr size_t kPoolMaxSize = 8 * kGiB; + #else diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__forward.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_partition__alloc__forward.h similarity index 72% rename from www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__forward.h rename to www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_partition__alloc__forward.h index c3fcc5774afb..674ed11744d9 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__forward.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_partition__alloc__forward.h @@ -1,5 +1,5 @@ ---- src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_forward.h.orig 2023-08-17 07:33:31 UTC -+++ src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_forward.h +--- src/3rdparty/chromium/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_forward.h.orig 2023-12-10 06:10:27 UTC ++++ src/3rdparty/chromium/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_forward.h @@ -28,9 +28,13 @@ namespace internal { // the second one 16. We could technically return something different for // malloc() and operator new(), but this would complicate things, and most of diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__page__constants.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_partition__page__constants.h similarity index 51% rename from www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__page__constants.h rename to www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_partition__page__constants.h index 33c47d3245bc..1a908cd3cdbc 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__page__constants.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_partition__page__constants.h @@ -1,11 +1,11 @@ ---- src/3rdparty/chromium/base/allocator/partition_allocator/partition_page_constants.h.orig 2023-08-17 07:33:31 UTC -+++ src/3rdparty/chromium/base/allocator/partition_allocator/partition_page_constants.h +--- 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_LINUX) && defined(ARCH_CPU_ARM64) -+#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64) +-#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_partition__root.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_partition__root.cc similarity index 66% rename from www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__root.cc rename to www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_partition__root.cc index b925619dd52c..392db24a350f 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__root.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_partition__root.cc @@ -1,5 +1,5 @@ ---- src/3rdparty/chromium/base/allocator/partition_allocator/partition_root.cc.orig 2023-10-11 18:22:24 UTC -+++ src/3rdparty/chromium/base/allocator/partition_allocator/partition_root.cc +--- 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 @@ -47,7 +47,7 @@ #include "wow64apiset.h" #endif @@ -9,7 +9,7 @@ #include #endif -@@ -281,7 +281,7 @@ void PartitionAllocMallocInitOnce() { +@@ -278,7 +278,7 @@ void PartitionAllocMallocInitOnce() { return; } @@ -18,16 +18,16 @@ // 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. -@@ -379,7 +379,7 @@ static size_t PartitionPurgeSlotSpan(PartitionRoot* ro - constexpr size_t kMaxSlotCount = +@@ -377,7 +377,7 @@ static size_t PartitionPurgeSlotSpan(PartitionRoot* ro (PartitionPageSize() * kMaxPartitionPagesPerRegularSlotSpan) / MinPurgeableSlotSize(); --#elif BUILDFLAG(IS_APPLE) || (BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64)) -+#elif BUILDFLAG(IS_APPLE) || ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64)) + #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, - // PartitionPageSize() is always SystemPageSize() << 2, so regardless of -@@ -948,7 +948,7 @@ void PartitionRoot::Init(PartitionOptions opts) { +@@ -942,7 +942,7 @@ void PartitionRoot::Init(PartitionOptions opts) { // apple OSes. PA_CHECK((internal::SystemPageSize() == (size_t{1} << 12)) || (internal::SystemPageSize() == (size_t{1} << 14))); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_spinning__mutex.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_spinning__mutex.cc similarity index 81% rename from www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_spinning__mutex.cc rename to www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_spinning__mutex.cc index 06cc5fa96143..47e312021dc7 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_spinning__mutex.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_spinning__mutex.cc @@ -1,9 +1,9 @@ ---- src/3rdparty/chromium/base/allocator/partition_allocator/spinning_mutex.cc.orig 2023-04-28 17:01:32 UTC -+++ src/3rdparty/chromium/base/allocator/partition_allocator/spinning_mutex.cc -@@ -18,7 +18,16 @@ +--- 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 +@@ -17,7 +17,16 @@ + #endif #if PA_CONFIG(HAS_LINUX_KERNEL) - #include +#if defined(OS_OPENBSD) +#include +#include @@ -16,8 +16,8 @@ +#endif #include #include - #endif // PA_CONFIG(HAS_LINUX_KERNEL) -@@ -108,8 +117,16 @@ void SpinningMutex::FutexWait() { + +@@ -109,8 +118,16 @@ void SpinningMutex::FutexWait() { // |kLockedContended| anymore. Note that even without spurious wakeups, the // value of |state_| is not guaranteed when this returns, as another thread // may get the lock before we get to run. @@ -34,7 +34,7 @@ if (err) { // These are programming error, check them. -@@ -121,8 +138,16 @@ void SpinningMutex::FutexWait() { +@@ -122,8 +139,16 @@ void SpinningMutex::FutexWait() { void SpinningMutex::FutexWake() { int saved_errno = errno; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_starscan_stack_stack.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_starscan_stack_stack.cc similarity index 81% rename from www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_starscan_stack_stack.cc rename to www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_starscan_stack_stack.cc index cfa0d433b7e8..91e7850bd1d7 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_starscan_stack_stack.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_starscan_stack_stack.cc @@ -1,5 +1,5 @@ ---- src/3rdparty/chromium/base/allocator/partition_allocator/starscan/stack/stack.cc.orig 2023-09-13 12:11:42 UTC -+++ src/3rdparty/chromium/base/allocator/partition_allocator/starscan/stack/stack.cc +--- 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 @@ -18,6 +18,10 @@ #include #endif 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 new file mode 100644 index 000000000000..60317d26f79a --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_src_partition__alloc_thread__isolation_pkey.cc @@ -0,0 +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 +@@ -16,7 +16,7 @@ + #include "partition_alloc/partition_alloc_check.h" + #include "partition_alloc/thread_isolation/thread_isolation.h" + +-#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) ++#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD) + #error "This pkey code is currently only supported on Linux and ChromeOS" + #endif + diff --git a/www/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 9c6eeff5a03a..c36d7ef91d62 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 2022-02-28 16:54:41 UTC +--- src/3rdparty/chromium/base/base_paths_posix.cc.orig 2023-11-03 16:09:21 UTC +++ src/3rdparty/chromium/base/base_paths_posix.cc @@ -15,6 +15,7 @@ #include @@ -8,7 +8,7 @@ #include "base/environment.h" #include "base/files/file_path.h" #include "base/files/file_util.h" -@@ -25,9 +26,13 @@ +@@ -26,9 +27,13 @@ #include "base/process/process_metrics.h" #include "build/build_config.h" @@ -23,7 +23,17 @@ #elif BUILDFLAG(IS_SOLARIS) || BUILDFLAG(IS_AIX) #include #endif -@@ -68,13 +73,65 @@ bool PathProviderPosix(int key, FilePath* result) { +@@ -48,8 +53,7 @@ bool PathProviderPosix(int key, FilePath* result) { + *result = bin_dir; + return true; + #elif BUILDFLAG(IS_FREEBSD) +- int name[] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 }; +- absl::optional bin_dir = StringSysctl(name, std::size(name)); ++ absl::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) { *result = FilePath(bin_dir); return true; #elif BUILDFLAG(IS_OPENBSD) || BUILDFLAG(IS_AIX) 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 index f5180faeb6f1..7ed92e8d362c 100644 --- 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 @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/base_switches.cc.orig 2023-10-11 18:22:24 UTC +--- src/3rdparty/chromium/base/base_switches.cc.orig 2024-02-23 21:04:38 UTC +++ src/3rdparty/chromium/base/base_switches.cc -@@ -180,7 +180,7 @@ const char kPackageVersionName[] = "package-version-na +@@ -172,7 +172,7 @@ const char kPackageVersionName[] = "package-version-na const char kPackageVersionCode[] = "package-version-code"; #endif 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 index e3ecb7515a0c..233a61a61877 100644 --- 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 @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/base_switches.h.orig 2023-10-11 18:22:24 UTC +--- src/3rdparty/chromium/base/base_switches.h.orig 2024-02-23 21:04:38 UTC +++ src/3rdparty/chromium/base/base_switches.h -@@ -62,7 +62,7 @@ extern const char kPackageVersionName[]; +@@ -60,7 +60,7 @@ extern const char kPackageVersionName[]; extern const char kPackageVersionCode[]; #endif 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 ad3ed85ba102..b01321905b32 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,35 +1,11 @@ ---- src/3rdparty/chromium/base/compiler_specific.h.orig 2023-04-28 17:01:32 UTC +--- src/3rdparty/chromium/base/compiler_specific.h.orig 2024-02-23 21:04:38 UTC +++ src/3rdparty/chromium/base/compiler_specific.h -@@ -41,9 +41,9 @@ - // Annotate a function indicating it should not be inlined. - // Use like: - // NOINLINE void DoStuff() { ... } --#if defined(__clang__) && HAS_ATTRIBUTE(noinline) -+#if defined(__clang__) && (__clang_major__ >= 15) && HAS_ATTRIBUTE(noinline) - #define NOINLINE [[clang::noinline]] --#elif defined(COMPILER_GCC) && HAS_ATTRIBUTE(noinline) -+#elif (defined(COMPILER_GCC) || defined(__clang__)) && HAS_ATTRIBUTE(noinline) - #define NOINLINE __attribute__((noinline)) - #elif defined(COMPILER_MSVC) - #define NOINLINE __declspec(noinline) -@@ -51,9 +51,9 @@ - #define NOINLINE - #endif - --#if defined(__clang__) && defined(NDEBUG) && HAS_ATTRIBUTE(always_inline) -+#if defined(__clang__) && (__clang_major__ >= 15) && defined(NDEBUG) && HAS_ATTRIBUTE(always_inline) - #define ALWAYS_INLINE [[clang::always_inline]] inline --#elif defined(COMPILER_GCC) && defined(NDEBUG) && HAS_ATTRIBUTE(always_inline) -+#elif (defined(COMPILER_GCC) || defined(__clang__)) && defined(NDEBUG) && HAS_ATTRIBUTE(always_inline) - #define ALWAYS_INLINE inline __attribute__((__always_inline__)) - #elif defined(COMPILER_MSVC) && defined(NDEBUG) - #define ALWAYS_INLINE __forceinline -@@ -69,7 +69,7 @@ - // prevent code folding, see NO_CODE_FOLDING() in base/debug/alias.h. - // Use like: - // NOT_TAIL_CALLED void FooBar(); --#if defined(__clang__) && HAS_ATTRIBUTE(not_tail_called) -+#if defined(__clang__) && (__clang_major__ >= 15) && HAS_ATTRIBUTE(not_tail_called) - #define NOT_TAIL_CALLED [[clang::not_tail_called]] +@@ -316,7 +316,7 @@ + // + // In some cases it's desirable to remove this, e.g. on hot functions, or if + // we have purposely changed the reference canary. +-#if defined(COMPILER_GCC) || defined(__clang__) ++#if (defined(COMPILER_GCC) || defined(__clang__)) && !defined(__OpenBSD__) && !defined(__FreeBSD__) + #if HAS_ATTRIBUTE(__no_stack_protector__) + #define NO_STACK_PROTECTOR __attribute__((__no_stack_protector__)) #else - #define NOT_TAIL_CALLED diff --git a/www/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 32b3b209e47c..e90462600ad2 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,6 +1,6 @@ ---- src/3rdparty/chromium/base/debug/stack_trace.cc.orig 2023-03-09 06:31:50 UTC +--- src/3rdparty/chromium/base/debug/stack_trace.cc.orig 2023-12-10 06:10:27 UTC +++ src/3rdparty/chromium/base/debug/stack_trace.cc -@@ -273,7 +273,9 @@ void StackTrace::Print() const { +@@ -266,7 +266,9 @@ void StackTrace::Print() const { } void StackTrace::OutputToStream(std::ostream* os) const { @@ -10,7 +10,7 @@ } std::string StackTrace::ToString() const { -@@ -281,7 +283,7 @@ std::string StackTrace::ToString() const { +@@ -274,7 +276,7 @@ std::string StackTrace::ToString() const { } std::string StackTrace::ToStringWithPrefix(const char* prefix_string) const { std::stringstream stream; 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 5d07bea8c52f..aa1ce925d251 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,4 +1,4 @@ ---- src/3rdparty/chromium/base/debug/stack_trace_posix.cc.orig 2023-09-13 12:11:42 UTC +--- 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 @@ -41,7 +41,7 @@ // execinfo.h and backtrace(3) are really only present in glibc and in macOS @@ -9,16 +9,19 @@ #define HAVE_BACKTRACE #include #endif -@@ -59,7 +59,7 @@ +@@ -59,8 +59,10 @@ #include #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) ++#if !BUILDFLAG(IS_BSD) + #include ++#endif + #include "base/debug/proc_maps_linux.h" #endif - -@@ -300,7 +300,7 @@ void PrintToStderr(const char* output) { +@@ -302,7 +304,7 @@ void PrintToStderr(const char* output) { std::ignore = HANDLE_EINTR(write(STDERR_FILENO, output, strlen(output))); } @@ -27,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 -@@ -317,7 +317,11 @@ void AlarmSignalHandler(int signal, siginfo_t* info, v +@@ -319,7 +321,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 @@ -39,7 +42,7 @@ } #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || // BUILDFLAG(IS_CHROMEOS) -@@ -534,7 +538,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf +@@ -536,7 +542,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf _exit(EXIT_FAILURE); } @@ -48,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; -@@ -559,6 +563,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf +@@ -561,6 +567,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(). @@ -56,7 +59,7 @@ long retval = syscall(SYS_rt_tgsigqueueinfo, getpid(), syscall(SYS_gettid), info->si_signo, info); if (retval == 0) { -@@ -573,6 +578,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf +@@ -575,6 +582,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf if (errno != EPERM) { _exit(EXIT_FAILURE); } @@ -64,7 +67,21 @@ #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || // BUILDFLAG(IS_CHROMEOS) -@@ -821,6 +827,9 @@ class SandboxSymbolizeHelper { +@@ -764,6 +772,7 @@ class SandboxSymbolizeHelper { + return -1; + } + ++#if !BUILDFLAG(IS_BSD) + // This class is copied from + // third_party/crashpad/crashpad/util/linux/scoped_pr_set_dumpable.h. + // It aims at ensuring the process is dumpable before opening /proc/self/mem. +@@ -856,11 +865,15 @@ class SandboxSymbolizeHelper { + r.base = cur_base; + } + } ++#endif + + // Parses /proc/self/maps in order to compile a list of all object file names // for the modules that are loaded in the current process. // Returns true on success. bool CacheMemoryRegions() { @@ -74,7 +91,7 @@ // Reads /proc/self/maps. std::string contents; if (!ReadProcMaps(&contents)) { -@@ -838,6 +847,7 @@ class SandboxSymbolizeHelper { +@@ -878,6 +891,7 @@ class SandboxSymbolizeHelper { is_initialized_ = true; return true; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_files_file__path__watcher.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_files_file__path__watcher.h index cd668f6b508d..cce37c868e1e 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_files_file__path__watcher.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_files_file__path__watcher.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/files/file_path_watcher.h.orig 2023-02-08 09:03:45 UTC +--- src/3rdparty/chromium/base/files/file_path_watcher.h.orig 2024-01-30 07:53:34 UTC +++ src/3rdparty/chromium/base/files/file_path_watcher.h -@@ -59,7 +59,7 @@ class BASE_EXPORT FilePathWatcher { +@@ -105,7 +105,7 @@ class BASE_EXPORT FilePathWatcher { Type type = Type::kNonRecursive; #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ diff --git a/www/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 7f2c78bd85af..2c01494e9c9d 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,6 +1,6 @@ ---- src/3rdparty/chromium/base/files/file_util_posix.cc.orig 2023-04-28 17:01:32 UTC +--- 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 -@@ -756,32 +756,34 @@ bool CreateDirectoryAndGetError(const FilePath& full_p +@@ -779,33 +779,34 @@ bool CreateDirectoryAndGetError(const FilePath& full_p File::Error* error) { ScopedBlockingCall scoped_blocking_call( FROM_HERE, BlockingType::MAY_BLOCK); // For call to mkdir(). @@ -34,11 +34,12 @@ - if (!DirectoryExists(subpath)) { - if (error) - *error = File::OSErrorToFileError(saved_errno); +- errno = saved_errno; - return false; + if (!PathExists(subpath)) { + if ((mkdir(subpath.value().c_str(), 0700) == -1) && + ((full_path != subpath) ? (errno != ENOENT) : (-1))) { -+ int saved_errno = errno; ++ int saved_errno = errno; + if (error) + *error = File::OSErrorToFileError(saved_errno); + return false; diff --git a/www/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 b08589c10ba7..6888a713aa1a 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,11 +1,11 @@ ---- src/3rdparty/chromium/base/functional/unretained_traits.h.orig 2023-02-08 09:03:45 UTC +--- src/3rdparty/chromium/base/functional/unretained_traits.h.orig 2024-02-23 21:04:38 UTC +++ src/3rdparty/chromium/base/functional/unretained_traits.h -@@ -130,7 +130,7 @@ struct TypeSupportsUnretained { +@@ -99,7 +99,7 @@ struct SupportsUnretainedImpl { // official builds, and then in non-test code as well. - #if !defined(UNIT_TEST) && !defined(OFFICIAL_BUILD) - #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \ -- defined(FORCE_UNRETAINED_COMPLETENESS_CHECKS_FOR_TESTS) -+ BUILDFLAG(IS_BSD) || defined(FORCE_UNRETAINED_COMPLETENESS_CHECKS_FOR_TESTS) - static_assert(IsCompleteTypeV || - IsIncompleteTypeSafeForUnretained>, - "T must be fully defined."); + #if defined(FORCE_UNRETAINED_COMPLETENESS_CHECKS_FOR_TESTS) || \ + (!defined(UNIT_TEST) && !defined(OFFICIAL_BUILD) && \ +- (BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN))) ++ (BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD))) + static_assert(v, + "Argument requires unretained storage, but type is not " + "fully defined. This prevents determining whether " diff --git a/www/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 5451c26e763e..21180842fd45 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,4 +1,4 @@ ---- src/3rdparty/chromium/base/i18n/icu_util.cc.orig 2023-12-12 22:08:45 UTC +--- src/3rdparty/chromium/base/i18n/icu_util.cc.orig 2024-07-03 01:14:49 UTC +++ src/3rdparty/chromium/base/i18n/icu_util.cc @@ -51,7 +51,7 @@ #include "third_party/icu/source/common/unicode/unistr.h" 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 c5250c813ac6..4a1abf1e0a4d 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,4 +1,4 @@ ---- src/3rdparty/chromium/base/linux_util.cc.orig 2023-09-13 12:11:42 UTC +--- src/3rdparty/chromium/base/linux_util.cc.orig 2023-12-10 06:10:27 UTC +++ src/3rdparty/chromium/base/linux_util.cc @@ -15,6 +15,7 @@ @@ -8,7 +8,7 @@ #include "base/base_export.h" #include "base/files/dir_reader_posix.h" -@@ -135,6 +136,9 @@ void SetLinuxDistro(const std::string& distro) { +@@ -153,10 +154,14 @@ void SetLinuxDistro(const std::string& distro) { } bool GetThreadsForProcess(pid_t pid, std::vector* tids) { @@ -18,11 +18,8 @@ // 25 > strlen("/proc//task") + strlen(std::to_string(INT_MAX)) + 1 = 22 char buf[25]; strings::SafeSPrintf(buf, "/proc/%d/task", pid); -@@ -152,6 +156,7 @@ bool GetThreadsForProcess(pid_t pid, std::vector* tids) { 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 c804a54c0a53..a4232aa1b790 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 2022-05-19 14:06:27 UTC +--- src/3rdparty/chromium/base/process/kill.h.orig 2024-02-23 21:04:38 UTC +++ src/3rdparty/chromium/base/process/kill.h -@@ -113,7 +113,7 @@ BASE_EXPORT TerminationStatus GetTerminationStatus(Pro +@@ -121,7 +121,7 @@ BASE_EXPORT TerminationStatus GetTerminationStatus(Pro BASE_EXPORT TerminationStatus GetKnownDeadTerminationStatus( ProcessHandle handle, int* exit_code); diff --git a/www/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 baefd731e0ae..42de8e181ceb 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 2022-08-31 12:19:35 UTC +--- src/3rdparty/chromium/base/process/launch_posix.cc.orig 2024-02-23 21:04:38 UTC +++ src/3rdparty/chromium/base/process/launch_posix.cc -@@ -64,6 +64,9 @@ +@@ -61,6 +61,9 @@ #error "macOS should use launch_mac.cc" #endif diff --git a/www/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 b2512dc2cf87..960f4534a3ca 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,6 +1,6 @@ ---- src/3rdparty/chromium/base/process/memory_linux.cc.orig 2023-02-08 09:03:45 UTC +--- src/3rdparty/chromium/base/process/memory_linux.cc.orig 2024-01-30 07:53:34 UTC +++ src/3rdparty/chromium/base/process/memory_linux.cc -@@ -20,6 +20,7 @@ +@@ -28,6 +28,7 @@ void __libc_free(void*); namespace base { @@ -8,7 +8,7 @@ namespace { void ReleaseReservationOrTerminate() { -@@ -29,12 +30,14 @@ void ReleaseReservationOrTerminate() { +@@ -37,12 +38,14 @@ void ReleaseReservationOrTerminate() { } } // namespace @@ -23,7 +23,7 @@ // Set the new-out of memory handler. std::set_new_handler(&ReleaseReservationOrTerminate); // If we're using glibc's allocator, the above functions will override -@@ -43,8 +46,10 @@ void EnableTerminationOnOutOfMemory() { +@@ -51,8 +54,10 @@ void EnableTerminationOnOutOfMemory() { #if BUILDFLAG(USE_ALLOCATOR_SHIM) allocator_shim::SetCallNewHandlerOnMallocFailure(true); #endif @@ -34,7 +34,7 @@ // ScopedAllowBlocking() has private constructor and it can only be used in // friend classes/functions. Declaring a class is easier in this situation to // avoid adding more dependency to thread_restrictions.h because of the -@@ -104,6 +109,7 @@ bool AdjustOOMScoreHelper::AdjustOOMScore(ProcessId pr +@@ -112,6 +117,7 @@ bool AdjustOOMScoreHelper::AdjustOOMScore(ProcessId pr bool AdjustOOMScore(ProcessId process, int score) { return AdjustOOMScoreHelper::AdjustOOMScore(process, score); } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__handle.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__handle.h index 6deac6b605b4..8a388dabb032 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__handle.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__handle.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/process/process_handle.h.orig 2022-02-28 16:54:41 UTC +--- src/3rdparty/chromium/base/process/process_handle.h.orig 2024-01-30 07:53:34 UTC +++ src/3rdparty/chromium/base/process/process_handle.h -@@ -106,7 +106,7 @@ BASE_EXPORT ProcessId GetCurrentProcId(); +@@ -86,7 +86,7 @@ BASE_EXPORT ProcessId GetCurrentProcId(); // processes may be reused. BASE_EXPORT UniqueProcId GetUniqueIdForProcess(); diff --git a/www/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 971c1f5333d9..5dce7a9d1395 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 2022-04-21 18:48:31 UTC +--- 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 @@ -3,6 +3,7 @@ // found in the LICENSE file. @@ -8,7 +8,7 @@ #include #include -@@ -15,10 +16,13 @@ namespace base { +@@ -19,10 +20,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__metrics.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics.h index d66d3ffb3d6a..1d56d25bb259 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,4 +1,4 @@ ---- src/3rdparty/chromium/base/process/process_metrics.h.orig 2023-09-13 12:11:42 UTC +--- src/3rdparty/chromium/base/process/process_metrics.h.orig 2023-12-10 06:10:27 UTC +++ src/3rdparty/chromium/base/process/process_metrics.h @@ -37,7 +37,7 @@ #endif @@ -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 -@@ -223,7 +223,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -219,7 +219,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; -@@ -244,7 +244,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -240,7 +240,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) -@@ -266,9 +266,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -262,9 +262,7 @@ 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_; @@ -64,7 +64,7 @@ #if BUILDFLAG(IS_WIN) TimeTicks last_cpu_time_for_precise_cpu_usage_; -@@ -276,7 +274,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -272,7 +270,7 @@ class BASE_EXPORT ProcessMetrics { #endif #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -73,7 +73,7 @@ // Same thing for idle wakeups. TimeTicks last_idle_wakeups_time_; uint64_t last_absolute_idle_wakeups_; -@@ -316,7 +314,7 @@ BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_de +@@ -313,7 +311,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 +82,7 @@ // Data about system-wide memory consumption. Values are in KB. Available on // Windows, Mac, Linux, Android and Chrome OS. // -@@ -351,7 +349,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -348,7 +346,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ @@ -91,7 +91,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 -@@ -366,7 +364,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -363,7 +361,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { #endif #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -100,7 +100,7 @@ int buffers = 0; int cached = 0; int active_anon = 0; -@@ -403,7 +401,7 @@ BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoK +@@ -400,7 +398,7 @@ BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoK // BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ @@ -109,7 +109,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. -@@ -591,7 +589,7 @@ class BASE_EXPORT SystemMetrics { +@@ -588,7 +586,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__openbsd.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics__openbsd.cc index 85a72669036d..2a620697c102 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,4 +1,4 @@ ---- src/3rdparty/chromium/base/process/process_metrics_openbsd.cc.orig 2023-09-13 12:11:42 UTC +--- 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 @@ -6,14 +6,23 @@ @@ -24,7 +24,7 @@ // static std::unique_ptr ProcessMetrics::CreateProcessMetrics( ProcessHandle process) { -@@ -24,49 +33,23 @@ bool ProcessMetrics::GetIOCounters(IoCounters* io_coun +@@ -24,52 +33,26 @@ bool ProcessMetrics::GetIOCounters(IoCounters* io_coun return false; } @@ -82,9 +82,17 @@ - size_t GetSystemCommitCharge() { int mib[] = { CTL_VM, VM_METER }; - int pagesize; -@@ -84,6 +67,133 @@ size_t GetSystemCommitCharge() { - pagesize = getpagesize(); +- int pagesize; ++ size_t pagesize; + struct vmtotal vmtotal; + unsigned long mem_total, mem_free, mem_inactive; + size_t len = sizeof(vmtotal); +@@ -81,9 +64,136 @@ size_t GetSystemCommitCharge() { + mem_free = vmtotal.t_free; + mem_inactive = vmtotal.t_vm - vmtotal.t_avm; + +- pagesize = getpagesize(); ++ pagesize = checked_cast(getpagesize()); return mem_total - (mem_free*pagesize) - (mem_inactive*pagesize); +} 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 b6c3709aa44a..a9b3706d0869 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-09-13 12:11:42 UTC +--- src/3rdparty/chromium/base/profiler/module_cache.cc.orig 2023-12-10 06:10:27 UTC +++ src/3rdparty/chromium/base/profiler/module_cache.cc -@@ -52,7 +52,7 @@ std::string TransformModuleIDToSymbolServerFormat(Stri +@@ -37,7 +37,7 @@ std::string TransformModuleIDToSymbolServerFormat(Stri // 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_rand__util.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_rand__util.h index 16eba4061a14..4ce613055bd6 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 2023-05-31 08:12:17 UTC +--- src/3rdparty/chromium/base/rand_util.h.orig 2024-02-23 21:04:38 UTC +++ src/3rdparty/chromium/base/rand_util.h -@@ -121,7 +121,7 @@ void RandomShuffle(Itr first, Itr last) { +@@ -149,7 +149,7 @@ void RandomShuffle(Itr first, Itr last) { std::shuffle(first, last, RandomBitGenerator()); } diff --git a/www/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 1461de852fc8..471cf59c095a 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 2022-11-30 08:12:58 UTC +--- src/3rdparty/chromium/base/rand_util_posix.cc.orig 2024-02-23 21:04:38 UTC +++ src/3rdparty/chromium/base/rand_util_posix.cc -@@ -22,7 +22,7 @@ +@@ -23,7 +23,7 @@ #include "base/time/time.h" #include "build/build_config.h" @@ -9,15 +9,15 @@ #include "third_party/lss/linux_syscall_support.h" #elif BUILDFLAG(IS_MAC) // TODO(crbug.com/995996): Waiting for this header to appear in the iOS SDK. -@@ -46,6 +46,7 @@ static constexpr int kOpenFlags = O_RDONLY; - static constexpr int kOpenFlags = O_RDONLY | O_CLOEXEC; - #endif +@@ -40,6 +40,7 @@ namespace base { + + namespace { +#if !BUILDFLAG(IS_BSD) - // We keep the file descriptor for /dev/urandom around so we don't need to - // reopen it (which is expensive), and since we may not even be able to reopen - // it if we are later put in a sandbox. This class wraps the file descriptor so -@@ -63,10 +64,11 @@ class URandomFd { + #if BUILDFLAG(IS_AIX) + // AIX has no 64-bit support for O_CLOEXEC. + static constexpr int kOpenFlags = O_RDONLY; +@@ -64,10 +65,11 @@ class URandomFd { private: const int fd_; }; @@ -30,26 +30,26 @@ // TODO(pasko): Unify reading kernel version numbers in: // mojo/core/channel_linux.cc // chrome/browser/android/seccomp_support_detector.cc -@@ -176,6 +178,7 @@ bool UseBoringSSLForRandBytes() { +@@ -177,6 +179,7 @@ bool UseBoringSSLForRandBytes() { namespace { - void RandBytes(void* output, size_t output_length, bool avoid_allocation) { + void RandBytes(span output, bool avoid_allocation) { +#if !BUILDFLAG(IS_BSD) #if !BUILDFLAG(IS_NACL) // The BoringSSL experiment takes priority over everything else. if (!avoid_allocation && internal::UseBoringSSLForRandBytes()) { -@@ -214,6 +217,9 @@ void RandBytes(void* output, size_t output_length, boo - const bool success = - ReadFromFD(urandom_fd, static_cast(output), output_length); +@@ -215,6 +218,9 @@ void RandBytes(span output, bool avoid_alloca + const int urandom_fd = GetUrandomFD(); + const bool success = ReadFromFD(urandom_fd, as_writable_chars(output)); CHECK(success); +#else -+ arc4random_buf(static_cast(output), output_length); ++ arc4random_buf(output.data(), output.size()); +#endif } } // namespace -@@ -233,9 +239,11 @@ void RandBytes(void* output, size_t output_length) { - RandBytes(output, output_length, /*avoid_allocation=*/false); +@@ -239,9 +245,11 @@ void RandBytes(void* output, size_t output_length) { + RandBytes(make_span(reinterpret_cast(output), output_length)); } +#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 c8e47824e0de..fd4ad388e446 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 2023-04-05 11:05:06 UTC +--- src/3rdparty/chromium/base/synchronization/lock_impl.h.orig 2024-02-23 21:04:38 UTC +++ src/3rdparty/chromium/base/synchronization/lock_impl.h -@@ -104,6 +104,10 @@ void LockImpl::Unlock() { +@@ -106,6 +106,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); -@@ -124,6 +128,9 @@ void LockImpl::Unlock() { +@@ -126,6 +130,9 @@ void LockImpl::Unlock() { dcheck_unlock_result(rv); #endif } 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 db411e4749cd..5d87ae9d6091 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-09-13 12:11:42 UTC +--- src/3rdparty/chromium/base/system/sys_info.cc.orig 2023-12-10 06:10:27 UTC +++ src/3rdparty/chromium/base/system/sys_info.cc -@@ -166,7 +166,7 @@ std::string SysInfo::HardwareModelName() { +@@ -225,7 +225,7 @@ std::string SysInfo::HardwareModelName() { #endif void SysInfo::GetHardwareInfo(base::OnceCallback 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 b69d60cc2735..6a387650cccf 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 2023-10-11 18:22:24 UTC +--- src/3rdparty/chromium/base/system/sys_info.h.orig 2024-01-30 07:53:34 UTC +++ src/3rdparty/chromium/base/system/sys_info.h -@@ -266,6 +266,8 @@ class BASE_EXPORT SysInfo { +@@ -318,6 +318,8 @@ class BASE_EXPORT SysInfo { static void ResetCpuSecurityMitigationsEnabledForTesting(); #endif @@ -9,7 +9,7 @@ private: friend class test::ScopedAmountOfPhysicalMemoryOverride; FRIEND_TEST_ALL_PREFIXES(SysInfoTest, AmountOfAvailablePhysicalMemory); -@@ -278,7 +280,7 @@ class BASE_EXPORT SysInfo { +@@ -330,7 +332,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__openbsd.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info__openbsd.cc index f960daeacd85..ce417f051022 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,21 +1,28 @@ ---- src/3rdparty/chromium/base/system/sys_info_openbsd.cc.orig 2022-08-31 12:19:35 UTC +--- 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 -@@ -11,6 +11,7 @@ - #include +@@ -3,7 +3,6 @@ + // found in the LICENSE file. + + #include "base/system/sys_info.h" +- + #include + #include + #include +@@ -12,6 +11,7 @@ #include "base/notreached.h" + #include "base/posix/sysctl.h" +#include "base/strings/string_util.h" namespace { -@@ -26,9 +27,15 @@ uint64_t AmountOfMemory(int pages_name) { +@@ -27,9 +27,14 @@ uint64_t AmountOfMemory(int pages_name) { namespace base { +// pledge(2) -+int64_t aofpmem = 0; -+int64_t aofapmem = 0; -+int64_t shmmax = 0; ++uint64_t aofpmem = 0; ++uint64_t shmmax = 0; +char cpumodel[256]; + // static @@ -25,7 +32,7 @@ int ncpu; size_t size = sizeof(ncpu); if (sysctl(mib, std::size(mib), &ncpu, &size, NULL, 0) < 0) { -@@ -40,10 +47,26 @@ int SysInfo::NumberOfProcessors() { +@@ -41,10 +46,26 @@ int SysInfo::NumberOfProcessors() { // static uint64_t SysInfo::AmountOfPhysicalMemoryImpl() { @@ -53,7 +60,7 @@ uint64_t SysInfo::AmountOfAvailablePhysicalMemoryImpl() { // We should add inactive file-backed memory also but there is no such // information from OpenBSD unfortunately. -@@ -55,23 +78,28 @@ uint64_t SysInfo::MaxSharedMemorySize() { +@@ -56,16 +77,28 @@ uint64_t SysInfo::MaxSharedMemorySize() { int mib[] = {CTL_KERN, KERN_SHMINFO, KERN_SHMINFO_SHMMAX}; size_t limit; size_t size = sizeof(limit); @@ -72,14 +79,7 @@ // static -std::string SysInfo::CPUModelName() { -- int mib[] = {CTL_HW, HW_MODEL}; -- char name[256]; -- size_t len = std::size(name); -- if (sysctl(mib, std::size(mib), name, &len, NULL, 0) < 0) { -- NOTREACHED(); -- return std::string(); -- } -- return name; +- return StringSysctl({CTL_HW, HW_MODEL}).value(); +SysInfo::HardwareInfo SysInfo::GetHardwareInfoSync() { + HardwareInfo info; + // Set the manufacturer to "OpenBSD" and the model to diff --git a/www/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 73a5f9f01a17..acb43f21eb86 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-08-17 07:33:31 UTC +--- 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 @@ -117,7 +117,7 @@ bool GetDiskSpaceInfo(const base::FilePath& path, @@ -6,19 +6,19 @@ -#if !BUILDFLAG(IS_OPENBSD) +#if !BUILDFLAG(IS_BSD) + // static int SysInfo::NumberOfProcessors() { #if BUILDFLAG(IS_MAC) - absl::optional number_of_physical_cores = -@@ -161,7 +161,7 @@ int SysInfo::NumberOfProcessors() { +@@ -174,7 +174,7 @@ int SysInfo::NumberOfProcessors() { - return num_cpus; + return cached_num_cpus; } -#endif // !BUILDFLAG(IS_OPENBSD) +#endif // !BUILDFLAG(IS_BSD) // static uint64_t SysInfo::AmountOfVirtualMemory() { -@@ -251,6 +251,8 @@ std::string SysInfo::OperatingSystemArchitecture() { +@@ -264,6 +264,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_threading_platform__thread__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_threading_platform__thread__posix.cc index 3e8c5740f048..39a3f3cb2e0f 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,6 +1,6 @@ ---- src/3rdparty/chromium/base/threading/platform_thread_posix.cc.orig 2023-09-13 12:11:42 UTC +--- 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 -@@ -76,12 +76,12 @@ void* ThreadFunc(void* params) { +@@ -78,12 +78,12 @@ void* ThreadFunc(void* params) { if (!thread_params->joinable) base::DisallowSingleton(); @@ -15,7 +15,7 @@ #if BUILDFLAG(IS_APPLE) PlatformThread::SetCurrentThreadRealtimePeriodValue( delegate->GetRealtimePeriod()); -@@ -353,7 +353,7 @@ void PlatformThreadBase::Detach(PlatformThreadHandle t +@@ -357,7 +357,7 @@ void PlatformThreadBase::Detach(PlatformThreadHandle t // static bool PlatformThreadBase::CanChangeThreadType(ThreadType from, ThreadType to) { @@ -24,7 +24,7 @@ return false; #else if (from >= to) { -@@ -374,6 +374,9 @@ void SetCurrentThreadTypeImpl(ThreadType thread_type, +@@ -378,6 +378,9 @@ void SetCurrentThreadTypeImpl(ThreadType thread_type, MessagePumpType pump_type_hint) { #if BUILDFLAG(IS_NACL) NOTIMPLEMENTED(); @@ -34,7 +34,7 @@ #else if (internal::SetCurrentThreadTypeForPlatform(thread_type, pump_type_hint)) return; -@@ -396,7 +399,7 @@ void SetCurrentThreadTypeImpl(ThreadType thread_type, +@@ -400,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 dc3be50876aa..feb1cc8aef43 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,4 +1,4 @@ ---- src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc.orig 2023-09-13 12:11:42 UTC +--- 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 @@ -25,6 +25,8 @@ @@ -9,7 +9,7 @@ #else #include #endif -@@ -188,7 +190,7 @@ void ReportAppleAllocStats(size_t* total_virtual_size, +@@ -182,7 +184,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) && \ @@ -18,7 +18,7 @@ void ReportMallinfoStats(ProcessMemoryDump* pmd, size_t* total_virtual_size, size_t* resident_size, -@@ -359,6 +361,9 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDump +@@ -353,6 +355,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_trace__log.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_trace__event_trace__log.cc deleted file mode 100644 index 6fe3d1861bc9..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_trace__event_trace__log.cc +++ /dev/null @@ -1,16 +0,0 @@ ---- src/3rdparty/chromium/base/trace_event/trace_log.cc.orig 2023-10-11 18:22:24 UTC -+++ src/3rdparty/chromium/base/trace_event/trace_log.cc -@@ -2190,8 +2190,13 @@ void TraceLog::SetTraceBufferForTesting( - #if BUILDFLAG(USE_PERFETTO_CLIENT_LIBRARY) - void TraceLog::OnSetup(const perfetto::DataSourceBase::SetupArgs& args) { - AutoLock lock(track_event_lock_); -+#if defined(__clang__) && (__clang_major__ >= 16) - track_event_sessions_.emplace_back(args.internal_instance_index, *args.config, - args.backend_type); -+#else -+ track_event_sessions_.emplace_back(TrackEventSession{args.internal_instance_index, *args.config, -+ args.backend_type}); -+#endif - } - - void TraceLog::OnStart(const perfetto::DataSourceBase::StartArgs&) { diff --git a/www/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 a3f30fdd37eb..b1a4a3cee529 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,4 +1,4 @@ ---- src/3rdparty/chromium/build/config/BUILD.gn.orig 2023-12-12 22:08:45 UTC +--- src/3rdparty/chromium/build/config/BUILD.gn.orig 2024-07-03 01:14:49 UTC +++ src/3rdparty/chromium/build/config/BUILD.gn @@ -218,6 +218,10 @@ config("default_libs") { # Targets should choose to explicitly link frameworks they require. Since 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 c9eb9e97a18d..a363b506a353 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 2023-12-12 22:08:45 UTC +--- src/3rdparty/chromium/build/config/BUILDCONFIG.gn.orig 2024-07-03 01:14:49 UTC +++ src/3rdparty/chromium/build/config/BUILDCONFIG.gn @@ -136,7 +136,8 @@ declare_args() { is_official_build = false 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 7945516dc450..0d429b73c061 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 2023-12-12 22:08:45 UTC +--- src/3rdparty/chromium/build/config/compiler/BUILD.gn.orig 2024-07-03 01:14:49 UTC +++ src/3rdparty/chromium/build/config/compiler/BUILD.gn -@@ -198,7 +198,7 @@ declare_args() { +@@ -210,7 +210,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() { -@@ -262,13 +262,16 @@ config("no_unresolved_symbols") { +@@ -274,13 +274,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") { @@ -27,7 +27,7 @@ } # compiler --------------------------------------------------------------------- -@@ -555,6 +558,10 @@ config("compiler") { +@@ -568,6 +571,10 @@ config("compiler") { } } @@ -38,16 +38,7 @@ # Linux-specific compiler flags setup. # ------------------------------------ if (use_gold) { -@@ -823,7 +830,7 @@ config("compiler") { - - ldflags += [ "-Wl,-mllvm,-import-instr-limit=$import_instr_limit" ] - -- if (!is_chromeos) { -+ if (!is_chromeos && !is_bsd) { - # TODO(https://crbug.com/972449): turn on for ChromeOS when that - # toolchain has this flag. - # We only use one version of LLVM within a build so there's no need to -@@ -1170,7 +1177,7 @@ config("compiler_cpu_abi") { +@@ -1232,7 +1239,7 @@ config("compiler_cpu_abi") { ] } } else if (current_cpu == "arm") { @@ -56,7 +47,7 @@ !(is_chromeos_lacros && is_chromeos_device)) { cflags += [ "--target=arm-linux-gnueabihf" ] ldflags += [ "--target=arm-linux-gnueabihf" ] -@@ -1188,7 +1195,7 @@ config("compiler_cpu_abi") { +@@ -1250,7 +1257,7 @@ config("compiler_cpu_abi") { cflags += [ "-mtune=$arm_tune" ] } } else if (current_cpu == "arm64") { @@ -65,7 +56,7 @@ !(is_chromeos_lacros && is_chromeos_device)) { cflags += [ "--target=aarch64-linux-gnu" ] ldflags += [ "--target=aarch64-linux-gnu" ] -@@ -1523,7 +1530,7 @@ config("compiler_deterministic") { +@@ -1585,7 +1592,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. @@ -74,7 +65,7 @@ # TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here. cflags += [ "-Xclang", -@@ -1575,7 +1582,7 @@ config("clang_revision") { +@@ -1637,7 +1644,7 @@ config("clang_revision") { } config("clang_revision") { @@ -83,16 +74,21 @@ update_args = [ "--print-revision", "--verify-version=$clang_version", -@@ -2005,7 +2012,7 @@ config("default_warnings") { - "-Wno-ignored-pragma-optimize", +@@ -2102,12 +2109,9 @@ config("default_warnings") { + + # TODO(crbug.com/1494809): Evaluate and possibly enable. + "-Wno-vla-extension", +- +- # TODO(https://crbug.com/1490607): Fix and re-enable. +- "-Wno-thread-safety-reference-return", ] - if (!is_nacl) { + if (!is_nacl && !is_bsd) { - cflags += [ - # TODO(crbug.com/1343975) Evaluate and possibly enable. - "-Wno-deprecated-builtins", -@@ -2218,7 +2225,7 @@ config("no_chromium_code") { + cflags_cc += [ + # TODO(https://crbug.com/1513724): 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", ] @@ -101,7 +97,7 @@ cflags += [ # Disabled for similar reasons as -Wunused-variable. "-Wno-unused-but-set-variable", -@@ -2736,7 +2743,7 @@ config("afdo") { +@@ -2832,7 +2836,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") { @@ -110,7 +106,7 @@ cflags = [] if (clang_emit_debug_info_for_profiling) { # Add the following flags to generate debug info for profiling. -@@ -2763,7 +2770,7 @@ config("afdo") { +@@ -2859,7 +2863,7 @@ config("afdo") { cflags += [ "-Wno-backend-plugin" ] inputs = [ _clang_sample_profile ] } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_compiler_pgo_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_compiler_pgo_BUILD.gn deleted file mode 100644 index e5f736b1a13c..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_compiler_pgo_BUILD.gn +++ /dev/null @@ -1,19 +0,0 @@ ---- src/3rdparty/chromium/build/config/compiler/pgo/BUILD.gn.orig 2023-10-11 18:22:24 UTC -+++ src/3rdparty/chromium/build/config/compiler/pgo/BUILD.gn -@@ -143,13 +143,14 @@ config("pgo_optimization_flags") { - - # Enable basic block layout based on the extended TSP problem. This aims to - # improve icache utilization and reduce the binary size. -- if (use_thin_lto) { -+ # __clang_major__ >= 15 -+ if (use_thin_lto && !is_bsd) { - if (is_win) { - ldflags = [ "-mllvm:-enable-ext-tsp-block-placement=1" ] - } else { - ldflags = [ "-Wl,-mllvm,-enable-ext-tsp-block-placement=1" ] - } -- } else { -+ } else if (!is_bsd) { - cflags += [ - "-mllvm", - "-enable-ext-tsp-block-placement=1", diff --git a/www/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 afea5c617dfa..53f55b9e38ed 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,11 +1,11 @@ ---- src/3rdparty/chromium/build/config/linux/pkg-config.py.orig 2024-01-23 10:07:29 UTC +--- 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 -@@ -108,7 +108,7 @@ def main(): +@@ -113,7 +113,7 @@ def main(): # If this is run on non-Linux platforms, just return nothing and indicate # success. This allows us to "kind of emulate" a Linux build from other # platforms. - if 'linux' not in sys.platform and 'darwin' not in sys.platform: -+ if not sys.platform.startswith(tuple(['linux', 'darwin', 'freebsd', 'openbsd'])): ++ if not sys.platform.startswith(tuple(['linux', 'darwin', 'openbsd', 'freebsd'])): print("[[],[],[],[],[]]") return 0 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 763302535df5..9acc98da34de 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 2023-12-12 22:08:45 UTC +--- src/3rdparty/chromium/build/config/ozone.gni.orig 2024-07-03 01:14:49 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_linux_unbundle_libusb.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_linux_unbundle_libusb.gn index 0e8b7f3eb7b2..525cb25f834f 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_linux_unbundle_libusb.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_linux_unbundle_libusb.gn @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/build/linux/unbundle/libusb.gn.orig 2021-04-15 08:12:30 UTC +--- src/3rdparty/chromium/build/linux/unbundle/libusb.gn.orig 2023-12-10 06:10:27 UTC +++ src/3rdparty/chromium/build/linux/unbundle/libusb.gn -@@ -0,0 +1,24 @@ +@@ -1,3 +1,27 @@ +# Copyright 2016 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. @@ -25,3 +25,6 @@ + ] + public_configs = [ ":system_libusb" ] +} + import("//build/config/linux/pkg_config.gni") + import("//build/shim_headers.gni") + diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_linux_unbundle_replace__gn__files.py b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_linux_unbundle_replace__gn__files.py deleted file mode 100644 index e8c33a90dee5..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_linux_unbundle_replace__gn__files.py +++ /dev/null @@ -1,10 +0,0 @@ ---- src/3rdparty/chromium/build/linux/unbundle/replace_gn_files.py.orig 2023-02-08 09:03:45 UTC -+++ src/3rdparty/chromium/build/linux/unbundle/replace_gn_files.py -@@ -54,6 +54,7 @@ REPLACEMENTS = { - 'libevent': 'third_party/libevent/BUILD.gn', - 'libjpeg': 'third_party/libjpeg.gni', - 'libpng': 'third_party/libpng/BUILD.gn', -+ 'libusb': 'third_party/libusb/BUILD.gn', - 'libvpx': 'third_party/libvpx/BUILD.gn', - 'libwebp': 'third_party/libwebp/BUILD.gn', - 'libxml': 'third_party/libxml/BUILD.gn', diff --git a/www/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 a83eea70421e..d7729787e2fa 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,4 +1,4 @@ ---- src/3rdparty/chromium/build/toolchain/gcc_toolchain.gni.orig 2023-12-12 22:08:45 UTC +--- src/3rdparty/chromium/build/toolchain/gcc_toolchain.gni.orig 2024-07-03 01:14:49 UTC +++ src/3rdparty/chromium/build/toolchain/gcc_toolchain.gni @@ -53,6 +53,13 @@ if (enable_resource_allowlist_generation) { "enable_resource_allowlist_generation=true does not work for target_os=$target_os") @@ -14,7 +14,7 @@ # This template defines a toolchain for something that works like gcc # (including clang). # -@@ -888,22 +895,12 @@ template("clang_toolchain") { +@@ -900,22 +907,12 @@ template("clang_toolchain") { # use_gold too. template("clang_toolchain") { gcc_toolchain(target_name) { @@ -40,5 +40,5 @@ + ar = "ar" + nm = "nm" - forward_variables_from(invoker, - [ + forward_variables_from(invoker, "*", [ "toolchain_args" ]) + 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 ce33cb085585..fffdf3103a89 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,6 +1,6 @@ ---- src/3rdparty/chromium/build/toolchain/toolchain.gni.orig 2023-10-11 18:22:24 UTC +--- src/3rdparty/chromium/build/toolchain/toolchain.gni.orig 2023-11-03 10:09:45 UTC +++ src/3rdparty/chromium/build/toolchain/toolchain.gni -@@ -67,7 +67,7 @@ if (host_os == "mac") { +@@ -72,7 +72,7 @@ if (host_os == "mac") { host_shlib_extension = ".dylib" } else if (host_os == "win") { host_shlib_extension = ".dll" 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 index 416cda0112e3..c3442f05bde9 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_cc_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_cc_BUILD.gn @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/cc/BUILD.gn.orig 2023-10-11 18:22:24 UTC +--- src/3rdparty/chromium/cc/BUILD.gn.orig 2024-02-23 21:04:38 UTC +++ src/3rdparty/chromium/cc/BUILD.gn -@@ -674,7 +674,7 @@ cc_test_static_library("test_support") { +@@ -678,7 +678,7 @@ cc_test_static_library("test_support") { if (enable_vulkan) { deps += [ "//gpu/vulkan/init" ] } @@ -9,7 +9,7 @@ data_deps = [ "//third_party/mesa_headers" ] } if (skia_use_dawn) { -@@ -929,7 +929,6 @@ cc_test("cc_unittests") { +@@ -938,7 +938,6 @@ cc_test("cc_unittests") { data = [ "//components/test/data/viz/" ] data_deps = [ "//testing/buildbot/filters:cc_unittests_filters", 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 17cb349564cb..d3eec63f01aa 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,11 +1,11 @@ ---- src/3rdparty/chromium/cc/base/features.cc.orig 2023-12-12 22:08:45 UTC +--- src/3rdparty/chromium/cc/base/features.cc.orig 2024-07-03 01:14:49 UTC +++ src/3rdparty/chromium/cc/base/features.cc -@@ -85,7 +85,7 @@ CONSTINIT const base::Feature kUseDMSAAForTiles( +@@ -89,7 +89,7 @@ BASE_FEATURE(kNormalPriorityImageDecoding, + // Note that kUseDMSAAForTiles only controls vulkan launch on android. We will // be using a separate flag to control the launch on GL. - CONSTINIT const base::Feature kUseDMSAAForTiles( - "UseDMSAAForTiles", + -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) - base::FEATURE_ENABLED_BY_DEFAULT - #else - base::FEATURE_DISABLED_BY_DEFAULT + BASE_FEATURE(kUseDMSAAForTiles, + "UseDMSAAForTiles", + base::FEATURE_ENABLED_BY_DEFAULT); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_app_app__management__strings.grdp b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_app_app__management__strings.grdp deleted file mode 100644 index a336b3f36bc5..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_app_app__management__strings.grdp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/chrome/app/app_management_strings.grdp.orig 2023-09-13 12:11:42 UTC -+++ src/3rdparty/chromium/chrome/app/app_management_strings.grdp -@@ -188,7 +188,7 @@ - You can open and edit supported files with this app from Finder or other apps. To control which files open this app by default, <a href="#">learn how to set default apps on your device</a>. - - -- -+ - - You can open and edit supported files with this app from your file browser or other apps. To control which files open this app by default, <a href="#">learn how to set default apps on your device</a>. - diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_app_chromium__strings.grd b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_app_chromium__strings.grd deleted file mode 100644 index 378a00f12881..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_app_chromium__strings.grd +++ /dev/null @@ -1,38 +0,0 @@ ---- src/3rdparty/chromium/chrome/app/chromium_strings.grd.orig 2023-09-13 12:11:42 UTC -+++ src/3rdparty/chromium/chrome/app/chromium_strings.grd -@@ -315,7 +315,7 @@ If you update this file, be sure also to update google - Welcome to Chromium; new browser window opened - - -- -+ - - Welcome to Chromium - -@@ -465,7 +465,7 @@ If you update this file, be sure also to update google - To get future Chromium updates, you'll need Windows 10 or later. This computer is using Windows 8.1. - - -- -+ - - Chromium may not function correctly because it is no longer supported on this Linux distribution - -@@ -870,7 +870,7 @@ Permissions you've already given to websites and apps - - - -- -+ - - Not used in Chromium. Placeholder to keep resource maps in sync. - -@@ -1255,7 +1255,7 @@ Permissions you've already given to websites and apps - - - -- -+ - - Not used in Chromium. Placeholder to keep resource maps in sync. - diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_app_generated__resources.grd b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_app_generated__resources.grd deleted file mode 100644 index 185d3fbc661b..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_app_generated__resources.grd +++ /dev/null @@ -1,92 +0,0 @@ ---- src/3rdparty/chromium/chrome/app/generated_resources.grd.orig 2023-10-11 18:22:24 UTC -+++ src/3rdparty/chromium/chrome/app/generated_resources.grd -@@ -2,7 +2,7 @@ - - -@@ -3601,7 +3601,7 @@ are declared in tools/grit/grit_rule.gni. - - - -- -+ - - Device Credentials - -@@ -5432,7 +5432,7 @@ are declared in tools/grit/grit_rule.gni. - Read information about your browser, OS, device, installed software, registry values and files - - -- -+ - - Read information about your browser, OS, device, installed software and files - -@@ -6145,7 +6145,7 @@ Keep your key file in a safe place. You will need it t - Old versions of Chrome Apps won't open on Windows devices after December 2022. Contact your administrator to update to a new version or remove this app. - - -- -+ - - Old versions of Chrome Apps won't open on Linux devices after December 2022. Contact your administrator to update to a new version or remove this app. - -@@ -6191,7 +6191,7 @@ Keep your key file in a safe place. You will need it t - Old versions of Chrome apps won't open on Windows devices after December 2022. You can check if there's a new version available. - - -- -+ - - Old versions of Chrome apps won't open on Linux devices after December 2022. You can check if there's a new version available. - -@@ -10396,7 +10396,7 @@ Check your passwords anytime in - Update - -- -+ - - Finish update - -@@ -10743,7 +10743,7 @@ Check your passwords anytime in -+ - - Use system title bar and borders - -@@ -11728,7 +11728,7 @@ Check your passwords anytime in -+ - - Share information about your device? - -@@ -12136,7 +12136,7 @@ Please help our engineers fix this problem. Tell us wh - Set as default - - -- -+ - - Minimize - -@@ -14346,7 +14346,7 @@ Please help our engineers fix this problem. Tell us wh - Open Anyway - - -- -+ - - System Signals Utilities - diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_app_google__chrome__strings.grd b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_app_google__chrome__strings.grd deleted file mode 100644 index fdd0c329a1d4..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_app_google__chrome__strings.grd +++ /dev/null @@ -1,38 +0,0 @@ ---- src/3rdparty/chromium/chrome/app/google_chrome_strings.grd.orig 2023-09-13 12:11:42 UTC -+++ src/3rdparty/chromium/chrome/app/google_chrome_strings.grd -@@ -301,7 +301,7 @@ chromium_strings.grd. --> - Welcome to Chrome; new browser window opened - - -- -+ - - Welcome to Google Chrome - -@@ -453,7 +453,7 @@ chromium_strings.grd. --> - To get future Google Chrome updates, you'll need Windows 10 or later. This computer is using Windows 8.1. - - -- -+ - - Google Chrome may not function correctly because it is no longer supported on this Linux distribution - -@@ -855,7 +855,7 @@ Permissions you've already given to websites and apps - - - -- -+ - - - Relaunch to Update - Your tabs will reopen -@@ -1278,7 +1278,7 @@ Permissions you've already given to websites and apps - - - -- -+ - - Relaunch to finish Chrome update - diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_app_profiles__strings.grdp b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_app_profiles__strings.grdp deleted file mode 100644 index 1d8767a94030..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_app_profiles__strings.grdp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/chrome/app/profiles_strings.grdp.orig 2023-09-13 12:11:42 UTC -+++ src/3rdparty/chromium/chrome/app/profiles_strings.grdp -@@ -54,7 +54,7 @@ - Add Profile... - - -- -+ - - Add profile... - diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_app_settings__strings.grdp b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_app_settings__strings.grdp deleted file mode 100644 index 09d3a37079d2..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_app_settings__strings.grdp +++ /dev/null @@ -1,35 +0,0 @@ ---- src/3rdparty/chromium/chrome/app/settings_strings.grdp.orig 2023-10-11 18:22:24 UTC -+++ src/3rdparty/chromium/chrome/app/settings_strings.grdp -@@ -183,12 +183,12 @@ - Manage accessibility features - - -- -+ - - Swipe between pages - - -- -+ - - Navigate back and forward with swipe gesture - -@@ -222,7 +222,7 @@ - Theme - - -- -+ - - GTK - -@@ -242,7 +242,7 @@ - Use Classic - - -- -+ - - Reset to default - diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_app_theme_chrome__unscaled__resources.grd b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_app_theme_chrome__unscaled__resources.grd deleted file mode 100644 index f3ceafba7bcb..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_app_theme_chrome__unscaled__resources.grd +++ /dev/null @@ -1,29 +0,0 @@ ---- src/3rdparty/chromium/chrome/app/theme/chrome_unscaled_resources.grd.orig 2023-07-16 15:47:57 UTC -+++ src/3rdparty/chromium/chrome/app/theme/chrome_unscaled_resources.grd -@@ -16,7 +16,7 @@ - - - -- -+ - - - -@@ -61,7 +61,7 @@ - - - -- -+ - - - -@@ -75,7 +75,7 @@ - - - -- -+ - - - diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_app_theme_theme__resources.grd b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_app_theme_theme__resources.grd deleted file mode 100644 index 10224bce93ce..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_app_theme_theme__resources.grd +++ /dev/null @@ -1,59 +0,0 @@ ---- src/3rdparty/chromium/chrome/app/theme/theme_resources.grd.orig 2023-10-11 18:22:24 UTC -+++ src/3rdparty/chromium/chrome/app/theme/theme_resources.grd -@@ -146,14 +146,14 @@ - - - -- -+ - - - - - - -- -+ - - - -@@ -161,7 +161,7 @@ - - - -- -+ - - - -@@ -173,7 +173,7 @@ - - - -- -+ - - - -@@ -182,10 +182,10 @@ - - - -- -+ - - -- -+ - - - -@@ -194,7 +194,7 @@ - - - -- -+ - - - 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 95970a4cb06a..412f381805dd 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 2023-12-12 22:08:45 UTC +--- src/3rdparty/chromium/chrome/browser/BUILD.gn.orig 2024-07-03 01:14:49 UTC +++ src/3rdparty/chromium/chrome/browser/BUILD.gn -@@ -6312,6 +6312,13 @@ static_library("browser") { +@@ -6399,6 +6399,13 @@ static_library("browser") { } } 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 new file mode 100644 index 000000000000..7ca2a45a6474 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_accessibility_pdf__ocr__controller.cc @@ -0,0 +1,11 @@ +--- 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 808db0af5867..598bdbbfeb4f 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 2023-12-12 22:08:45 UTC +--- 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 @@ -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 06da7024e1e3..1b7b8992c403 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 2023-10-11 18:22:24 UTC +--- src/3rdparty/chromium/chrome/browser/extensions/BUILD.gn.orig 2024-02-23 21:04:38 UTC +++ src/3rdparty/chromium/chrome/browser/extensions/BUILD.gn -@@ -1372,6 +1372,10 @@ static_library("extensions") { +@@ -1380,6 +1380,10 @@ static_library("extensions") { deps += [ "//chrome/services/printing/public/mojom" ] } 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 06a864400955..aca216dad4b2 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,15 +1,15 @@ ---- src/3rdparty/chromium/chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc.orig 2023-10-11 18:22:24 UTC +--- 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 -@@ -43,7 +43,7 @@ - #include "extensions/browser/api/bluetooth_low_energy/bluetooth_low_energy_api.h" +@@ -44,7 +44,7 @@ #include "extensions/browser/api/networking_private/networking_private_delegate_factory.h" + #include "printing/buildflags/buildflags.h" -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) #include "chrome/browser/extensions/api/system_indicator/system_indicator_manager_factory.h" #endif -@@ -108,7 +108,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt +@@ -127,7 +127,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_chrome__desktop__report__request__helper.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_enterprise__reporting__private_chrome__desktop__report__request__helper.cc index 5f0523de5f4c..ce8bf35ceb3c 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_enterprise__reporting__private_chrome__desktop__report__request__helper.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_enterprise__reporting__private_chrome__desktop__report__request__helper.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc.orig 2022-07-22 17:30:31 UTC +--- src/3rdparty/chromium/chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc.orig 2024-01-30 07:53:34 UTC +++ src/3rdparty/chromium/chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc @@ -24,7 +24,7 @@ #include "base/win/registry.h" @@ -9,7 +9,7 @@ #include "base/environment.h" #include "base/nix/xdg_util.h" #endif -@@ -256,7 +256,7 @@ base::FilePath GetEndpointVerificationDir() { +@@ -255,7 +255,7 @@ base::FilePath GetEndpointVerificationDir() { bool got_path = false; #if BUILDFLAG(IS_WIN) got_path = base::PathService::Get(base::DIR_LOCAL_APP_DATA, &path); @@ -18,7 +18,7 @@ std::unique_ptr env(base::Environment::Create()); path = base::nix::GetXDGDirectory(env.get(), base::nix::kXdgConfigHomeEnvVar, base::nix::kDotConfigDir); -@@ -267,7 +267,7 @@ base::FilePath GetEndpointVerificationDir() { +@@ -266,7 +266,7 @@ base::FilePath GetEndpointVerificationDir() { if (!got_path) return path; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_enterprise__reporting__private_conversion__utils.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_enterprise__reporting__private_conversion__utils.h index 36906235599b..17166dd42a66 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_enterprise__reporting__private_conversion__utils.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_enterprise__reporting__private_conversion__utils.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/chrome/browser/extensions/api/enterprise_reporting_private/conversion_utils.h.orig 2022-08-31 12:19:35 UTC +--- src/3rdparty/chromium/chrome/browser/extensions/api/enterprise_reporting_private/conversion_utils.h.orig 2024-02-23 21:04:38 UTC +++ src/3rdparty/chromium/chrome/browser/extensions/api/enterprise_reporting_private/conversion_utils.h @@ -7,7 +7,7 @@ @@ -7,5 +7,5 @@ -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include #include - 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 971325d39aff..567d9a7b848c 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,4 +1,4 @@ ---- src/3rdparty/chromium/chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc.orig 2023-04-28 17:01:32 UTC +--- 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 @@ -32,7 +32,7 @@ #include "components/reporting/util/statusor.h" @@ -6,9 +6,9 @@ -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include + #include "base/strings/string_util.h" - #include "chrome/browser/enterprise/signals/signals_aggregator_factory.h" - #include "chrome/browser/extensions/api/enterprise_reporting_private/conversion_utils.h" @@ -149,7 +149,7 @@ api::enterprise_reporting_private::ContextInfo ToConte return info; } @@ -27,7 +27,7 @@ EnterpriseReportingPrivateGetPersistentSecretFunction:: EnterpriseReportingPrivateGetPersistentSecretFunction() = default; -@@ -637,7 +637,7 @@ void EnterpriseReportingPrivateEnqueueRecordFunction:: +@@ -636,7 +636,7 @@ void EnterpriseReportingPrivateEnqueueRecordFunction:: } #endif 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_native__process__launcher__posix.cc index 91fcc20ed463..c3ae9c1184ad 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_native__process__launcher__posix.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/chrome/browser/extensions/api/messaging/native_process_launcher_posix.cc.orig 2022-02-28 16:54:41 UTC +--- 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 -@@ -82,7 +82,7 @@ bool NativeProcessLauncher::LaunchNativeProcess( +@@ -84,7 +84,7 @@ bool NativeProcessLauncher::LaunchNativeProcess( // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/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 802634836f97..06f5c7f7d562 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 2023-10-11 18:22:24 UTC +--- 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 -@@ -603,7 +603,7 @@ void PasswordsPrivateDelegateImpl::OnFetchingFamilyMem +@@ -600,7 +600,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 5c9454eeb598..9cdec9b58afa 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-09-29 10:14:06 UTC +--- 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 -@@ -280,7 +280,9 @@ bool ChromeRuntimeAPIDelegate::GetPlatformInfo(Platfor +@@ -279,7 +279,9 @@ bool ChromeRuntimeAPIDelegate::GetPlatformInfo(Platfor } else if (strcmp(os, "linux") == 0) { info->os = extensions::api::runtime::PlatformOs::kLinux; } else if (strcmp(os, "openbsd") == 0) { diff --git a/www/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 ab7ab9a7009d..6b104fcfb5e2 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,20 +1,20 @@ ---- src/3rdparty/chromium/chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2023-10-11 18:22:24 UTC +--- 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 -@@ -199,7 +199,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist +@@ -196,7 +196,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist (*s_allowlist)[::prefs::kSidePanelHorizontalAlignment] = - settings_api::PrefType::PREF_TYPE_BOOLEAN; + settings_api::PrefType::kBoolean; -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) (*s_allowlist)[::prefs::kUseCustomChromeFrame] = - settings_api::PrefType::PREF_TYPE_BOOLEAN; + settings_api::PrefType::kBoolean; #endif -@@ -211,7 +211,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist - settings_api::PrefType::PREF_TYPE_STRING; - (*s_allowlist)[::prefs::kPolicyThemeColor] = - settings_api::PrefType::PREF_TYPE_NUMBER; +@@ -205,7 +205,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist + // Appearance settings. + (*s_allowlist)[::prefs::kCurrentThemeID] = settings_api::PrefType::kString; + (*s_allowlist)[::prefs::kPolicyThemeColor] = settings_api::PrefType::kNumber; -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - (*s_allowlist)[::prefs::kSystemTheme] = - settings_api::PrefType::PREF_TYPE_NUMBER; + (*s_allowlist)[::prefs::kSystemTheme] = settings_api::PrefType::kNumber; #endif + (*s_allowlist)[::prefs::kHomePage] = settings_api::PrefType::kUrl; 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 0a42e29cfbed..24a102a0d330 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,11 +1,11 @@ ---- src/3rdparty/chromium/chrome/browser/extensions/api/tabs/tabs_api.cc.orig 2023-10-11 18:22:24 UTC +--- 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 -@@ -860,7 +860,7 @@ ExtensionFunction::ResponseAction WindowsCreateFunctio - // ui::SHOW_STATE_MINIMIZED above, on Linux the window is not created as +@@ -836,7 +836,7 @@ ExtensionFunction::ResponseAction WindowsCreateFunctio // minimized. // TODO(crbug.com/1410400): Remove this workaround when linux is fixed. --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // TODO(crbug.com/1410400): Find a fix for wayland as well. - - // Must be defined inside IS_LINUX to compile on windows/mac. +-#if BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(IS_OZONE_X11) + if (new_window->initial_show_state() == ui::SHOW_STATE_MINIMIZED) { + new_window->window()->Minimize(); + } diff --git a/www/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 e0f8858decb5..4a5d4fa716e4 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 2023-12-12 22:08:45 UTC +--- 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 @@ -31,7 +31,7 @@ #include "extensions/browser/process_manager.h" @@ -18,7 +18,7 @@ if (extension) { enabled_by_permissions = extension->permissions_data()->active_permissions().HasAPIPermission( -@@ -598,7 +598,7 @@ WebrtcLoggingPrivateGetLogsDirectoryFunction::Run() { +@@ -594,7 +594,7 @@ WebrtcLoggingPrivateGetLogsDirectoryFunction::Run() { ExtensionFunction::ResponseAction WebrtcLoggingPrivateGetLogsDirectoryFunction::Run() { 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 da9a51a03c39..b24ae865bc22 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,6 +1,6 @@ ---- src/3rdparty/chromium/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc.orig 2023-10-11 18:22:24 UTC +--- 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 -@@ -924,7 +924,7 @@ void WebstorePrivateBeginInstallWithManifest3Function: +@@ -904,7 +904,7 @@ void WebstorePrivateBeginInstallWithManifest3Function: RequestExtensionApproval(contents); return; } 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 2f92338c3b30..e6211b58db81 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 2023-12-12 22:08:45 UTC +--- 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 @@ -91,7 +91,7 @@ GCMProfileService* GCMProfileServiceFactory::GetForPro // static 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 483961bbc5a5..c660a6a343b8 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,8 +1,8 @@ ---- src/3rdparty/chromium/chrome/browser/media/router/discovery/BUILD.gn.orig 2022-10-24 13:33:33 UTC +--- 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 -@@ -80,7 +80,7 @@ static_library("discovery") { - "media_sink_discovery_metrics.h", +@@ -81,7 +81,7 @@ static_library("discovery") { ] + configs += [ "//build/config/compiler:wexit_time_destructors" ] - if (is_linux || is_chromeos) { + if ((is_linux || is_chromeos) && !is_bsd) { diff --git a/www/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 index 91903778b113..19760cc6adbc 100644 --- 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 @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/chrome/browser/media/webrtc/capture_policy_utils.cc.orig 2023-08-17 07:33:31 UTC +--- 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 -@@ -139,7 +139,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry +@@ -140,7 +140,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry } bool IsGetAllScreensMediaAllowedForAnySite(content::BrowserContext* context) { @@ -9,7 +9,7 @@ Profile* profile = Profile::FromBrowserContext(context); if (!profile) { return false; -@@ -174,7 +174,7 @@ bool IsGetAllScreensMediaAllowedForAnySite(content::Br +@@ -175,7 +175,7 @@ bool IsGetAllScreensMediaAllowedForAnySite(content::Br bool IsGetAllScreensMediaAllowed(content::BrowserContext* context, const GURL& url) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_webrtc_chrome__screen__enumerator.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_webrtc_chrome__screen__enumerator.cc index e3b515d773a3..6a1ed70f1660 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_webrtc_chrome__screen__enumerator.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_webrtc_chrome__screen__enumerator.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/chrome/browser/media/webrtc/chrome_screen_enumerator.cc.orig 2023-07-16 15:47:57 UTC +--- src/3rdparty/chromium/chrome/browser/media/webrtc/chrome_screen_enumerator.cc.orig 2024-02-23 21:04:38 UTC +++ src/3rdparty/chromium/chrome/browser/media/webrtc/chrome_screen_enumerator.cc @@ -21,7 +21,7 @@ #if BUILDFLAG(IS_CHROMEOS_ASH) @@ -9,8 +9,8 @@ #include "base/functional/callback.h" #include "content/public/browser/desktop_capture.h" #endif -@@ -32,7 +32,7 @@ base::LazyInstance>::Destru - root_windows_for_testing_ = LAZY_INSTANCE_INITIALIZER; +@@ -32,7 +32,7 @@ base::LazyInstance>::DestructorAtExit g_desktop_capturer_for_testing = LAZY_INSTANCE_INITIALIZER; -@@ -78,7 +78,7 @@ blink::mojom::StreamDevicesSetPtr EnumerateScreens( +@@ -79,7 +79,7 @@ blink::mojom::StreamDevicesSetPtr EnumerateScreens( return stream_devices_set; } @@ -27,7 +27,7 @@ blink::mojom::StreamDevicesSetPtr EnumerateScreens( blink::mojom::MediaStreamType stream_type) { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); -@@ -129,7 +129,7 @@ void ChromeScreenEnumerator::SetRootWindowsForTesting( +@@ -130,7 +130,7 @@ void ChromeScreenEnumerator::SetRootWindowsForTesting( root_windows_for_testing_.Get() = std::move(root_windows); } @@ -37,8 +37,8 @@ std::unique_ptr capturer) { g_desktop_capturer_for_testing.Get() = std::move(capturer); @@ -143,7 +143,7 @@ void ChromeScreenEnumerator::EnumerateScreens( + ScreensCallback screens_callback) const { DCHECK_CURRENTLY_ON(content::BrowserThread::IO); - DCHECK(base::FeatureList::IsEnabled(blink::features::kGetAllScreensMedia)); -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_webrtc_chrome__screen__enumerator.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_webrtc_chrome__screen__enumerator.h index 16e1ca835c5a..2fe22232a693 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_webrtc_chrome__screen__enumerator.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_webrtc_chrome__screen__enumerator.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/chrome/browser/media/webrtc/chrome_screen_enumerator.h.orig 2023-03-09 06:31:50 UTC +--- src/3rdparty/chromium/chrome/browser/media/webrtc/chrome_screen_enumerator.h.orig 2024-02-23 21:04:38 UTC +++ src/3rdparty/chromium/chrome/browser/media/webrtc/chrome_screen_enumerator.h -@@ -21,7 +21,7 @@ namespace aura { +@@ -20,7 +20,7 @@ namespace aura { class Window; } @@ -10,9 +10,9 @@ class DesktopCapturer; } @@ -42,7 +42,7 @@ class ChromeScreenEnumerator : public media::ScreenEnu - #if BUILDFLAG(IS_CHROMEOS_ASH) - static void SetRootWindowsForTesting(std::vector root_windows); + static void SetRootWindowsForTesting( + std::vector> root_windows); -#elif BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) static void SetDesktopCapturerForTesting( diff --git a/www/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 new file mode 100644 index 000000000000..95eaf29010fc --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_webrtc_desktop__media__picker__controller.cc @@ -0,0 +1,11 @@ +--- 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 +@@ -92,7 +92,7 @@ bool DesktopMediaPickerController::IsSystemAudioCaptur + } else { + return base::FeatureList::IsEnabled(media::kMacLoopbackAudioForScreenShare); + } +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (request_source == Params::RequestSource::kCast) { + return base::FeatureList::IsEnabled(media::kPulseaudioLoopbackForCast); + } else { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_webrtc_webrtc__event__log__uploader.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_webrtc_webrtc__event__log__uploader.cc deleted file mode 100644 index 1997053b0136..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_webrtc_webrtc__event__log__uploader.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/chrome/browser/media/webrtc/webrtc_event_log_uploader.cc.orig 2023-12-12 22:08:45 UTC -+++ src/3rdparty/chromium/chrome/browser/media/webrtc/webrtc_event_log_uploader.cc -@@ -44,7 +44,7 @@ const char kProduct[] = "Chrome_ChromeOS"; - const char kProduct[] = "Chrome_Mac"; - #elif BUILDFLAG(IS_CHROMEOS_ASH) - const char kProduct[] = "Chrome_ChromeOS"; --#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) - const char kProduct[] = "Chrome_Linux"; - #elif BUILDFLAG(IS_ANDROID) - const char kProduct[] = "Chrome_Android"; diff --git a/www/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 de2a37accf04..9361e33fba2a 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,13 +1,11 @@ ---- src/3rdparty/chromium/chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig 2023-12-12 22:08:45 UTC +--- 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 -@@ -375,6 +375,10 @@ void WebRtcLogUploader::SetupMultipart( - const char product[] = "Chrome_ChromeOS"; - #elif BUILDFLAG(IS_FUCHSIA) - const char product[] = "Chrome_Fuchsia"; -+#elif defined(OS_OPENBSD) -+ const char product[] = "Chrome_OpenBSD"; -+#elif defined(OS_FREEBSD) -+ const char product[] = "Chrome_FreeBSD"; +@@ -102,7 +102,7 @@ std::string GetLogUploadProduct() { + const char product[] = "Chrome_Mac"; + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) + #if !defined(ADDRESS_SANITIZER) + const char product[] = "Chrome_Linux"; #else - #error Platform not supported. - #endif diff --git a/www/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 c74047f8bfa1..a772a13eb6f6 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 2023-12-12 22:08:45 UTC +--- 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 @@ -25,10 +25,10 @@ #include "components/webrtc_logging/browser/text_log_list.h" @@ -13,7 +13,7 @@ using webrtc_event_logging::WebRtcEventLogManager; -@@ -285,7 +285,7 @@ void WebRtcLoggingController::StartEventLogging( +@@ -303,7 +303,7 @@ void WebRtcLoggingController::StartEventLogging( web_app_id, callback); } @@ -22,7 +22,7 @@ void WebRtcLoggingController::GetLogsDirectory( LogsDirectoryCallback callback, LogsDirectoryErrorCallback error_callback) { -@@ -330,7 +330,7 @@ void WebRtcLoggingController::GrantLogsDirectoryAccess +@@ -351,7 +351,7 @@ void WebRtcLoggingController::GrantLogsDirectoryAccess FROM_HERE, base::BindOnce(std::move(callback), file_system.id(), registered_name)); } 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 49b8eb69053c..5aee58293cb8 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,6 +1,6 @@ ---- src/3rdparty/chromium/chrome/browser/media/webrtc/webrtc_logging_controller.h.orig 2023-12-12 22:08:45 UTC +--- 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 -@@ -138,7 +138,7 @@ class WebRtcLoggingController +@@ -137,7 +137,7 @@ class WebRtcLoggingController size_t web_app_id, const StartEventLoggingCallback& callback); @@ -9,7 +9,7 @@ // Ensures that the WebRTC Logs directory exists and then grants render // process access to the 'WebRTC Logs' directory, and invokes |callback| with // the ids necessary to create a DirectoryEntry object. -@@ -203,7 +203,7 @@ class WebRtcLoggingController +@@ -201,7 +201,7 @@ class WebRtcLoggingController content::BrowserContext* GetBrowserContext() const; 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 f3128071a53f..70f074c8e5eb 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,4 +1,4 @@ ---- src/3rdparty/chromium/chrome/browser/net/system_network_context_manager.cc.orig 2023-10-11 18:22:24 UTC +--- 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 @@ -92,7 +92,7 @@ @@ -7,9 +7,27 @@ -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) #include "chrome/common/chrome_paths_internal.h" - #include "chrome/grit/chromium_strings.h" + #include "chrome/grit/branded_strings.h" #include "ui/base/l10n/l10n_util.h" -@@ -183,7 +183,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut +@@ -137,7 +137,7 @@ SystemNetworkContextManager* g_system_network_context_ + // received a failed launch for a sandboxed network service. + bool g_previously_failed_to_launch_sandboxed_service = false; + +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Whether kerberos library loading will work in the network service due to the + // sandbox. + bool g_network_service_will_allow_gssapi_library_load = false; +@@ -145,7 +145,7 @@ bool g_network_service_will_allow_gssapi_library_load + const char* kGssapiDesiredPref = + #if BUILDFLAG(IS_CHROMEOS) + prefs::kKerberosEnabled; +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + prefs::kReceivedHttpAuthNegotiateHeader; + #endif + #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) +@@ -191,7 +191,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut auth_dynamic_params->basic_over_http_enabled = local_state->GetBoolean(prefs::kBasicAuthOverHttpEnabled); @@ -18,7 +36,25 @@ auth_dynamic_params->delegate_by_kdc_policy = local_state->GetBoolean(prefs::kAuthNegotiateDelegateByKdcPolicy); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) -@@ -241,7 +241,7 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal() +@@ -206,7 +206,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut + local_state->GetString(prefs::kAuthAndroidNegotiateAccountType); + #endif // BUILDFLAG(IS_ANDROID) + +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + auth_dynamic_params->allow_gssapi_library_load = + local_state->GetBoolean(kGssapiDesiredPref); + #endif // BUILDFLAG(IS_CHROMEOS) +@@ -216,7 +216,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut + + void OnNewHttpAuthDynamicParams( + network::mojom::HttpAuthDynamicParamsPtr& params) { +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // The kerberos library is incompatible with the network service sandbox, so + // if library loading is now enabled, the network service needs to be + // restarted. It will be restarted unsandboxed because is +@@ -258,11 +258,11 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal() if (g_previously_failed_to_launch_sandboxed_service) { return NetworkSandboxState::kDisabledBecauseOfFailedLaunch; } @@ -27,7 +63,12 @@ auto* local_state = g_browser_process->local_state(); #endif -@@ -262,7 +262,7 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal() +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // The network service sandbox and the kerberos library are incompatible. + // If kerberos is enabled by policy, disable the network service sandbox. + if (g_network_service_will_allow_gssapi_library_load || +@@ -278,7 +278,7 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal() } #endif // BUILDFLAG(IS_WIN) @@ -36,7 +77,7 @@ if (local_state && local_state->HasPrefPath(prefs::kNetworkServiceSandboxEnabled)) { return local_state->GetBoolean(prefs::kNetworkServiceSandboxEnabled) -@@ -457,7 +457,7 @@ void SystemNetworkContextManager::DeleteInstance() { +@@ -508,7 +508,7 @@ void SystemNetworkContextManager::DeleteInstance() { g_system_network_context_manager = nullptr; } @@ -45,7 +86,7 @@ SystemNetworkContextManager::GssapiLibraryLoadObserver:: GssapiLibraryLoadObserver(SystemNetworkContextManager* owner) : owner_(owner) {} -@@ -515,7 +515,7 @@ SystemNetworkContextManager::SystemNetworkContextManag +@@ -566,7 +566,7 @@ SystemNetworkContextManager::SystemNetworkContextManag pref_change_registrar_.Add(prefs::kAllHttpAuthSchemesAllowedForOrigins, auth_pref_callback); @@ -54,8 +95,17 @@ pref_change_registrar_.Add(prefs::kAuthNegotiateDelegateByKdcPolicy, auth_pref_callback); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) -@@ -562,7 +562,7 @@ SystemNetworkContextManager::SystemNetworkContextManag - #endif // BUILDFLAG(CHROME_ROOT_STORE_POLICY_SUPPORTED) +@@ -580,7 +580,7 @@ SystemNetworkContextManager::SystemNetworkContextManag + auth_pref_callback); + #endif // BUILDFLAG(IS_ANDROID) + +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + pref_change_registrar_.Add(kGssapiDesiredPref, auth_pref_callback); + #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) + +@@ -606,7 +606,7 @@ SystemNetworkContextManager::SystemNetworkContextManag + #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) @@ -63,7 +113,7 @@ pref_change_registrar_.Add( prefs::kEnforceLocalAnchorConstraintsEnabled, base::BindRepeating(&SystemNetworkContextManager:: -@@ -611,7 +611,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe +@@ -661,7 +661,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe registry->RegisterBooleanPref(prefs::kKerberosEnabled, false); #endif // BUILDFLAG(IS_CHROMEOS_LACROS) @@ -72,16 +122,16 @@ registry->RegisterBooleanPref(prefs::kAuthNegotiateDelegateByKdcPolicy, false); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) -@@ -640,7 +640,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe - registry->RegisterBooleanPref(prefs::kChromeRootStoreEnabled, false); - #endif // BUILDFLAG(CHROME_ROOT_STORE_POLICY_SUPPORTED) +@@ -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, -@@ -649,11 +649,11 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe +@@ -694,11 +694,11 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe registry->RegisterListPref(prefs::kExplicitlyAllowedNetworkPorts); @@ -94,8 +144,8 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) registry->RegisterBooleanPref(prefs::kReceivedHttpAuthNegotiateHeader, false); #endif // BUILDFLAG(IS_LINUX) - } -@@ -702,7 +702,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea + +@@ -751,7 +751,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea OnNewHttpAuthDynamicParams(http_auth_dynamic_params); network_service->ConfigureHttpAuthPrefs(std::move(http_auth_dynamic_params)); @@ -104,8 +154,17 @@ gssapi_library_loader_observer_.Install(network_service); #endif // BUILDFLAG(IS_LINUX) -@@ -1009,7 +1009,7 @@ void SystemNetworkContextManager::UpdateChromeRootStor - #endif // BUILDFLAG(CHROME_ROOT_STORE_POLICY_SUPPORTED) +@@ -954,7 +954,7 @@ bool SystemNetworkContextManager::IsNetworkSandboxEnab + break; + } + +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (!enabled) { + g_network_service_will_allow_gssapi_library_load = true; + } +@@ -1040,7 +1040,7 @@ void SystemNetworkContextManager::UpdateExplicitlyAllo + } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) 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 03783d1b1351..5e74471c6180 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 2023-10-11 18:22:24 UTC +--- 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 -@@ -185,7 +185,7 @@ class SystemNetworkContextManager { +@@ -200,7 +200,7 @@ class SystemNetworkContextManager { class URLLoaderFactoryForSystem; class NetworkProcessLaunchWatcher; @@ -9,8 +9,8 @@ class GssapiLibraryLoadObserver : public network::mojom::GssapiLibraryLoadObserver { public: -@@ -229,7 +229,7 @@ class SystemNetworkContextManager { - #endif // BUILDFLAG(CHROME_ROOT_STORE_POLICY_SUPPORTED) +@@ -236,7 +236,7 @@ class SystemNetworkContextManager { + void UpdateExplicitlyAllowedNetworkPorts(); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) @@ -18,12 +18,12 @@ // Applies the current value of the kEnforceLocalAnchorConstraintsEnabled // pref to the enforcement state. void UpdateEnforceLocalAnchorConstraintsEnabled(); -@@ -275,7 +275,7 @@ class SystemNetworkContextManager { +@@ -284,7 +284,7 @@ class SystemNetworkContextManager { - static absl::optional certificate_transparency_enabled_for_testing_; + static std::optional certificate_transparency_enabled_for_testing_; -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) GssapiLibraryLoadObserver gssapi_library_loader_observer_{this}; #endif // BUILDFLAG(IS_LINUX) - }; + diff --git a/www/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 01dbe1ca48f5..5007be764387 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,6 @@ ---- src/3rdparty/chromium/chrome/browser/prefs/browser_prefs.cc.orig 2023-10-11 18:22:24 UTC +--- 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 -@@ -478,13 +478,13 @@ +@@ -486,18 +486,18 @@ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -16,7 +16,13 @@ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) #include "chrome/browser/browser_switcher/browser_switcher_prefs.h" #endif -@@ -517,7 +517,7 @@ + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h" + #endif + +@@ -529,7 +529,7 @@ #include "chrome/browser/sessions/session_service_log.h" #endif @@ -25,7 +31,7 @@ #include "ui/color/system_theme.h" #endif -@@ -662,7 +662,7 @@ const char kPluginsPluginsList[] = "plugins.plugins_li +@@ -567,7 +567,7 @@ const char kPluginsPluginsList[] = "plugins.plugins_li const char kPluginsShowDetails[] = "plugins.show_details"; // Deprecated 02/2023. @@ -34,16 +40,16 @@ const char kWebAppsUrlHandlerInfo[] = "web_apps.url_handler_info"; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -948,7 +948,7 @@ void RegisterLocalStatePrefsForMigration(PrefRegistryS - #endif // BUILDFLAG(IS_CHROMEOS_ASH) - - // Deprecated 02/2023. +@@ -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) -@@ -1863,12 +1863,12 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync +@@ -1986,12 +1986,12 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -56,12 +62,12 @@ -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) browser_switcher::BrowserSwitcherPrefs::RegisterProfilePrefs(registry); + enterprise_signin::RegisterProfilePrefs(registry); #endif +@@ -2121,7 +2121,7 @@ void MigrateObsoleteLocalStatePrefs(PrefService* local + // Please don't delete the preceding line. It is used by PRESUBMIT.py. -@@ -2018,7 +2018,7 @@ void MigrateObsoleteLocalStatePrefs(PrefService* local - #endif // BUILDFLAG(IS_CHROMEOS_ASH) - - // Added 02/2023 + // 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); 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 8139fb923780..37674cc233bf 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,7 +1,7 @@ ---- src/3rdparty/chromium/chrome/browser/printing/print_backend_service_manager.cc.orig 2023-09-13 12:11:42 UTC +--- 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 -@@ -33,7 +33,7 @@ - #include "printing/buildflags/buildflags.h" +@@ -34,7 +34,7 @@ + #include "printing/printing_context.h" #include "printing/printing_features.h" -#if BUILDFLAG(IS_LINUX) @@ -9,7 +9,7 @@ #include "content/public/common/content_switches.h" #endif -@@ -851,7 +851,7 @@ PrintBackendServiceManager::GetServiceFromBundle( +@@ -853,7 +853,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()); -@@ -1024,7 +1024,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate +@@ -1026,7 +1026,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate return kNoClientsRegisteredResetOnIdleTimeout; case ClientType::kQueryWithUi: @@ -26,4 +26,4 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // No need to update if there were other query with UI clients. if (HasQueryWithUiClientForRemoteId(remote_id)) { - return absl::nullopt; + return std::nullopt; diff --git a/www/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 125dba287eaa..253ca5a4c0b5 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,8 +1,8 @@ ---- src/3rdparty/chromium/chrome/browser/printing/printer_query.cc.orig 2023-12-12 22:08:45 UTC +--- 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 @@ -361,7 +361,7 @@ void PrinterQuery::UpdatePrintSettings(base::Value::Di crash_key = std::make_unique( - print_backend->GetPrinterDriverInfo(printer_name)); + printer_name, print_backend->GetPrinterDriverInfo(printer_name)); -#if BUILDFLAG(IS_LINUX) && BUILDFLAG(USE_CUPS) +#if (BUILDFLAG(IS_BSD) || BUILDFLAG(IS_LINUX)) && BUILDFLAG(USE_CUPS) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_resources_sandbox__internals_sandbox__internals.ts b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_resources_sandbox__internals_sandbox__internals.ts deleted file mode 100644 index e10b79e480c1..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_resources_sandbox__internals_sandbox__internals.ts +++ /dev/null @@ -1,29 +0,0 @@ ---- src/3rdparty/chromium/chrome/browser/resources/sandbox_internals/sandbox_internals.ts.orig 2023-02-08 09:03:45 UTC -+++ src/3rdparty/chromium/chrome/browser/resources/sandbox_internals/sandbox_internals.ts -@@ -2,7 +2,7 @@ - // Use of this source code is governed by a BSD-style license that can be - // found in the LICENSE file. - --// -+// - import './strings.m.js'; - - import {loadTimeData} from 'chrome://resources/js/load_time_data.js'; -@@ -121,7 +121,7 @@ function androidHandler() { - } - // - --// -+// - - /** - * Adds a status row that reports either Yes or No. -@@ -182,7 +182,7 @@ document.addEventListener('DOMContentLoaded', () => { - // - androidHandler(); - // -- // -+ // - linuxHandler(); - // - }); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_resources_signin_sync__confirmation_sync__confirmation__app.html b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_resources_signin_sync__confirmation_sync__confirmation__app.html deleted file mode 100644 index 5ec551183f86..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_resources_signin_sync__confirmation_sync__confirmation__app.html +++ /dev/null @@ -1,20 +0,0 @@ ---- src/3rdparty/chromium/chrome/browser/resources/signin/sync_confirmation/sync_confirmation_app.html.orig 2023-07-16 15:47:57 UTC -+++ src/3rdparty/chromium/chrome/browser/resources/signin/sync_confirmation/sync_confirmation_app.html -@@ -290,7 +290,7 @@ - autofocus="[[isModalDialog_]]"> - $i18n{syncConfirmationConfirmLabel} - -- -+ - - $i18n{syncConfirmationSettingsLabel} -@@ -300,7 +300,7 @@ - disabled="[[anyButtonClicked_]]"> - $i18n{syncConfirmationUndoLabel} - -- -+ - - $i18n{syncConfirmationSettingsLabel} diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_about__ui.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_about__ui.cc deleted file mode 100644 index 565fc76382d7..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_about__ui.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- src/3rdparty/chromium/chrome/browser/ui/webui/about_ui.cc.orig 2023-07-16 15:47:57 UTC -+++ src/3rdparty/chromium/chrome/browser/ui/webui/about_ui.cc -@@ -635,7 +635,7 @@ std::string ChromeURLs() { - 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, -@@ -689,7 +689,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_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 a7b61b1f993f..29cd78786851 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,6 +1,6 @@ ---- src/3rdparty/chromium/chrome/browser/ui/webui/app_home/app_home_page_handler.cc.orig 2023-09-13 12:11:42 UTC +--- 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 -@@ -415,7 +415,7 @@ app_home::mojom::AppInfoPtr AppHomePageHandler::Create +@@ -386,7 +386,7 @@ app_home::mojom::AppInfoPtr AppHomePageHandler::Create bool deprecated_app = false; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ auto* context = extension_system_->extension_service()->GetBrowserContext(); deprecated_app = extensions::IsExtensionUnsupportedDeprecatedApp(context, extension->id()); -@@ -478,7 +478,7 @@ void AppHomePageHandler::FillExtensionInfoList( +@@ -450,7 +450,7 @@ void AppHomePageHandler::FillExtensionInfoList( } #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_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 a717e9efc5ce..ae50e55da1ac 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 2023-12-12 22:08:45 UTC +--- 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 -@@ -213,7 +213,7 @@ +@@ -212,7 +212,7 @@ #include "chrome/browser/ui/webui/chromeos/chrome_url_disabled/chrome_url_disabled_ui.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/ui/webui/webui_js_error/webui_js_error_ui.h" #endif -@@ -239,17 +239,17 @@ +@@ -238,17 +238,17 @@ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -30,7 +30,7 @@ #include "chrome/browser/ui/webui/connectors_internals/connectors_internals_ui.h" #endif -@@ -402,7 +402,7 @@ bool IsAboutUI(const GURL& url) { +@@ -406,7 +406,7 @@ bool IsAboutUI(const GURL& url) { #if !BUILDFLAG(IS_ANDROID) || url.host_piece() == chrome::kChromeUITermsHost #endif @@ -39,7 +39,7 @@ || url.host_piece() == chrome::kChromeUILinuxProxyConfigHost #endif #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -663,7 +663,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -657,7 +657,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we if (url.host_piece() == chrome::kChromeUIMobileSetupHost) return &NewWebUI; #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -48,7 +48,7 @@ if (url.host_piece() == chrome::kChromeUIWebUIJsErrorHost) return &NewWebUI; #endif -@@ -725,7 +725,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -713,7 +713,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we if (url.host_piece() == chrome::kChromeUINaClHost) return &NewWebUI; #endif @@ -57,7 +57,7 @@ defined(TOOLKIT_VIEWS)) || \ defined(USE_AURA) if (url.host_piece() == chrome::kChromeUITabModalConfirmDialogHost) -@@ -794,27 +794,27 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -776,27 +776,27 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we } #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ 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 1ef21d90c51b..9b297761ef5b 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,4 +1,4 @@ ---- src/3rdparty/chromium/chrome/browser/ui/webui/connectors_internals/device_trust_utils.cc.orig 2023-03-09 06:31:50 UTC +--- 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 @@ -6,7 +6,7 @@ @@ -9,7 +9,7 @@ #include "base/base64url.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/policy/chrome_browser_policy_connector.h" -@@ -24,7 +24,7 @@ namespace utils { +@@ -29,7 +29,7 @@ namespace utils { namespace { @@ -18,7 +18,7 @@ connectors_internals::mojom::KeyTrustLevel ParseTrustLevel( BPKUR::KeyTrustLevel trust_level) { -@@ -92,7 +92,7 @@ connectors_internals::mojom::Int32ValuePtr ToMojomValu +@@ -97,7 +97,7 @@ connectors_internals::mojom::Int32ValuePtr ToMojomValu } // namespace connectors_internals::mojom::KeyInfoPtr GetKeyInfo() { 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 c5e532d3d32b..625962408a07 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,11 +1,16 @@ ---- src/3rdparty/chromium/chrome/browser/ui/webui/management/management_ui.cc.orig 2023-03-09 06:31:50 UTC +--- 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 -@@ -92,7 +92,7 @@ content::WebUIDataSource* CreateAndAddManagementUIHtml - {kManagementOnFileTransferVisibleData, - IDS_MANAGEMENT_FILE_TRANSFER_VISIBLE_DATA}, +@@ -98,11 +98,11 @@ content::WebUIDataSource* CreateAndAddManagementUIHtml + {kManagementOnFileTransferVisibleData, + IDS_MANAGEMENT_FILE_TRANSFER_VISIBLE_DATA}, #endif // BUILDFLAG(IS_CHROMEOS) -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - {kManagementScreenCaptureEvent, IDS_MANAGEMENT_SCREEN_CAPTURE_EVENT}, - {kManagementScreenCaptureData, IDS_MANAGEMENT_SCREEN_CAPTURE_DATA}, + {kManagementScreenCaptureEvent, IDS_MANAGEMENT_SCREEN_CAPTURE_EVENT}, + {kManagementScreenCaptureData, IDS_MANAGEMENT_SCREEN_CAPTURE_DATA}, #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + {kManagementDeviceSignalsDisclosure, + IDS_MANAGEMENT_DEVICE_SIGNALS_DISCLOSURE}, + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) diff --git a/www/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 084248a340c7..ae0435c6ad9d 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,6 +1,6 @@ ---- src/3rdparty/chromium/chrome/browser/ui/webui/management/management_ui_handler.cc.orig 2023-10-11 18:22:24 UTC +--- 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 -@@ -94,7 +94,7 @@ +@@ -95,7 +95,7 @@ #include "components/policy/core/common/cloud/user_cloud_policy_manager.h" #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -9,7 +9,7 @@ #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) -@@ -190,12 +190,12 @@ enum class ReportingType { +@@ -191,12 +191,12 @@ enum class ReportingType { kLegacyTech, }; @@ -24,7 +24,7 @@ const char kManagementDeviceSignalsDisclosure[] = "managementDeviceSignalsDisclosure"; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -773,7 +773,7 @@ void ManagementUIHandler::AddReportingInfo(base::Value +@@ -830,7 +830,7 @@ void ManagementUIHandler::AddReportingInfo(base::Value GetReportingTypeValue(report_definition.reporting_type)); report_sources->Append(std::move(data)); } @@ -33,7 +33,7 @@ // Insert the device signals consent disclosure at the end of browser // reporting section. auto* user_permission_service = GetUserPermissionService(); -@@ -1061,7 +1061,7 @@ base::Value::Dict ManagementUIHandler::GetThreatProtec +@@ -1118,7 +1118,7 @@ base::Value::Dict ManagementUIHandler::GetThreatProtec kManagementOnPageVisitedVisibleData, &info); } @@ -42,7 +42,7 @@ if (capture_policy::IsGetAllScreensMediaAllowedForAnySite(profile)) { AddThreatProtectionPermission(kManagementScreenCaptureEvent, kManagementScreenCaptureData, &info); -@@ -1145,7 +1145,7 @@ policy::PolicyService* ManagementUIHandler::GetPolicyS +@@ -1202,7 +1202,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 fb7c7572967b..9be6ed9671dd 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,4 +1,4 @@ ---- src/3rdparty/chromium/chrome/browser/ui/webui/management/management_ui_handler.h.orig 2023-10-11 18:22:24 UTC +--- 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 @@ -24,14 +24,14 @@ #include "extensions/common/extension_id.h" @@ -17,7 +17,7 @@ extern const char kManagementDeviceSignalsDisclosure[]; #endif // #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -117,7 +117,7 @@ class StatusCollector; +@@ -119,7 +119,7 @@ class StatusCollector; class SystemLogUploader; } // namespace policy @@ -26,7 +26,7 @@ namespace device_signals { class UserPermissionService; } // namespace device_signals -@@ -177,7 +177,7 @@ class ManagementUIHandler : public content::WebUIMessa +@@ -179,7 +179,7 @@ class ManagementUIHandler : public content::WebUIMessa base::Value::List GetManagedWebsitesInfo(Profile* profile) const; base::Value::List GetApplicationsInfo(Profile* profile) const; virtual policy::PolicyService* GetPolicyService(); diff --git a/www/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 index 8bf838a52106..0659f1c77c77 100644 --- 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 @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/chrome/browser/ui/webui/ntp/app_launcher_handler.cc.orig 2023-09-13 12:11:42 UTC +--- 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 -@@ -320,7 +320,7 @@ base::Value::Dict AppLauncherHandler::CreateExtensionI +@@ -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) || \ 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 new file mode 100644 index 000000000000..1ba795ccc641 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_password__manager_promo__cards__handler.cc @@ -0,0 +1,20 @@ +--- 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 +@@ -28,7 +28,7 @@ + #include "chrome/browser/ui/webui/password_manager/promo_cards/web_password_manager_promo.h" + #endif + +-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "chrome/browser/ui/webui/password_manager/promo_cards/relaunch_chrome_promo.h" + #endif + +@@ -71,7 +71,7 @@ std::vector> Ge + .get())); + #endif + +-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + promo_cards.push_back( + std::make_unique(profile->GetPrefs())); + #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_realbox_realbox__handler.cc index 286837de110d..88a561de6447 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_realbox_realbox__handler.cc @@ -1,15 +1,24 @@ ---- src/3rdparty/chromium/chrome/browser/ui/webui/realbox/realbox_handler.cc.orig 2023-10-11 18:22:24 UTC +--- 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 -@@ -146,7 +146,7 @@ constexpr char kMacShareIconResourceName[] = +@@ -148,7 +148,7 @@ const char* kMacShareIconResourceName = #elif BUILDFLAG(IS_WIN) - constexpr char kWinShareIconResourceName[] = + const char* kWinShareIconResourceName = "//resources/cr_components/omnibox/icons/win_share.svg"; -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - constexpr char kLinuxShareIconResourceName[] = + const char* kLinuxShareIconResourceName = "//resources/cr_components/omnibox/icons/share.svg"; #else -@@ -745,7 +745,7 @@ std::string RealboxHandler::PedalVectorIconToResourceN +@@ -207,7 +207,7 @@ static void DefineChromeRefreshRealboxIcons() { + #elif BUILDFLAG(IS_WIN) + kWinShareIconResourceName = + "//resources/cr_components/omnibox/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"; + #else +@@ -835,7 +835,7 @@ std::string RealboxHandler::PedalVectorIconToResourceN 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 new file mode 100644 index 000000000000..0ecc38b0da90 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_settings_accessibility__main__handler.cc @@ -0,0 +1,46 @@ +--- 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 new file mode 100644 index 000000000000..5092cad265c4 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_settings_accessibility__main__handler.h @@ -0,0 +1,47 @@ +--- 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_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 e93abe0efa2d..eb1f59d15da9 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,15 +1,15 @@ ---- src/3rdparty/chromium/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2023-10-11 18:22:24 UTC +--- 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 -@@ -135,7 +135,7 @@ +@@ -138,7 +138,7 @@ #include "ash/webui/settings/public/constants/routes.mojom.h" #endif -#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS) -+#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CHROMEOS_LACROS) #include "ui/display/screen.h" #endif -@@ -155,7 +155,7 @@ +@@ -157,7 +157,7 @@ #include "chrome/browser/ui/webui/certificate_manager_localized_strings_provider.h" #endif @@ -18,7 +18,7 @@ #include "ui/linux/linux_ui_factory.h" #include "ui/ozone/public/ozone_platform.h" #endif -@@ -263,7 +263,7 @@ void AddCommonStrings(content::WebUIDataSource* html_s +@@ -265,7 +265,7 @@ void AddCommonStrings(content::WebUIDataSource* html_s base::FeatureList::IsEnabled( supervised_user::kClearingCookiesKeepsSupervisedUsersSignedIn)); @@ -27,39 +27,39 @@ bool allow_qt_theme = base::FeatureList::IsEnabled(ui::kAllowQt); #else bool allow_qt_theme = false; -@@ -294,7 +294,7 @@ void AddA11yStrings(content::WebUIDataSource* html_sou - {"focusHighlightLabel", - IDS_SETTINGS_ACCESSIBILITY_FOCUS_HIGHLIGHT_DESCRIPTION}, +@@ -295,7 +295,7 @@ void AddA11yStrings(content::WebUIDataSource* html_sou + {"focusHighlightLabel", + IDS_SETTINGS_ACCESSIBILITY_FOCUS_HIGHLIGHT_DESCRIPTION}, #endif -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - {"overscrollHistoryNavigationTitle", - IDS_SETTINGS_OVERSCROLL_HISTORY_NAVIGATION_TITLE}, - {"overscrollHistoryNavigationSubtitle", -@@ -433,7 +433,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}, + {"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}, -#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}, -@@ -443,7 +443,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht + {"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}, + {"resetToDefaultTheme", IDS_SETTINGS_RESET_TO_DEFAULT_THEME}, #endif -#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS) -+#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD) - {"showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS}, ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CHROMEOS_LACROS) + {"showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS}, #endif #if BUILDFLAG(IS_MAC) -@@ -468,7 +468,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -475,7 +475,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. -#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS) -+#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CHROMEOS_LACROS) bool show_custom_chrome_frame = ui::OzonePlatform::GetInstance() ->GetPlatformRuntimeProperties() .supports_server_side_window_decorations; diff --git a/www/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 18a04c2ad7dd..bae41e5f8dd9 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,15 +1,14 @@ ---- src/3rdparty/chromium/chrome/common/chrome_features.cc.orig 2024-01-23 10:07:29 UTC +--- src/3rdparty/chromium/chrome/common/chrome_features.cc.orig 2024-07-03 01:14:49 UTC +++ src/3rdparty/chromium/chrome/common/chrome_features.cc -@@ -74,7 +74,7 @@ BASE_FEATURE(kAppShimNotificationAttribution, +@@ -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 -@@ -87,7 +87,7 @@ BASE_FEATURE(kAsyncDns, + BASE_FEATURE(kAsyncDns, "AsyncDns", base::FEATURE_ENABLED_BY_DEFAULT); + #else + BASE_FEATURE(kAsyncDns, "AsyncDns", base::FEATURE_DISABLED_BY_DEFAULT); #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -18,7 +17,7 @@ // Enables or disables the Autofill survey triggered by opening a prompt to // save address info. BASE_FEATURE(kAutofillAddressSurvey, -@@ -105,7 +105,7 @@ BASE_FEATURE(kAutofillPasswordSurvey, +@@ -101,7 +101,7 @@ BASE_FEATURE(kAutofillPasswordSurvey, base::FEATURE_DISABLED_BY_DEFAULT); #endif @@ -27,16 +26,16 @@ // 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. -@@ -301,7 +301,7 @@ BASE_FEATURE(kDesktopPWAsEnforceWebAppSettingsPolicy, - base::FEATURE_ENABLED_BY_DEFAULT); +@@ -311,7 +311,7 @@ BASE_FEATURE(kDesktopPWAsEnforceWebAppSettingsPolicy, // Enables or disables Desktop PWAs to be auto-started on OS login. --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) BASE_FEATURE(kDesktopPWAsRunOnOsLogin, "DesktopPWAsRunOnOsLogin", - base::FEATURE_ENABLED_BY_DEFAULT -@@ -335,7 +335,7 @@ BASE_FEATURE(kDesktopPWAsWebBundles, + base::FEATURE_ENABLED_BY_DEFAULT); +@@ -354,7 +354,7 @@ BASE_FEATURE(kDesktopPWAsTabStripSettings, base::FEATURE_DISABLED_BY_DEFAULT); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -45,15 +44,15 @@ // 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. -@@ -366,7 +366,7 @@ BASE_FEATURE(kDisruptiveNotificationPermissionRevocati +@@ -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 + 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", @@ -63,16 +62,16 @@ true #else false -@@ -875,7 +875,7 @@ BASE_FEATURE(kKAnonymityServiceStorage, - "KAnonymityServiceStorage", +@@ -954,7 +954,7 @@ BASE_FEATURE(kLacrosSharedComponentsDir, base::FEATURE_ENABLED_BY_DEFAULT); + #endif // BUILDFLAG(IS_CHROMEOS_ASH) -#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) +#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)) || BUILDFLAG(IS_BSD) BASE_FEATURE(kLinuxLowMemoryMonitor, "LinuxLowMemoryMonitor", base::FEATURE_DISABLED_BY_DEFAULT); -@@ -888,7 +888,7 @@ constexpr base::FeatureParam kLinuxLowMemoryMonit +@@ -967,7 +967,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 033e2af8b846..a9909ba92779 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,6 +1,6 @@ ---- src/3rdparty/chromium/chrome/common/chrome_features.h.orig 2023-10-11 18:22:24 UTC +--- src/3rdparty/chromium/chrome/common/chrome_features.h.orig 2024-02-23 21:04:38 UTC +++ src/3rdparty/chromium/chrome/common/chrome_features.h -@@ -61,13 +61,13 @@ BASE_DECLARE_FEATURE(kAppShimNotificationAttribution); +@@ -60,13 +60,13 @@ BASE_DECLARE_FEATURE(kAppShimNotificationAttribution); COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kAsyncDns); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -16,25 +16,25 @@ COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kBackgroundModeAllowRestart); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -201,7 +201,7 @@ BASE_DECLARE_FEATURE(kDesktopPWAsTabStripSettings); - COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kDesktopPWAsWebBundles); +@@ -226,7 +226,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) + BASE_DECLARE_FEATURE(kDesktopPWAsTabStripSettings); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kChromeAppsDeprecation); - COMPONENT_EXPORT(CHROME_FEATURES) - BASE_DECLARE_FEATURE(kKeepForceInstalledPreinstalledApps); -@@ -499,7 +499,7 @@ BASE_DECLARE_FEATURE(kKAnonymityServiceOHTTPRequests); - COMPONENT_EXPORT(CHROME_FEATURES) - BASE_DECLARE_FEATURE(kKAnonymityServiceStorage); + #endif + +@@ -567,7 +567,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) + BASE_DECLARE_FEATURE(kLacrosSharedComponentsDir); + #endif // BUILDFLAG(IS_CHROMEOS_ASH) -#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) +#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)) || BUILDFLAG(IS_BSD) COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kLinuxLowMemoryMonitor); COMPONENT_EXPORT(CHROME_FEATURES) extern const base::FeatureParam kLinuxLowMemoryMonitorModerateLevel; -@@ -507,7 +507,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) +@@ -575,7 +575,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 5ea4fc7401a8..149d9f6d5f84 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 2023-10-11 18:22:24 UTC +--- src/3rdparty/chromium/chrome/common/chrome_paths.cc.orig 2024-02-23 21:04:38 UTC +++ src/3rdparty/chromium/chrome/common/chrome_paths.cc @@ -30,7 +30,7 @@ #include "base/apple/foundation_util.h" @@ -9,7 +9,7 @@ #include "components/policy/core/common/policy_paths.h" #endif -@@ -49,14 +49,14 @@ +@@ -52,14 +52,14 @@ namespace { @@ -27,7 +27,7 @@ #endif // BUILDFLAG(GOOGLE_CHROME_BRANDING) #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -211,7 +211,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -225,7 +225,7 @@ bool PathProvider(int key, base::FilePath* result) { } break; case chrome::DIR_DEFAULT_DOWNLOADS_SAFE: @@ -36,7 +36,7 @@ if (!GetUserDownloadsDirectorySafe(&cur)) { return false; } -@@ -504,7 +504,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -539,7 +539,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; -@@ -515,7 +515,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -550,7 +550,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; -@@ -524,7 +524,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -559,7 +559,7 @@ bool PathProvider(int key, base::FilePath* result) { break; } #endif @@ -63,16 +63,16 @@ case chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS: { cur = base::FilePath(kFilepathSinglePrefExtensions); break; -@@ -571,7 +571,7 @@ bool PathProvider(int key, base::FilePath* result) { - break; +@@ -607,7 +607,7 @@ bool PathProvider(int key, base::FilePath* result) { #endif --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(ENABLE_EXTENSIONS) && \ +- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)) ++ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)) case chrome::DIR_NATIVE_MESSAGING: #if BUILDFLAG(IS_MAC) #if BUILDFLAG(GOOGLE_CHROME_BRANDING) -@@ -585,6 +585,9 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -621,6 +621,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__paths.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__paths.h index 7a1e8b1854d5..d31751dc9060 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__paths.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__paths.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/chrome/common/chrome_paths.h.orig 2023-09-13 12:11:42 UTC +--- src/3rdparty/chromium/chrome/common/chrome_paths.h.orig 2024-02-23 21:04:38 UTC +++ src/3rdparty/chromium/chrome/common/chrome_paths.h -@@ -57,7 +57,7 @@ enum { +@@ -59,7 +59,7 @@ enum { #if BUILDFLAG(IS_CHROMEOS_ASH) || \ ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \ BUILDFLAG(CHROMIUM_BRANDING)) || \ @@ -9,7 +9,7 @@ DIR_USER_EXTERNAL_EXTENSIONS, // Directory for per-user external extensions // on Chrome Mac and Chromium Linux. // On Chrome OS, this path is used for OEM -@@ -65,7 +65,7 @@ enum { +@@ -67,7 +67,7 @@ enum { // create it. #endif @@ -18,12 +18,12 @@ DIR_STANDALONE_EXTERNAL_EXTENSIONS, // Directory for 'per-extension' // definition manifest files that // describe extensions which are to be -@@ -123,7 +123,7 @@ enum { - // must be cleared on device reboot. +@@ -126,7 +126,7 @@ enum { #endif --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(ENABLE_EXTENSIONS) && \ +- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)) ++ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)) DIR_NATIVE_MESSAGING, // System directory where native messaging host // manifest files are stored. DIR_USER_NATIVE_MESSAGING, // Directory with Native Messaging Hosts diff --git a/www/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 a75007a16709..d95559d81be5 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,6 +1,6 @@ ---- src/3rdparty/chromium/chrome/common/chrome_switches.cc.orig 2023-10-11 18:22:24 UTC +--- src/3rdparty/chromium/chrome/common/chrome_switches.cc.orig 2024-02-23 21:04:38 UTC +++ src/3rdparty/chromium/chrome/common/chrome_switches.cc -@@ -849,14 +849,14 @@ const char kAllowNaClSocketAPI[] = "allow-nacl-socket- +@@ -865,14 +865,14 @@ const char kAllowNaClSocketAPI[] = "allow-nacl-socket- #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ 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 409d50bc04d6..a7b5ecc41c53 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,6 +1,6 @@ ---- src/3rdparty/chromium/chrome/common/chrome_switches.h.orig 2023-10-11 18:22:24 UTC +--- src/3rdparty/chromium/chrome/common/chrome_switches.h.orig 2024-02-23 21:04:38 UTC +++ src/3rdparty/chromium/chrome/common/chrome_switches.h -@@ -269,12 +269,12 @@ extern const char kAllowNaClSocketAPI[]; +@@ -274,12 +274,12 @@ extern const char kAllowNaClSocketAPI[]; #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ 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 495166345ead..1175f7751430 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 2023-12-12 22:08:45 UTC +--- 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 @@ -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 e6eee8f508c5..6275e8892243 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,6 +1,6 @@ ---- src/3rdparty/chromium/chrome/common/media/cdm_registration.cc.orig 2023-10-11 18:22:24 UTC +--- 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 -@@ -25,11 +25,11 @@ +@@ -26,11 +26,11 @@ #if BUILDFLAG(ENABLE_WIDEVINE) #include "third_party/widevine/cdm/widevine_cdm_common.h" // nogncheck @@ -13,7 +13,7 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "base/no_destructor.h" #include "chrome/common/media/component_widevine_cdm_hint_file_linux.h" - #include "components/cdm/common/cdm_manifest.h" + #include "media/cdm/supported_audio_codecs.h" @@ -56,7 +56,7 @@ using Robustness = content::CdmInfo::Robustness; #if BUILDFLAG(ENABLE_WIDEVINE) #if (BUILDFLAG(BUNDLE_WIDEVINE_CDM) || \ 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 b83fa0c4e311..802ced7357f5 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,6 +1,6 @@ ---- src/3rdparty/chromium/chrome/common/pref_names.h.orig 2023-10-11 18:22:24 UTC +--- src/3rdparty/chromium/chrome/common/pref_names.h.orig 2024-02-23 21:04:38 UTC +++ src/3rdparty/chromium/chrome/common/pref_names.h -@@ -1316,7 +1316,7 @@ inline constexpr char kUseAshProxy[] = "lacros.proxy.u +@@ -1323,7 +1323,7 @@ inline constexpr char kUseAshProxy[] = "lacros.proxy.u // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ // Linux specific preference on whether we should match the system theme. inline constexpr char kSystemTheme[] = "extensions.theme.system_theme"; #endif -@@ -1442,7 +1442,7 @@ inline constexpr char kShowUpdatePromotionInfoBar[] = +@@ -1449,7 +1449,7 @@ inline constexpr char kShowUpdatePromotionInfoBar[] = "browser.show_update_promotion_info_bar"; #endif @@ -18,8 +18,8 @@ // 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"; -@@ -1986,7 +1986,7 @@ inline constexpr char kDownloadLastCompleteTime[] = - "download.last_complete_time"; +@@ -2001,7 +2001,7 @@ inline constexpr char kDownloadDefaultDirectory[] = + inline constexpr char kDownloadDirUpgraded[] = "download.directory_upgrade"; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ - BUILDFLAG(IS_MAC) @@ -27,7 +27,7 @@ inline constexpr char kOpenPdfDownloadInSystemReader[] = "download.open_pdf_in_system_reader"; #endif -@@ -2392,14 +2392,14 @@ inline constexpr char kMediaStorageIdSalt[] = "media.s +@@ -2439,14 +2439,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"; -@@ -2477,7 +2477,7 @@ inline constexpr char kAmbientAuthenticationInPrivateM +@@ -2524,7 +2524,7 @@ inline constexpr char kAmbientAuthenticationInPrivateM inline constexpr char kBasicAuthOverHttpEnabled[] = "auth.basic_over_http_enabled"; @@ -53,7 +53,7 @@ // Boolean that specifies whether OK-AS-DELEGATE flag from KDC is respected // along with kAuthNegotiateDelegateAllowlist. inline constexpr char kAuthNegotiateDelegateByKdcPolicy[] = -@@ -3551,7 +3551,7 @@ inline constexpr char kFileOrDirectoryPickerWithoutGes +@@ -3575,7 +3575,7 @@ inline constexpr char kFileOrDirectoryPickerWithoutGes inline constexpr char kSandboxExternalProtocolBlocked[] = "profile.sandbox_external_protocol_blocked"; @@ -62,16 +62,16 @@ // Boolean that indicates if system notifications are allowed to be used in // place of Chrome notifications. inline constexpr char kAllowSystemNotifications[] = -@@ -3607,7 +3607,7 @@ inline constexpr char kCACertificateManagementAllowed[ - inline constexpr char kChromeRootStoreEnabled[] = "chrome_root_store_enabled"; +@@ -3624,7 +3624,7 @@ inline constexpr char kCACertificateManagementAllowed[ #endif + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) inline constexpr char kEnforceLocalAnchorConstraintsEnabled[] = "enforce_local_anchor_constraints_enabled"; #endif -@@ -3921,7 +3921,7 @@ inline constexpr char kThrottleNonVisibleCrossOriginIf +@@ -3938,7 +3938,7 @@ inline constexpr char kThrottleNonVisibleCrossOriginIf inline constexpr char kNewBaseUrlInheritanceBehaviorAllowed[] = "new_base_url_inheritance_behavior_allowed"; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_url__constants.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_url__constants.cc deleted file mode 100644 index 4e4c4256a7c0..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_url__constants.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/chrome/common/url_constants.cc.orig 2023-10-11 18:22:24 UTC -+++ src/3rdparty/chromium/chrome/common/url_constants.cc -@@ -560,7 +560,7 @@ const 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) - const char kChromeAppsDeprecationLearnMoreURL[] = - "https://support.google.com/chrome/?p=chrome_app_deprecation"; - #endif 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 f6a5d2a1b0dd..67f7f933a38f 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 2023-10-11 18:22:24 UTC +--- src/3rdparty/chromium/chrome/common/url_constants.h.orig 2024-02-23 21:04:38 UTC +++ src/3rdparty/chromium/chrome/common/url_constants.h -@@ -537,7 +537,7 @@ extern const char kOutdatedPluginLearnMoreURL[]; - extern const char kPhoneHubPermissionLearnMoreURL[]; +@@ -822,7 +822,7 @@ 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) - // "Learn more" URL for the chrome apps deprecation dialog. - extern const char kChromeAppsDeprecationLearnMoreURL[]; + 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 b6a7bd6460f4..5904de8051e2 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,6 +1,6 @@ ---- src/3rdparty/chromium/chrome/common/webui_url_constants.cc.orig 2023-12-12 22:08:45 UTC +--- 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 -@@ -503,18 +503,18 @@ const char kOsUIVersionURL[] = "os://version"; +@@ -511,18 +511,18 @@ const char kOsUIVersionURL[] = "os://version"; const char kOsUIVersionURL[] = "os://version"; #endif @@ -22,7 +22,7 @@ const char kChromeUIDiscardsHost[] = "discards"; const char kChromeUIDiscardsURL[] = "chrome://discards/"; #endif -@@ -529,14 +529,14 @@ const char kChromeUILinuxProxyConfigHost[] = "linux-pr +@@ -537,14 +537,14 @@ const char kChromeUILinuxProxyConfigHost[] = "linux-pr #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -38,8 +38,8 @@ + (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD) const char kChromeUIBrowserSwitchHost[] = "browser-switch"; const char kChromeUIBrowserSwitchURL[] = "chrome://browser-switch/"; - const char kChromeUIEnterpriseProfileWelcomeHost[] = -@@ -555,7 +555,7 @@ const char kChromeUIProfilePickerStartupQuery[] = "sta + const char kChromeUIIntroHost[] = "intro"; +@@ -563,7 +563,7 @@ const char kChromeUIProfilePickerStartupQuery[] = "sta const char kChromeUIProfilePickerStartupQuery[] = "startup"; #endif @@ -48,7 +48,7 @@ defined(TOOLKIT_VIEWS)) || \ defined(USE_AURA) const char kChromeUITabModalConfirmDialogHost[] = "tab-modal-confirm-dialog"; -@@ -637,7 +637,7 @@ const char kPrivacySandboxSubPagePath[] = "/privacySan +@@ -647,7 +647,7 @@ const char kCookiesSubPagePath[] = "/cookies"; #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -57,7 +57,7 @@ const char kChromeUIWebAppSettingsURL[] = "chrome://app-settings/"; const char kChromeUIWebAppSettingsHost[] = "app-settings"; #endif -@@ -888,7 +888,7 @@ const char* const kChromeDebugURLs[] = { +@@ -895,7 +895,7 @@ const char* const kChromeDebugURLs[] = { blink::kChromeUIGpuJavaCrashURL, kChromeUIJavaCrashURL, #endif 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 0d4b951f5af2..d618db9598da 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,6 +1,6 @@ ---- src/3rdparty/chromium/chrome/common/webui_url_constants.h.orig 2023-12-12 22:08:45 UTC +--- 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 -@@ -420,24 +420,24 @@ extern const char kOsUIVersionURL[]; +@@ -430,24 +430,24 @@ extern const char kOsUIVersionURL[]; extern const char kOsUIVersionURL[]; #endif @@ -29,7 +29,7 @@ extern const char kChromeUIWebAppSettingsURL[]; extern const char kChromeUIWebAppSettingsHost[]; #endif -@@ -452,7 +452,7 @@ extern const char kChromeUILinuxProxyConfigHost[]; +@@ -462,14 +462,14 @@ extern const char kChromeUILinuxProxyConfigHost[]; #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -38,7 +38,6 @@ extern const char kChromeUISandboxHost[]; #endif -@@ -464,7 +464,7 @@ extern const char kChromeUISearchEngineChoiceHost[]; // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA) || \ @@ -46,8 +45,8 @@ + (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD) extern const char kChromeUIBrowserSwitchHost[]; extern const char kChromeUIBrowserSwitchURL[]; - extern const char kChromeUIEnterpriseProfileWelcomeHost[]; -@@ -480,7 +480,7 @@ extern const char kChromeUIProfilePickerStartupQuery[] + extern const char kChromeUIIntroHost[]; +@@ -485,7 +485,7 @@ extern const char kChromeUIProfilePickerStartupQuery[] extern const char kChromeUIProfilePickerStartupQuery[]; #endif 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 index 92600c40052b..81e5f33cbbed 100644 --- 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 @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/chrome/renderer/chrome_render_frame_observer.cc.orig 2023-09-13 12:11:42 UTC +--- 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 -@@ -349,7 +349,7 @@ void ChromeRenderFrameObserver::OnDestruct() { +@@ -353,7 +353,7 @@ void ChromeRenderFrameObserver::WillDetach(blink::Deta void ChromeRenderFrameObserver::DraggableRegionsChanged() { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ 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 index 67fbfe0dbd94..2f7bbf9263f6 100644 --- 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 @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/chrome/test/BUILD.gn.orig 2023-12-12 22:08:45 UTC +--- src/3rdparty/chromium/chrome/test/BUILD.gn.orig 2024-07-03 01:14:49 UTC +++ src/3rdparty/chromium/chrome/test/BUILD.gn -@@ -11028,7 +11028,7 @@ test("chrome_app_unittests") { +@@ -11652,7 +11652,7 @@ test("chrome_app_unittests") { "//components/heap_profiling/in_process", "//components/safe_browsing:buildflags", ] diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_test_chromedriver_chrome__launcher.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_test_chromedriver_chrome__launcher.cc index 3445ef9a0d31..c6283009886c 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_test_chromedriver_chrome__launcher.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_test_chromedriver_chrome__launcher.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/chrome/test/chromedriver/chrome_launcher.cc.orig 2023-09-13 12:11:42 UTC +--- src/3rdparty/chromium/chrome/test/chromedriver/chrome_launcher.cc.orig 2023-12-10 06:10:27 UTC +++ src/3rdparty/chromium/chrome/test/chromedriver/chrome_launcher.cc -@@ -69,6 +69,7 @@ +@@ -73,6 +73,7 @@ #include #include #include diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_test_chromedriver_chrome_chrome__finder.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_test_chromedriver_chrome_chrome__finder.cc index 0bdc905691f4..fb679f2b4fad 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_test_chromedriver_chrome_chrome__finder.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_test_chromedriver_chrome_chrome__finder.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/chrome/test/chromedriver/chrome/chrome_finder.cc.orig 2023-08-04 12:03:57 UTC +--- src/3rdparty/chromium/chrome/test/chromedriver/chrome/chrome_finder.cc.orig 2023-12-10 06:10:27 UTC +++ src/3rdparty/chromium/chrome/test/chromedriver/chrome/chrome_finder.cc -@@ -57,7 +57,7 @@ void GetApplicationDirs(std::vector* l +@@ -58,7 +58,7 @@ void GetApplicationDirs(std::vector* l installation_locations[i].Append(L"Chromium\\Application")); } } @@ -9,12 +9,21 @@ void GetApplicationDirs(std::vector* locations) { // TODO: Respect users' PATH variables. // Until then, we use an approximation of the most common defaults. -@@ -157,7 +157,7 @@ bool FindChrome(base::FilePath* browser_exe) { - base::FilePath(chrome::kGoogleChromeForTestingBrowserProcessExecutablePath), - base::FilePath(chrome::kGoogleChromeBrowserProcessExecutablePath), - base::FilePath(chrome::kChromiumBrowserProcessExecutablePath), +@@ -125,7 +125,7 @@ std::vector GetChromeProgramNames() { + chrome::kGoogleChromeForTestingBrowserProcessExecutablePath), + base::FilePath(chrome::kGoogleChromeBrowserProcessExecutablePath), + base::FilePath(chrome::kChromiumBrowserProcessExecutablePath), -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) base::FilePath(chrome::kBrowserProcessExecutablePath), - base::FilePath("chrome"), // Chrome for Testing or Google Chrome - base::FilePath("google-chrome"), + base::FilePath("chrome"), // Chrome for Testing or Google Chrome + base::FilePath("google-chrome"), base::FilePath("chromium"), +@@ -141,7 +141,7 @@ std::vector GetHeadlessShellProgramNam + return { + #if BUILDFLAG(IS_WIN) + base::FilePath(FILE_PATH_LITERAL("chrome-headless-shell.exe")), +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + base::FilePath("chrome-headless-shell"), + #else + // it will compile but won't work on other OSes diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_autofill__payments__strings.grdp b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_autofill__payments__strings.grdp deleted file mode 100644 index 1e0b53511ea1..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_autofill__payments__strings.grdp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/components/autofill_payments_strings.grdp.orig 2023-10-11 18:22:24 UTC -+++ src/3rdparty/chromium/components/autofill_payments_strings.grdp -@@ -130,7 +130,7 @@ - - Save card - -- -+ - - - Do you want to save this card to your Google Account? diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_autofill_core_browser_contact__info__sync__util.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_autofill_core_browser_contact__info__sync__util.cc deleted file mode 100644 index b80b75fc5ee4..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_autofill_core_browser_contact__info__sync__util.cc +++ /dev/null @@ -1,18 +0,0 @@ ---- src/3rdparty/chromium/components/autofill/core/browser/contact_info_sync_util.cc.orig 2023-10-11 18:22:24 UTC -+++ src/3rdparty/chromium/components/autofill/core/browser/contact_info_sync_util.cc -@@ -174,9 +174,15 @@ class ContactInfoProfileSetter { - CHECK(observations.empty()); - for (const sync_pb::ContactInfoSpecifics::Observation& proto_observation : - proto_observations) { -+#if defined(__clang__) && (__clang_major__ >= 15) - observations.emplace_back(proto_observation.type(), - ProfileTokenQuality::FormSignatureHash( - proto_observation.form_hash())); -+#else -+ observations.emplace_back() = { static_cast(proto_observation.type()), -+ ProfileTokenQuality::FormSignatureHash( -+ proto_observation.form_hash()) }; -+#endif - } - } - 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 index 69dc752cebd1..2f38a56af0ec 100644 --- 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 @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/components/autofill/core/browser/personal_data_manager.cc.orig 2023-10-11 18:22:24 UTC +--- 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 -@@ -2492,7 +2492,8 @@ bool PersonalDataManager::ShouldShowCardsFromAccountOp +@@ -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) || \ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_autofill_core_browser_webdata_autofill__sync__bridge__util.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_autofill_core_browser_webdata_autofill__sync__bridge__util.cc deleted file mode 100644 index 8e4f33f7ee9e..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_autofill_core_browser_webdata_autofill__sync__bridge__util.cc +++ /dev/null @@ -1,22 +0,0 @@ ---- src/3rdparty/chromium/components/autofill/core/browser/webdata/autofill_sync_bridge_util.cc.orig 2023-10-11 18:22:24 UTC -+++ src/3rdparty/chromium/components/autofill/core/browser/webdata/autofill_sync_bridge_util.cc -@@ -553,11 +553,19 @@ ServerCvc AutofillWalletCvcStructDataFromWalletCredent - base::StringToInt64(wallet_credential_specifics.instrument_id(), - &instrument_id); - -+#if defined(__clang__) && (__clang_major__ >= 15) - return ServerCvc( - instrument_id, base::UTF8ToUTF16(wallet_credential_specifics.cvc()), - base::Time::UnixEpoch() + - base::Milliseconds(wallet_credential_specifics - .last_updated_time_unix_epoch_millis())); -+#else -+ return ServerCvc( { -+ instrument_id, base::UTF8ToUTF16(wallet_credential_specifics.cvc()), -+ base::Time::UnixEpoch() + -+ base::Milliseconds(wallet_credential_specifics -+ .last_updated_time_unix_epoch_millis()) }); -+#endif - } - - VirtualCardUsageData VirtualCardUsageDataFromUsageSpecifics( 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 a9efef1f1241..a79b6bbd561a 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,6 +1,6 @@ ---- src/3rdparty/chromium/components/autofill/core/common/autofill_payments_features.cc.orig 2023-10-11 18:22:24 UTC +--- 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 -@@ -281,7 +281,7 @@ BASE_FEATURE(kEnablePixPayments, +@@ -289,7 +289,7 @@ bool ShouldShowImprovedUserConsentForCreditCardSave() bool ShouldShowImprovedUserConsentForCreditCardSave() { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. 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 index 3050c1af8432..ec562b672824 100644 --- 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 @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/components/autofill/core/common/autofill_util.cc.orig 2023-09-13 12:11:42 UTC +--- 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 -@@ -153,7 +153,7 @@ bool SanitizedFieldIsEmpty(const std::u16string& value +@@ -130,7 +130,7 @@ bool SanitizedFieldIsEmpty(const std::u16string& value bool ShouldAutoselectFirstSuggestionOnArrowDown() { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_commerce__strings.grdp b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_commerce__strings.grdp deleted file mode 100644 index c2c2bfd11d9c..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_commerce__strings.grdp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/components/commerce_strings.grdp.orig 2023-10-11 18:22:24 UTC -+++ src/3rdparty/chromium/components/commerce_strings.grdp -@@ -292,7 +292,7 @@ - - Typical prices are based on stores across the web over the past 90 days. - -- -+ - - - Browse mode, you can change to Forms mode to use the left/right arrow to review price changes on the graph 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 new file mode 100644 index 000000000000..69012a421e4d --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_commerce_core_commerce__feature__list.cc @@ -0,0 +1,20 @@ +--- 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 +@@ -167,7 +167,7 @@ BASE_FEATURE(kPriceInsights, + "PriceInsights", + base::FEATURE_DISABLED_BY_DEFAULT); + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + BASE_FEATURE(kPriceInsightsRegionLaunched, + "PriceInsightsRegionLaunched", + base::FEATURE_ENABLED_BY_DEFAULT); +@@ -240,7 +240,7 @@ BASE_FEATURE(kShoppingCollection, + + BASE_FEATURE(kShoppingList, "ShoppingList", base::FEATURE_DISABLED_BY_DEFAULT); + #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_IOS) ++ BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_BSD) + BASE_FEATURE(kShoppingListRegionLaunched, + "ShoppingListRegionLaunched", + base::FEATURE_ENABLED_BY_DEFAULT); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_components__chromium__strings.grd b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_components__chromium__strings.grd deleted file mode 100644 index e9a83b5cca65..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_components__chromium__strings.grd +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/components/components_chromium_strings.grd.orig 2023-08-17 07:33:31 UTC -+++ src/3rdparty/chromium/components/components_chromium_strings.grd -@@ -226,7 +226,7 @@ - - - -- -+ - - Go to - the Chromium menu > diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_components__google__chrome__strings.grd b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_components__google__chrome__strings.grd deleted file mode 100644 index 9e9e4e219df3..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_components__google__chrome__strings.grd +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/components/components_google_chrome_strings.grd.orig 2023-08-17 07:33:31 UTC -+++ src/3rdparty/chromium/components/components_google_chrome_strings.grd -@@ -226,7 +226,7 @@ - - - -- -+ - - Go to - the Chrome menu > diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_content__settings_core_browser_website__settings__registry.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_content__settings_core_browser_website__settings__registry.cc index 7eaa096997ba..6404fd914e61 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_content__settings_core_browser_website__settings__registry.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_content__settings_core_browser_website__settings__registry.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/components/content_settings/core/browser/website_settings_registry.cc.orig 2022-02-28 16:54:41 UTC +--- src/3rdparty/chromium/components/content_settings/core/browser/website_settings_registry.cc.orig 2024-02-23 21:04:38 UTC +++ src/3rdparty/chromium/components/content_settings/core/browser/website_settings_registry.cc -@@ -66,7 +66,7 @@ const WebsiteSettingsInfo* WebsiteSettingsRegistry::Re +@@ -67,7 +67,7 @@ const WebsiteSettingsInfo* WebsiteSettingsRegistry::Re #if BUILDFLAG(IS_WIN) if (!(platform & PLATFORM_WINDOWS)) return nullptr; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_cookie__config_cookie__store__util.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_cookie__config_cookie__store__util.cc index 974af99fc813..c8d1b05477ce 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_cookie__config_cookie__store__util.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_cookie__config_cookie__store__util.cc @@ -1,9 +1,9 @@ ---- src/3rdparty/chromium/components/cookie_config/cookie_store_util.cc.orig 2022-02-28 16:54:41 UTC +--- src/3rdparty/chromium/components/cookie_config/cookie_store_util.cc.orig 2024-02-23 21:04:38 UTC +++ src/3rdparty/chromium/components/cookie_config/cookie_store_util.cc @@ -12,7 +12,7 @@ namespace cookie_config { - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) namespace { diff --git a/www/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 0df6ae034759..2c7831ca85a6 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,6 +1,6 @@ ---- src/3rdparty/chromium/components/crash/core/app/BUILD.gn.orig 2023-09-13 12:11:42 UTC +--- 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 -@@ -72,7 +72,7 @@ static_library("app") { +@@ -76,7 +76,7 @@ static_library("app") { "crashpad.h", ] @@ -9,7 +9,7 @@ sources += [ "crashpad_linux.cc" ] } -@@ -85,6 +85,10 @@ static_library("app") { +@@ -89,6 +89,10 @@ static_library("app") { ] } @@ -20,7 +20,7 @@ defines = [ "CRASH_IMPLEMENTATION" ] public_deps = [ ":lib" ] -@@ -113,7 +117,7 @@ static_library("app") { +@@ -117,7 +121,7 @@ static_library("app") { libs = [ "log" ] } @@ -29,7 +29,7 @@ deps += [ "//base:base_static", "//components/crash/core/common", -@@ -241,11 +245,6 @@ if (is_mac || is_android || is_linux || is_chromeos) { +@@ -245,11 +249,6 @@ if (is_mac || is_android || is_linux || is_chromeos) { # define custom UserStreamDataSources. executable("chrome_crashpad_handler") { sources = [ "chrome_crashpad_handler.cc" ] diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_crash_core_app_crashpad__handler__main.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_crash_core_app_crashpad__handler__main.cc new file mode 100644 index 000000000000..2e0e2e628a96 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_crash_core_app_crashpad__handler__main.cc @@ -0,0 +1,20 @@ +--- src/3rdparty/chromium/components/crash/core/app/crashpad_handler_main.cc.orig 2024-01-30 07:53:34 UTC ++++ src/3rdparty/chromium/components/crash/core/app/crashpad_handler_main.cc +@@ -10,7 +10,7 @@ + #include "third_party/crashpad/crashpad/handler/handler_main.h" + #include "third_party/crashpad/crashpad/handler/user_stream_data_source.h" + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + #include "components/stability_report/user_stream_data_source_posix.h" + #endif + +@@ -31,7 +31,7 @@ __attribute__((visibility("default"), used)) int Crash + char* argv[]) { + crashpad::UserStreamDataSources user_stream_data_sources; + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + user_stream_data_sources.push_back( + std::make_unique()); + #endif 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 a4dbb7fae0f3..6811eee84075 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,6 +1,6 @@ ---- src/3rdparty/chromium/components/discardable_memory/service/discardable_shared_memory_manager.cc.orig 2022-08-31 12:19:35 UTC +--- 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 -@@ -171,7 +171,7 @@ uint64_t GetDefaultMemoryLimit() { +@@ -172,7 +172,7 @@ uint64_t GetDefaultMemoryLimit() { // Limits the number of FDs used to 32, assuming a 4MB allocation size. uint64_t max_default_memory_limit = 128 * kMegabyte; #else diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_embedder__support_user__agent__utils.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_embedder__support_user__agent__utils.cc index df08ebcae4e2..7d388652db29 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_embedder__support_user__agent__utils.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_embedder__support_user__agent__utils.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/components/embedder_support/user_agent_utils.cc.orig 2023-10-11 18:22:24 UTC +--- src/3rdparty/chromium/components/embedder_support/user_agent_utils.cc.orig 2024-01-30 07:53:34 UTC +++ src/3rdparty/chromium/components/embedder_support/user_agent_utils.cc -@@ -432,6 +432,9 @@ std::string GetPlatformForUAMetadata() { +@@ -445,6 +445,9 @@ std::string GetPlatformForUAMetadata() { # else return "Chromium OS"; # endif 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 eacb45825e24..25bc2e504c09 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,15 +1,24 @@ ---- src/3rdparty/chromium/components/feature_engagement/public/feature_configurations.cc.orig 2023-10-11 18:22:24 UTC +--- 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 -@@ -46,7 +46,7 @@ FeatureConfig CreateAlwaysTriggerConfig(const base::Fe +@@ -48,7 +48,7 @@ FeatureConfig CreateAlwaysTriggerConfig(const base::Fe + absl::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 + + #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(); config->valid = true; -@@ -1336,7 +1336,8 @@ absl::optional GetClientSideFeatureConf +@@ -1530,7 +1530,8 @@ absl::optional GetClientSideFeatureConf #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ 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 8dd1aa2f62ed..2f530474bd2f 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,4 +1,4 @@ ---- src/3rdparty/chromium/components/feature_engagement/public/feature_constants.cc.orig 2023-10-11 18:22:24 UTC +--- 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 @@ -21,7 +21,7 @@ BASE_FEATURE(kUseClientConfigIPH, BASE_FEATURE(kIPHDummyFeature, "IPH_Dummy", base::FEATURE_DISABLED_BY_DEFAULT); @@ -6,16 +6,24 @@ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - BASE_FEATURE(kIPHAutofillFeedbackNewBadgeFeature, - "IPH_AutofillFeedbackNewBadge", - base::FEATURE_DISABLED_BY_DEFAULT); -@@ -519,7 +519,8 @@ BASE_FEATURE(kIPHiOSPromoPasswordManagerWidgetFeature, + BASE_FEATURE(kIPHBatterySaverModeFeature, + "IPH_BatterySaverMode", + base::FEATURE_ENABLED_BY_DEFAULT); +@@ -610,7 +610,7 @@ constexpr base::FeatureParam kDefaultBrowserEligi + /*default_value=*/365}; #endif // BUILDFLAG(IS_IOS) - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \ -+ BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \ + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) BASE_FEATURE(kIPHAutofillExternalAccountProfileSuggestionFeature, "IPH_AutofillExternalAccountProfileSuggestion", - base::FEATURE_ENABLED_BY_DEFAULT); +@@ -736,7 +736,7 @@ BASE_FEATURE(kIPHScalableIphGamingFeature, + base::FEATURE_DISABLED_BY_DEFAULT); + #endif + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // This can be enabled by default, as the DesktopPWAsLinkCapturing flag is + // needed for the IPH linked to this feature to work, and use-cases to show + // the IPH are guarded by that flag. diff --git a/www/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 67ad6e46d739..5307419b1a12 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,21 +1,29 @@ ---- src/3rdparty/chromium/components/feature_engagement/public/feature_constants.h.orig 2023-10-11 18:22:24 UTC +--- 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 -@@ -23,7 +23,7 @@ BASE_DECLARE_FEATURE(kUseClientConfigIPH); +@@ -25,7 +25,7 @@ BASE_DECLARE_FEATURE(kUseClientConfigIPH); BASE_DECLARE_FEATURE(kIPHDummyFeature); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - BASE_DECLARE_FEATURE(kIPHAutofillFeedbackNewBadgeFeature); BASE_DECLARE_FEATURE(kIPHBatterySaverModeFeature); BASE_DECLARE_FEATURE(kIPHCompanionSidePanelFeature); -@@ -211,7 +211,8 @@ BASE_DECLARE_FEATURE(kIPHiOSPromoPasswordManagerWidget + BASE_DECLARE_FEATURE(kIPHCompanionSidePanelRegionSearchFeature); +@@ -252,7 +252,7 @@ extern const base::FeatureParam + kDefaultBrowserEligibilitySlidingWindowParam; #endif // BUILDFLAG(IS_IOS) - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \ -+ BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \ + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) BASE_DECLARE_FEATURE(kIPHAutofillExternalAccountProfileSuggestionFeature); BASE_DECLARE_FEATURE(kIPHAutofillVirtualCardCVCSuggestionFeature); - BASE_DECLARE_FEATURE(kIPHAutofillVirtualCardSuggestionFeature); +@@ -300,7 +300,7 @@ BASE_DECLARE_FEATURE(kIPHScalableIphHelpAppBasedTenFea + BASE_DECLARE_FEATURE(kIPHScalableIphGamingFeature); + #endif + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + BASE_DECLARE_FEATURE(kIPHDesktopPWAsLinkCapturingLaunch); + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) + diff --git a/www/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 17611addcc17..ae61a1f12f14 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,21 +1,29 @@ ---- src/3rdparty/chromium/components/feature_engagement/public/feature_list.cc.orig 2023-10-11 18:22:24 UTC +--- 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 -@@ -139,7 +139,7 @@ const base::Feature* const kAllFeatures[] = { - &kIPHiOSPromoPasswordManagerWidgetFeature, +@@ -157,7 +157,7 @@ const base::Feature* const kAllFeatures[] = { + &kIPHiOSPromoStaySafeFeature, #endif // BUILDFLAG(IS_IOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - &kIPHAutofillFeedbackNewBadgeFeature, &kIPHBatterySaverModeFeature, &kIPHCompanionSidePanelFeature, -@@ -186,7 +186,8 @@ const base::Feature* const kAllFeatures[] = { + &kIPHCompanionSidePanelRegionSearchFeature, +@@ -214,7 +214,7 @@ const base::Feature* const kAllFeatures[] = { + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \ -+ BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \ + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) &kIPHAutofillExternalAccountProfileSuggestionFeature, &kIPHAutofillVirtualCardCVCSuggestionFeature, - &kIPHAutofillVirtualCardSuggestionFeature, +@@ -262,7 +262,7 @@ const base::Feature* const kAllFeatures[] = { + &kIPHScalableIphGamingFeature, + #endif // BUILDFLAG(IS_CHROMEOS_ASH) + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + &kIPHDesktopPWAsLinkCapturingLaunch, + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) + diff --git a/www/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 f39c82c3a1b9..640c3bcdada2 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,40 +1,56 @@ ---- src/3rdparty/chromium/components/feature_engagement/public/feature_list.h.orig 2023-10-11 18:22:24 UTC +--- 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 -@@ -259,7 +259,7 @@ DEFINE_VARIATION_PARAM(kIPHiOSPromoPasswordManagerWidg +@@ -288,7 +288,7 @@ DEFINE_VARIATION_PARAM(kIPHiOSPromoStaySafeFeature, "I #endif // BUILDFLAG(IS_IOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - DEFINE_VARIATION_PARAM(kIPHAutofillFeedbackNewBadgeFeature, - "IPH_AutofillFeedbackNewBadge"); DEFINE_VARIATION_PARAM(kIPHBatterySaverModeFeature, "IPH_BatterySaverMode"); -@@ -335,7 +335,8 @@ DEFINE_VARIATION_PARAM(kIPHBackNavigationMenuFeature, + 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) || // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \ -+ BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \ + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) DEFINE_VARIATION_PARAM(kIPHAutofillExternalAccountProfileSuggestionFeature, "IPH_AutofillExternalAccountProfileSuggestion"); - DEFINE_VARIATION_PARAM(kIPHAutofillVirtualCardCVCSuggestionFeature, -@@ -541,7 +542,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation - VARIATION_ENTRY(kIPHiOSPromoPostRestoreDefaultBrowserFeature), - VARIATION_ENTRY(kIPHiOSPromoPasswordManagerWidgetFeature), +@@ -470,7 +470,7 @@ DEFINE_VARIATION_PARAM(kIPHScalableIphHelpAppBasedTenF + DEFINE_VARIATION_PARAM(kIPHScalableIphGamingFeature, "IPH_ScalableIphGaming"); + #endif // BUILDFLAG(IS_CHROMEOS_ASH) + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + DEFINE_VARIATION_PARAM(kIPHDesktopPWAsLinkCapturingLaunch, + "IPH_DesktopPWAsLinkCapturingLaunch"); + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +@@ -615,7 +615,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation + VARIATION_ENTRY(kIPHiOSPromoMadeForIOSFeature), + VARIATION_ENTRY(kIPHiOSPromoStaySafeFeature), #elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - VARIATION_ENTRY(kIPHAutofillFeedbackNewBadgeFeature), VARIATION_ENTRY(kIPHBatterySaverModeFeature), VARIATION_ENTRY(kIPHCompanionSidePanelFeature), -@@ -589,7 +590,8 @@ constexpr flags_ui::FeatureEntry::FeatureVariation + VARIATION_ENTRY(kIPHCompanionSidePanelRegionSearchFeature), +@@ -672,7 +672,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \ -+ BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \ + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) VARIATION_ENTRY(kIPHAutofillExternalAccountProfileSuggestionFeature), VARIATION_ENTRY(kIPHAutofillVirtualCardCVCSuggestionFeature), - VARIATION_ENTRY(kIPHAutofillVirtualCardSuggestionFeature), +@@ -720,7 +720,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation + VARIATION_ENTRY(kIPHScalableIphGamingFeature), + #endif // BUILDFLAG(IS_CHROMEOS_ASH) + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + VARIATION_ENTRY(kIPHDesktopPWAsLinkCapturingLaunch), + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) + diff --git a/www/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 45ec484e308d..69d4aa842e2e 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 2023-09-13 12:11:42 UTC +--- 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 -@@ -64,7 +64,7 @@ constexpr bool kCpuIs64Bit = +@@ -70,7 +70,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). @@ -9,12 +9,3 @@ constexpr int kDefaultMaxAllocations = 50; constexpr int kDefaultMaxMetadata = 210; constexpr int kDefaultTotalPages = kCpuIs64Bit ? 2048 : kDefaultMaxMetadata * 2; -@@ -84,7 +84,7 @@ constexpr int kDefaultProcessSamplingBoost2 = 10; - // BUILDFLAG(IS_FUCHSIA) - - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS_ASH) -+ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) - constexpr base::FeatureState kDefaultEnabled = base::FEATURE_ENABLED_BY_DEFAULT; - #else - constexpr base::FeatureState kDefaultEnabled = diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_management__strings.grdp b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_management__strings.grdp deleted file mode 100644 index e45b81485e41..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_management__strings.grdp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/components/management_strings.grdp.orig 2023-10-11 18:22:24 UTC -+++ src/3rdparty/chromium/components/management_strings.grdp -@@ -346,7 +346,7 @@ - - - -- -+ - - Information about your browser, OS, device, installed software, and files - 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 new file mode 100644 index 000000000000..7a008681696b --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_media__router_common_media__source.cc @@ -0,0 +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 +@@ -59,7 +59,7 @@ bool IsSystemAudioCaptureSupported() { + } + #if BUILDFLAG(IS_MAC) + return base::FeatureList::IsEnabled(media::kMacLoopbackAudioForCast); +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + return base::FeatureList::IsEnabled(media::kPulseaudioLoopbackForCast); + #else + return true; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_media__router_common_providers_cast_channel_cast__message__util.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_media__router_common_providers_cast_channel_cast__message__util.cc index 68fff7e336fe..59cc556cb1de 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_media__router_common_providers_cast_channel_cast__message__util.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_media__router_common_providers_cast_channel_cast__message__util.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/components/media_router/common/providers/cast/channel/cast_message_util.cc.orig 2022-11-30 08:12:58 UTC +--- src/3rdparty/chromium/components/media_router/common/providers/cast/channel/cast_message_util.cc.orig 2023-11-03 10:09:45 UTC +++ src/3rdparty/chromium/components/media_router/common/providers/cast/channel/cast_message_util.cc -@@ -170,7 +170,7 @@ int GetVirtualConnectPlatformValue() { +@@ -169,7 +169,7 @@ int GetVirtualConnectPlatformValue() { return 4; #elif BUILDFLAG(IS_CHROMEOS_ASH) return 5; diff --git a/www/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 baa13d124508..f3babba05b53 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,4 +1,4 @@ ---- src/3rdparty/chromium/components/metrics/metrics_log.cc.orig 2023-10-11 18:22:24 UTC +--- src/3rdparty/chromium/components/metrics/metrics_log.cc.orig 2024-01-30 07:53:34 UTC +++ src/3rdparty/chromium/components/metrics/metrics_log.cc @@ -53,7 +53,7 @@ #include "base/win/current_module.h" @@ -9,7 +9,7 @@ #include "base/environment.h" #include "base/nix/xdg_util.h" #endif -@@ -139,7 +139,7 @@ void RecordCurrentTime( +@@ -142,7 +142,7 @@ void RecordCurrentTime( } } @@ -18,7 +18,7 @@ metrics::SystemProfileProto::OS::XdgSessionType ToProtoSessionType( base::nix::SessionType session_type) { switch (session_type) { -@@ -399,7 +399,7 @@ void MetricsLog::RecordCoreSystemProfile( +@@ -393,7 +393,7 @@ void MetricsLog::RecordCoreSystemProfile( // OperatingSystemVersion refers to the ChromeOS release version. #if BUILDFLAG(IS_CHROMEOS_ASH) os->set_kernel_version(base::SysInfo::KernelVersion()); @@ -27,7 +27,7 @@ // Linux operating system version is copied over into kernel version to be // consistent. os->set_kernel_version(base::SysInfo::OperatingSystemVersion()); -@@ -416,7 +416,7 @@ void MetricsLog::RecordCoreSystemProfile( +@@ -410,7 +410,7 @@ void MetricsLog::RecordCoreSystemProfile( os->set_build_number(base::SysInfo::GetIOSBuildNumber()); #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_neterror_resources_neterror.js b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_neterror_resources_neterror.js index 772fc06ecc8a..ea428f9b44b8 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_neterror_resources_neterror.js +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_neterror_resources_neterror.js @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/components/neterror/resources/neterror.js.orig 2023-02-08 09:03:45 UTC +--- src/3rdparty/chromium/components/neterror/resources/neterror.js.orig 2024-01-30 07:53:34 UTC +++ src/3rdparty/chromium/components/neterror/resources/neterror.js -@@ -137,7 +137,7 @@ function detailsButtonClick() { +@@ -142,7 +142,7 @@ function detailsButtonClick() { let primaryControlOnLeft = true; // clang-format off diff --git a/www/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 9fef706ac19d..52e9d647cf2e 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 2023-09-13 12:11:42 UTC +--- 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 -@@ -793,7 +793,7 @@ net::URLRequestContextBuilder::HttpCacheParams::Type C +@@ -827,7 +827,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_new__or__sad__tab__strings.grdp b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_new__or__sad__tab__strings.grdp deleted file mode 100644 index 07be6389be6a..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_new__or__sad__tab__strings.grdp +++ /dev/null @@ -1,20 +0,0 @@ ---- src/3rdparty/chromium/components/new_or_sad_tab_strings.grdp.orig 2022-07-22 17:30:31 UTC -+++ src/3rdparty/chromium/components/new_or_sad_tab_strings.grdp -@@ -66,7 +66,7 @@ - Close other tabs or apps - - -- -+ - - Close other tabs or programs - -@@ -76,7 +76,7 @@ - Close other apps - - -- -+ - - Close other programs - 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 50c12084abdd..65846afede75 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 2022-10-24 13:33:33 UTC +--- 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 -@@ -27,7 +27,7 @@ optimization_guide::proto::Platform GetPlatform() { +@@ -39,7 +39,7 @@ optimization_guide::proto::Platform GetPlatform() { return optimization_guide::proto::PLATFORM_CHROMEOS; #elif BUILDFLAG(IS_ANDROID) return optimization_guide::proto::PLATFORM_ANDROID; @@ -8,4 +8,4 @@ +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) return optimization_guide::proto::PLATFORM_LINUX; #else - return optimization_guide::proto::PLATFORM_UNKNOWN; + return optimization_guide::proto::PLATFORM_UNDEFINED; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_optimization__guide_core_tflite__model__executor.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_optimization__guide_core_tflite__model__executor.h deleted file mode 100644 index 1382842194a0..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_optimization__guide_core_tflite__model__executor.h +++ /dev/null @@ -1,62 +0,0 @@ ---- src/3rdparty/chromium/components/optimization_guide/core/tflite_model_executor.h.orig 2023-10-11 18:22:24 UTC -+++ src/3rdparty/chromium/components/optimization_guide/core/tflite_model_executor.h -@@ -240,7 +240,11 @@ class TFLiteModelExecutor : public ModelExecutor= 15) - ModelExecutor::ConstRefInputVector inputs) -+#else -+ typename ModelExecutor::ConstRefInputVector inputs) -+#endif - override { - DCHECK(execution_task_runner_->RunsTasksInCurrentSequence()); - DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); -@@ -262,7 +266,11 @@ class TFLiteModelExecutor : public ModelExecutor> SendForBatchExecutionSync( -+#if defined(__clang__) && (__clang_major__ >= 15) - ModelExecutor::ConstRefInputVector inputs) -+#else -+ typename ModelExecutor::ConstRefInputVector inputs) -+#endif - override { - DCHECK(execution_task_runner_->RunsTasksInCurrentSequence()); - DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); -@@ -417,7 +425,11 @@ class TFLiteModelExecutor : public ModelExecutor= 15) - ModelExecutor::ConstRefInputVector inputs) { -+#else -+ typename ModelExecutor::ConstRefInputVector inputs) { -+#endif - DCHECK(execution_task_runner_->RunsTasksInCurrentSequence()); - DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); - -@@ -434,7 +446,11 @@ class TFLiteModelExecutor : public ModelExecutor= 15) - ModelExecutor::ConstRefInputVector inputs, -+#else -+ typename ModelExecutor::ConstRefInputVector inputs, -+#endif - std::vector>* outputs) { - DCHECK(execution_task_runner_->RunsTasksInCurrentSequence()); - DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); -@@ -494,7 +510,11 @@ class TFLiteModelExecutor : public ModelExecutor= 15) - ModelExecutor::ConstRefInputVector inputs, -+#else -+ typename ModelExecutor::ConstRefInputVector inputs, -+#endif - ExecutionStatus execution_status) { - DCHECK(execution_task_runner_->RunsTasksInCurrentSequence()); - DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); 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 69c6b096d20a..d92d62501494 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,13 +1,13 @@ ---- src/3rdparty/chromium/components/paint_preview/browser/paint_preview_client.cc.orig 2023-03-09 06:31:50 UTC +--- 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 -@@ -310,8 +310,8 @@ void PaintPreviewClient::CapturePaintPreview( - metadata->set_url(url.spec()); +@@ -313,8 +313,8 @@ void PaintPreviewClient::CapturePaintPreview( metadata->set_version(kPaintPreviewVersion); auto* chromeVersion = metadata->mutable_chrome_version(); -- chromeVersion->set_major(CHROME_VERSION_MAJOR); -- chromeVersion->set_minor(CHROME_VERSION_MINOR); -+ chromeVersion->set_gmajor(CHROME_VERSION_MAJOR); -+ chromeVersion->set_gminor(CHROME_VERSION_MINOR); - chromeVersion->set_build(CHROME_VERSION_BUILD); - chromeVersion->set_patch(CHROME_VERSION_PATCH); + const auto& current_chrome_version = version_info::GetVersion(); +- chromeVersion->set_major(current_chrome_version.components()[0]); +- chromeVersion->set_minor(current_chrome_version.components()[1]); ++ chromeVersion->set_gmajor(current_chrome_version.components()[0]); ++ chromeVersion->set_gminor(current_chrome_version.components()[1]); + chromeVersion->set_build(current_chrome_version.components()[2]); + chromeVersion->set_patch(current_chrome_version.components()[3]); document_data.callback = std::move(callback); diff --git a/www/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 43b3203fc18b..5f4b049edd33 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,13 +1,13 @@ ---- src/3rdparty/chromium/components/paint_preview/player/player_compositor_delegate.cc.orig 2023-03-09 06:31:50 UTC +--- 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 -@@ -452,8 +452,8 @@ void PlayerCompositorDelegate::ValidateProtoAndLoadAXT - // use the AXTreeUpdate. +@@ -455,8 +455,8 @@ void PlayerCompositorDelegate::ValidateProtoAndLoadAXT auto chrome_version = capture_result_->proto.metadata().chrome_version(); + const auto& current_chrome_version = version_info::GetVersion(); if (capture_result_->proto.metadata().has_chrome_version() && -- chrome_version.major() == CHROME_VERSION_MAJOR && -- chrome_version.minor() == CHROME_VERSION_MINOR && -+ chrome_version.gmajor() == CHROME_VERSION_MAJOR && -+ chrome_version.gminor() == CHROME_VERSION_MINOR && - chrome_version.build() == CHROME_VERSION_BUILD && - chrome_version.patch() == CHROME_VERSION_PATCH) { +- chrome_version.major() == current_chrome_version.components()[0] && +- chrome_version.minor() == current_chrome_version.components()[1] && ++ chrome_version.gmajor() == current_chrome_version.components()[0] && ++ chrome_version.gminor() == current_chrome_version.components()[1] && + chrome_version.build() == current_chrome_version.components()[2] && + chrome_version.patch() == current_chrome_version.components()[3]) { paint_preview_service_->GetFileMixin()->GetAXTreeUpdate( diff --git a/www/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 01678c9ccaf3..06065cf3e0d1 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,11 +1,20 @@ ---- src/3rdparty/chromium/components/password_manager/core/browser/features/password_features.cc.orig 2023-10-27 05:38:38 UTC +--- 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 -@@ -27,7 +27,7 @@ BASE_FEATURE(kBiometricTouchToFill, - // Delete undecryptable passwords from the store when Sync is active. +@@ -24,7 +24,7 @@ BASE_FEATURE(kButterOnDesktopFollowup, + BASE_FEATURE(kClearUndecryptablePasswordsOnSync, "ClearUndecryptablePasswordsInSync", --#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_IOS) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_BSD) base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT +@@ -104,7 +104,7 @@ BASE_FEATURE(kPasswordManagerLogToTerminal, + "PasswordManagerLogToTerminal", + 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); 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 new file mode 100644 index 000000000000..9245405b0828 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_browser_features_password__features.h @@ -0,0 +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 +@@ -94,7 +94,7 @@ BASE_DECLARE_FEATURE(kPasswordManagerEnableSenderServi + // terminal. + BASE_DECLARE_FEATURE(kPasswordManagerLogToTerminal); + +-#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) 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 new file mode 100644 index 000000000000..8d4ec9f7d604 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_browser_password__form__manager.cc @@ -0,0 +1,29 @@ +--- 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 +@@ -58,7 +58,7 @@ + #include "components/webauthn/android/webauthn_cred_man_delegate.h" + #endif // BUILDFLAG(IS_ANDROID) + +-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "components/os_crypt/sync/os_crypt.h" + #endif + +@@ -229,7 +229,7 @@ bool ShouldUploadCrowdsourcingVotes(const FormOrDigest + return false; + } + +-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + bool ShouldShowKeychainErrorBubble( + absl::optional backend_error) { + if (!backend_error.has_value()) { +@@ -794,7 +794,7 @@ void PasswordFormManager::OnFetchCompleted() { + error.value().type); + } + +-#elif BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (ShouldShowKeychainErrorBubble( + form_fetcher_->GetProfileStoreBackendError())) { + client_->NotifyKeychainError(); diff --git a/www/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 new file mode 100644 index 000000000000..ca56f648cb7f --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_browser_password__manager.cc @@ -0,0 +1,11 @@ +--- 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 +@@ -363,7 +363,7 @@ void PasswordManager::RegisterProfilePrefs( + registry->RegisterListPref(prefs::kPasswordManagerPromoCardsList); + #endif // BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_IOS) + registry->RegisterBooleanPref(prefs::kPasswordSharingEnabled, true); +-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + registry->RegisterIntegerPref(prefs::kRelaunchChromeBubbleDismissedCounter, + 0); + #endif diff --git a/www/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 index 38d2d8679d7d..e117fb35e7d8 100644 --- 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 @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/components/password_manager/core/common/password_manager_features.h.orig 2023-10-27 05:38:38 UTC +--- 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 -@@ -24,7 +24,7 @@ namespace password_manager::features { +@@ -19,7 +19,7 @@ namespace password_manager::features { // alongside the definition of their values in the .cc file. BASE_DECLARE_FEATURE(kEnableOverwritingPlaceholderUsernames); 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 new file mode 100644 index 000000000000..14a22bf48457 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_common_password__manager__pref__names.h @@ -0,0 +1,11 @@ +--- 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 +@@ -324,7 +324,7 @@ inline constexpr char kPasswordManagerPromoCardsList[] + inline constexpr char kPasswordSharingEnabled[] = + "password_manager.password_sharing_enabled"; + +-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Integer pref indicating how many times relaunch Chrome bubble was dismissed. + inline constexpr char kRelaunchChromeBubbleDismissedCounter[] = + "password_manager.relaunch_chrome_bubble_dismissed_counter"; diff --git a/www/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 c16bc41b33e8..d174e24d6b30 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,11 +1,11 @@ ---- src/3rdparty/chromium/components/performance_manager/public/features.h.orig 2023-04-28 17:01:32 UTC +--- 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 @@ -28,7 +28,7 @@ BASE_DECLARE_FEATURE(kRunOnDedicatedThreadPoolThread); #if !BUILDFLAG(IS_ANDROID) --#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #define URGENT_DISCARDING_FROM_PERFORMANCE_MANAGER() false #else #define URGENT_DISCARDING_FROM_PERFORMANCE_MANAGER() true diff --git a/www/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 ef087ec77852..ce43d7c06a79 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 2023-04-28 17:01:32 UTC +--- 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 -@@ -327,7 +327,7 @@ class PolicyTestCase { +@@ -318,7 +318,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 54ac5041816a..e5c6928ce9c7 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 2023-05-31 08:12:17 UTC +--- 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 -@@ -455,7 +455,7 @@ void CloudPolicyClient::FetchPolicy() { +@@ -554,7 +554,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__util.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_policy_core_common_cloud_cloud__policy__util.cc index 2a5e84693fdb..244cc5c20edb 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-10-11 18:22:24 UTC +--- 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 @@ -20,7 +20,7 @@ #endif @@ -35,7 +35,7 @@ char hostname[HOST_NAME_MAX]; if (gethostname(hostname, HOST_NAME_MAX) == 0) // Success. return hostname; -@@ -144,7 +149,7 @@ std::string GetMachineName() { +@@ -143,7 +148,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 = -@@ -167,7 +172,7 @@ std::string GetOSArchitecture() { +@@ -166,7 +171,7 @@ std::string GetOSArchitecture() { } std::string GetOSUsername() { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_policy_core_common_policy__loader__common.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_policy_core_common_policy__loader__common.cc index 9e7c70f6615e..039b048a3841 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_policy_core_common_policy__loader__common.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_policy_core_common_policy__loader__common.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/components/policy/core/common/policy_loader_common.cc.orig 2023-09-13 12:11:42 UTC +--- src/3rdparty/chromium/components/policy/core/common/policy_loader_common.cc.orig 2024-01-30 07:53:34 UTC +++ src/3rdparty/chromium/components/policy/core/common/policy_loader_common.cc @@ -46,7 +46,7 @@ const char* kSensitivePolicies[] = { key::kDefaultSearchProviderEnabled, @@ -7,11 +7,11 @@ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) key::kAutoOpenFileTypes, - key::kSafeBrowsingAllowlistDomains, key::kHomepageIsNewTabPage, -@@ -55,7 +55,7 @@ const char* kSensitivePolicies[] = { - key::kRestoreOnStartup, - key::kRestoreOnStartupURLs, + key::kPasswordProtectionChangePasswordURL, +@@ -56,7 +56,7 @@ const char* kSensitivePolicies[] = { + key::kSafeBrowsingAllowlistDomains, + key::kSiteSearchSettings, #endif -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_policy_core_common_policy__paths.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_policy_core_common_policy__paths.cc index d9ed95b999a8..b8b53fba0be7 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_policy_core_common_policy__paths.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_policy_core_common_policy__paths.cc @@ -1,11 +1,11 @@ ---- src/3rdparty/chromium/components/policy/core/common/policy_paths.cc.orig 2023-10-11 18:22:24 UTC +--- src/3rdparty/chromium/components/policy/core/common/policy_paths.cc.orig 2024-01-30 07:53:34 UTC +++ src/3rdparty/chromium/components/policy/core/common/policy_paths.cc -@@ -16,6 +16,8 @@ namespace policy { - #if BUILDFLAG(GOOGLE_CHROME_BRANDING) || \ - BUILDFLAG(GOOGLE_CHROME_FOR_TESTING_BRANDING) +@@ -17,6 +17,8 @@ namespace policy { const char kPolicyPath[] = "/etc/opt/chrome/policies"; + #elif BUILDFLAG(GOOGLE_CHROME_FOR_TESTING_BRANDING) + const char kPolicyPath[] = "/etc/opt/chrome_for_testing/policies"; +#elif BUILDFLAG(IS_FREEBSD) +const char kPolicyPath[] = "/usr/local/etc/chromium/policies"; #else const char kPolicyPath[] = "/etc/chromium/policies"; - #endif // BUILDFLAG(GOOGLE_CHROME_BRANDING) || \ + #endif // BUILDFLAG(GOOGLE_CHROME_BRANDING) 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 new file mode 100644 index 000000000000..e746a2814462 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_policy_core_common_policy__utils.cc @@ -0,0 +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 +@@ -28,7 +28,7 @@ bool IsPolicyTestingEnabled(PrefService* pref_service, + return true; + } + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (channel == version_info::Channel::DEV) { + return true; + } diff --git a/www/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 new file mode 100644 index 000000000000..3ec6f5e3413e --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_qr__code__generator_features.cc @@ -0,0 +1,13 @@ +--- 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 new file mode 100644 index 000000000000..5efb11c19bc6 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_qr__code__generator_features.h @@ -0,0 +1,14 @@ +--- 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 new file mode 100644 index 000000000000..ec91cb953e18 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_qr__code__generator_qr__code__generator.cc @@ -0,0 +1,47 @@ +--- 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_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 6bfbade8af4e..9a59f366b1ca 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-04-28 17:01:32 UTC +--- 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 -@@ -117,7 +117,7 @@ std::ostream& operator<<(std::ostream& os, const ListI +@@ -116,7 +116,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_common_features.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_safe__browsing_core_common_features.cc new file mode 100644 index 000000000000..06925fa38d05 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_safe__browsing_core_common_features.cc @@ -0,0 +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 +@@ -201,7 +201,7 @@ BASE_FEATURE(kSafeBrowsingSkipSubresources, + BASE_FEATURE(kSafeBrowsingSkipSubresources2, + "SafeBrowsingSkipSubResources2", + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS_LACROS) ++ BUILDFLAG(IS_CHROMEOS_LACROS) || 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_template__url__service.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_search__engines_template__url__service.cc new file mode 100644 index 000000000000..9f4f9b8b075e --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_search__engines_template__url__service.cc @@ -0,0 +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 +@@ -2915,7 +2915,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) + return base::FeatureList::IsEnabled(omnibox::kSiteSearchSettingsPolicy) + ? std::make_unique( + prefs, base::BindRepeating( diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_segmentation__platform_embedder_default__model_cross__device__user__segment.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_segmentation__platform_embedder_default__model_cross__device__user__segment.cc index 69a7909e2f4e..1f99b0027f8f 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_segmentation__platform_embedder_default__model_cross__device__user__segment.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_segmentation__platform_embedder_default__model_cross__device__user__segment.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/components/segmentation_platform/embedder/default_model/cross_device_user_segment.cc.orig 2023-09-13 12:11:42 UTC +--- src/3rdparty/chromium/components/segmentation_platform/embedder/default_model/cross_device_user_segment.cc.orig 2023-11-03 10:09:45 UTC +++ src/3rdparty/chromium/components/segmentation_platform/embedder/default_model/cross_device_user_segment.cc -@@ -179,7 +179,7 @@ void CrossDeviceUserSegment::ExecuteModelWithInput( +@@ -148,7 +148,7 @@ void CrossDeviceUserSegment::ExecuteModelWithInput( // Check for current device type and subtract it from the device count // calculation. #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.cc index a6c20612bade..cc33b53fc1c9 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/components/services/paint_preview_compositor/paint_preview_compositor_collection_impl.cc.orig 2023-09-13 12:11:42 UTC +--- src/3rdparty/chromium/components/services/paint_preview_compositor/paint_preview_compositor_collection_impl.cc.orig 2024-01-30 07:53:34 UTC +++ src/3rdparty/chromium/components/services/paint_preview_compositor/paint_preview_compositor_collection_impl.cc -@@ -21,7 +21,7 @@ +@@ -22,7 +22,7 @@ #if BUILDFLAG(IS_WIN) #include "content/public/child/dwrite_font_proxy_init_win.h" @@ -9,7 +9,7 @@ #include "components/services/font/public/cpp/font_loader.h" #endif -@@ -78,7 +78,7 @@ PaintPreviewCompositorCollectionImpl::PaintPreviewComp +@@ -79,7 +79,7 @@ PaintPreviewCompositorCollectionImpl::PaintPreviewComp // Initialize font access for Skia. #if BUILDFLAG(IS_WIN) content::InitializeDWriteFontProxy(); @@ -18,8 +18,8 @@ mojo::PendingRemote font_service; content::UtilityThread::Get()->BindHostReceiver( font_service.InitWithNewPipeAndPassReceiver()); -@@ -101,7 +101,7 @@ PaintPreviewCompositorCollectionImpl::PaintPreviewComp - base::BindOnce([] { SkFontMgr::RefDefault(); })); +@@ -102,7 +102,7 @@ PaintPreviewCompositorCollectionImpl::PaintPreviewComp + base::BindOnce([] { skia::DefaultFontMgr(); })); // Sanity check that fonts are working. -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) diff --git a/www/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 new file mode 100644 index 000000000000..784fcadcebcc --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_services_screen__ai_public_cpp_utilities.cc @@ -0,0 +1,20 @@ +--- 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 index 2e9a316712ba..f3b1f5a23310 100644 --- 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 @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/components/services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.cc.orig 2023-09-13 12:11:42 UTC +--- 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 } @@ -8,7 +8,7 @@ auto* instance = sandbox::policy::SandboxLinux::GetInstance(); std::vector permissions{ -@@ -82,6 +83,7 @@ bool ScreenAIPreSandboxHook(sandbox::policy::SandboxLi +@@ -75,6 +76,7 @@ bool ScreenAIPreSandboxHook(sandbox::policy::SandboxLi sandbox::syscall_broker::COMMAND_OPEN}), permissions, sandbox::policy::SandboxLinux::PreSandboxHook(), options); instance->EngageNamespaceSandboxIfPossible(); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_services_screen__ai_screen__ai__library__wrapper.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_services_screen__ai_screen__ai__library__wrapper.cc deleted file mode 100644 index 60d321baf24c..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_services_screen__ai_screen__ai__library__wrapper.cc +++ /dev/null @@ -1,29 +0,0 @@ ---- src/3rdparty/chromium/components/services/screen_ai/screen_ai_library_wrapper.cc.orig 2023-09-13 12:11:42 UTC -+++ src/3rdparty/chromium/components/services/screen_ai/screen_ai_library_wrapper.cc -@@ -187,7 +187,7 @@ ScreenAILibraryWrapper::PerformOcr(const SkBitmap& ima - - // TODO(crbug.com/1443341): Remove this after fixing the crash issue on Linux - // official. --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - free_library_allocated_char_array_(library_buffer.release()); - #endif - -@@ -219,7 +219,7 @@ ScreenAILibraryWrapper::ExtractLayout(const SkBitmap& - - // TODO(crbug.com/1443341): Remove this after fixing the crash issue on Linux - // official. --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - free_library_allocated_char_array_(library_buffer.release()); - #endif - -@@ -253,7 +253,7 @@ absl::optional> ScreenAILibraryWr - - // TODO(crbug.com/1443341): Remove this after fixing the crash issue on Linux - // official. --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - free_library_allocated_int32_array_(library_buffer.release()); - #endif - diff --git a/www/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 new file mode 100644 index 000000000000..d791d36f0857 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_signin_public_base_signin__switches.cc @@ -0,0 +1,11 @@ +--- 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 new file mode 100644 index 000000000000..95e273e34b2c --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_signin_public_base_signin__switches.h @@ -0,0 +1,11 @@ +--- 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_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 f1659cc70599..21005be66449 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,6 +1,6 @@ ---- src/3rdparty/chromium/components/startup_metric_utils/common/startup_metric_utils.cc.orig 2023-09-13 12:11:42 UTC +--- 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 -@@ -78,7 +78,7 @@ base::TimeTicks CommonStartupMetricRecorder::StartupTi +@@ -85,7 +85,7 @@ base::TimeTicks CommonStartupMetricRecorder::StartupTi // Enabling this logic on OS X causes a significant performance regression. // TODO(crbug.com/601270): Remove IS_APPLE ifdef once priority changes are // ignored on Mac main thread. diff --git a/www/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 1318ba5b920a..0ba648cfe5a9 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 2023-12-12 22:08:45 UTC +--- src/3rdparty/chromium/components/storage_monitor/BUILD.gn.orig 2024-07-03 01:14:49 UTC +++ src/3rdparty/chromium/components/storage_monitor/BUILD.gn -@@ -75,7 +75,7 @@ jumbo_static_library("storage_monitor") { +@@ -78,7 +78,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", -@@ -179,7 +179,7 @@ source_set("unit_tests") { +@@ -185,7 +185,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_proto__fetcher.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_supervised__user_core_browser_proto__fetcher.cc deleted file mode 100644 index 011f6a2d4585..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_supervised__user_core_browser_proto__fetcher.cc +++ /dev/null @@ -1,39 +0,0 @@ ---- src/3rdparty/chromium/components/supervised_user/core/browser/proto_fetcher.cc.orig 2023-09-13 12:11:42 UTC -+++ src/3rdparty/chromium/components/supervised_user/core/browser/proto_fetcher.cc -@@ -398,8 +398,11 @@ class RetryingFetcherImpl final : public DeferredFetch - // Not copyable. - RetryingFetcherImpl(const RetryingFetcherImpl&) = delete; - RetryingFetcherImpl& operator=(const RetryingFetcherImpl&) = delete; -- -+#if defined(__clang__) && (__clang_major__ >= 15) - void Start(ProtoFetcher::Callback callback) override { -+#else -+ void Start(typename ProtoFetcher::Callback callback) override { -+#endif - callback_ = std::move(callback); - Retry(); - } -@@ -435,7 +438,11 @@ class RetryingFetcherImpl final : public DeferredFetch - } - - // Client callback. -+#if defined(__clang__) && (__clang_major__ >= 15) - ProtoFetcher::Callback callback_; -+#else -+ typename ProtoFetcher::Callback callback_; -+#endif - - // Retry controls. - base::OneShotTimer timer_; -@@ -578,7 +585,11 @@ ParallelFetchManager::ParallelFetch - template - void ParallelFetchManager::Fetch( - const Request& request, -+#if defined(__clang__) && (__clang_major__ >= 15) - Fetcher::Callback callback) { -+#else -+ typename Fetcher::Callback callback) { -+#endif - CHECK(callback) << "Use base::DoNothing() instead of empty callback."; - KeyType key = requests_in_flight_.Add(MakeFetcher(request)); - requests_in_flight_.Lookup(key)->Start( diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_supervised__user_core_browser_proto__fetcher.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_supervised__user_core_browser_proto__fetcher.h deleted file mode 100644 index e84de128d3f5..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_supervised__user_core_browser_proto__fetcher.h +++ /dev/null @@ -1,21 +0,0 @@ ---- src/3rdparty/chromium/components/supervised_user/core/browser/proto_fetcher.h.orig 2023-09-13 12:11:42 UTC -+++ src/3rdparty/chromium/components/supervised_user/core/browser/proto_fetcher.h -@@ -165,10 +165,18 @@ class ParallelFetchManager { - - // Starts the fetch. Underlying fetcher is stored internally, and will be - // cleaned up after finish or when this manager is destroyed. -+#if defined(__clang__) && (__clang_major__ >= 15) - void Fetch(const Request& request, Fetcher::Callback callback); -+#else -+ void Fetch(const Request& request, typename Fetcher::Callback callback); -+#endif - - private: -+#if defined(__clang__) && (__clang_major__ >= 15) - using KeyType = base::IDMap>::KeyType; -+#else -+ using KeyType = typename base::IDMap>::KeyType; -+#endif - - // Remove fetcher under key from requests_in_flight_. - void Remove(KeyType key); 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 eac3cbdb5091..081a1691cb22 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,6 +1,6 @@ ---- src/3rdparty/chromium/components/supervised_user/core/browser/supervised_user_service.cc.orig 2023-10-11 18:22:24 UTC +--- 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 -@@ -206,7 +206,7 @@ FirstTimeInterstitialBannerState SupervisedUserService +@@ -164,7 +164,7 @@ FirstTimeInterstitialBannerState SupervisedUserService const FirstTimeInterstitialBannerState original_state) { FirstTimeInterstitialBannerState target_state = original_state; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ 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 new file mode 100644 index 000000000000..551d9d381553 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_supervised__user_core_common_features.cc @@ -0,0 +1,56 @@ +--- 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 +@@ -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 + 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 + + // 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_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", + 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) || 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 new file mode 100644 index 000000000000..fa546fc35858 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_supervised__user_core_common_features.h @@ -0,0 +1,11 @@ +--- 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 +@@ -24,7 +24,7 @@ BASE_DECLARE_FEATURE(kEnableManagedByParentUi); + extern const base::FeatureParam kManagedByParentUiMoreInfoUrl; + BASE_DECLARE_FEATURE(kClearingCookiesKeepsSupervisedUsersSignedIn); + +-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + BASE_DECLARE_FEATURE(kEnableExtensionsPermissionsForSupervisedUsersOnDesktop); + #endif + diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_url__formatter_spoof__checks_idn__spoof__checker.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_url__formatter_spoof__checks_idn__spoof__checker.cc index ffe19ad21e15..38fecff980f1 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_url__formatter_spoof__checks_idn__spoof__checker.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_url__formatter_spoof__checks_idn__spoof__checker.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/components/url_formatter/spoof_checks/idn_spoof_checker.cc.orig 2023-09-13 12:11:42 UTC +--- src/3rdparty/chromium/components/url_formatter/spoof_checks/idn_spoof_checker.cc.orig 2024-02-23 21:04:38 UTC +++ src/3rdparty/chromium/components/url_formatter/spoof_checks/idn_spoof_checker.cc -@@ -293,7 +293,7 @@ IDNSpoofChecker::IDNSpoofChecker() { +@@ -294,7 +294,7 @@ IDNSpoofChecker::IDNSpoofChecker() { // The ideal fix would be to change the omnibox font used for Thai. In // that case, the Linux-only list should be revisited and potentially // removed. diff --git a/www/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 bb21c601c3c9..67c3cd176ebe 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 2023-09-13 12:11:42 UTC +--- 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 -@@ -991,7 +991,7 @@ gfx::Rect HelpBubbleView::GetAnchorRect() const { +@@ -1009,7 +1009,7 @@ gfx::Rect HelpBubbleView::GetAnchorRect() const { void HelpBubbleView::OnBeforeBubbleWidgetInit(views::Widget::InitParams* params, views::Widget* widget) const { BubbleDialogDelegateView::OnBeforeBubbleWidgetInit(params, widget); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_variations_service_google__groups__updater__service.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_variations_service_google__groups__updater__service.cc deleted file mode 100644 index 3086aa685276..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_variations_service_google__groups__updater__service.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/components/variations/service/google_groups_updater_service.cc.orig 2023-09-13 12:11:42 UTC -+++ src/3rdparty/chromium/components/variations/service/google_groups_updater_service.cc -@@ -15,7 +15,7 @@ - // information from per-profile data to local-state. - BASE_FEATURE(kVariationsGoogleGroupFiltering, - "VariationsGoogleGroupFiltering", --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - base::FEATURE_ENABLED_BY_DEFAULT - #else - // TODO(b/286365351): launch on Android, iOS and ChromeOS. diff --git a/www/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 7b28e911fd3e..3b52feef7e0e 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 2023-05-31 08:12:17 UTC +--- 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 -@@ -95,7 +95,7 @@ std::string GetPlatformString() { +@@ -98,7 +98,7 @@ std::string GetPlatformString() { return "android"; #elif BUILDFLAG(IS_FUCHSIA) return "fuchsia"; 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 7dca4b47e567..8b61620d5556 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,11 +1,11 @@ ---- src/3rdparty/chromium/components/viz/host/host_display_client.cc.orig 2023-03-09 06:31:50 UTC +--- 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 -@@ -67,7 +67,7 @@ void HostDisplayClient::AddChildWindowToBrowser( +@@ -64,7 +64,7 @@ void HostDisplayClient::AddChildWindowToBrowser( + } + #endif - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(IS_OZONE_X11) void HostDisplayClient::DidCompleteSwapWithNewSize(const gfx::Size& size) { NOTIMPLEMENTED(); } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_viz_host_host__display__client.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_viz_host_host__display__client.h index 74fb0259fae8..7d241a2ba122 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_viz_host_host__display__client.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_viz_host_host__display__client.h @@ -1,11 +1,11 @@ ---- src/3rdparty/chromium/components/viz/host/host_display_client.h.orig 2023-01-11 09:17:16 UTC +--- src/3rdparty/chromium/components/viz/host/host_display_client.h.orig 2024-01-30 07:53:34 UTC +++ src/3rdparty/chromium/components/viz/host/host_display_client.h -@@ -54,7 +54,7 @@ class VIZ_HOST_EXPORT HostDisplayClient : public mojom +@@ -52,7 +52,7 @@ class VIZ_HOST_EXPORT HostDisplayClient : public mojom + void AddChildWindowToBrowser(gpu::SurfaceHandle child_window) override; + #endif - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(IS_OZONE_X11) void DidCompleteSwapWithNewSize(const gfx::Size& size) override; - #endif + #endif // BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11) 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 fc18626498c3..2bad4b621fad 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,11 +1,11 @@ ---- src/3rdparty/chromium/components/viz/service/display_embedder/skia_output_surface_impl.cc.orig 2023-10-11 18:22:24 UTC +--- 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 -@@ -1485,7 +1485,7 @@ GrBackendFormat SkiaOutputSurfaceImpl::GetGrBackendFor - ->GetDeviceQueue() - ->GetVulkanPhysicalDevice(), - VK_IMAGE_TILING_OPTIMAL, ycbcr_info); --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +@@ -1549,7 +1549,7 @@ GrBackendFormat SkiaOutputSurfaceImpl::GetGrBackendFor + ->GetDeviceQueue() + ->GetVulkanPhysicalDevice(), + VK_IMAGE_TILING_OPTIMAL, vk_format, yuv_color_space, ycbcr_info); +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Textures that were allocated _on linux_ with ycbcr info came from // VaapiVideoDecoder, which exports using DRM format modifiers. return GrBackendFormats::MakeVk(gr_ycbcr_info, diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_viz_service_display__embedder_skia__output__surface__impl__on__gpu.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_viz_service_display__embedder_skia__output__surface__impl__on__gpu.cc deleted file mode 100644 index edde402f0b2b..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_viz_service_display__embedder_skia__output__surface__impl__on__gpu.cc +++ /dev/null @@ -1,16 +0,0 @@ ---- src/3rdparty/chromium/components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.cc.orig 2023-12-12 22:08:45 UTC -+++ src/3rdparty/chromium/components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.cc -@@ -1521,7 +1521,12 @@ void SkiaOutputSurfaceImplOnGpu::CopyOutputNV12( - - // Issue readbacks from the surfaces: - for (size_t i = 0; i < CopyOutputResult::kNV12MaxPlanes; ++i) { -- SkISize size{plane_surfaces[i]->width(), plane_surfaces[i]->height()}; -+#if defined(__clang__) && (__clang_major__ >= 16) -+ SkISize size(plane_surfaces[i]->width(), plane_surfaces[i]->height()); -+#else -+ SkISize s = { plane_surfaces[i]->width(), plane_surfaces[i]->height() }; -+ SkISize size(s); -+#endif - SkImageInfo dst_info = SkImageInfo::Make( - size, (i == 0) ? kAlpha_8_SkColorType : kR8G8_unorm_SkColorType, - kUnpremul_SkAlphaType); diff --git a/www/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 6bfb70ab849c..ce6d02f474a6 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,6 +1,6 @@ ---- src/3rdparty/chromium/components/viz/service/display_embedder/software_output_surface.cc.orig 2023-02-08 09:03:45 UTC +--- 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 -@@ -98,7 +98,7 @@ void SoftwareOutputSurface::SwapBuffersCallback(base:: +@@ -124,7 +124,7 @@ void SoftwareOutputSurface::SwapBuffersCallback(base:: now.SnappedToNextTick(refresh_timebase_, refresh_interval_) - now; // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ if (needs_swap_size_notifications_) client_->DidSwapWithSize(pixel_size); #endif -@@ -125,7 +125,7 @@ gfx::OverlayTransform SoftwareOutputSurface::GetDispla +@@ -153,7 +153,7 @@ gfx::OverlayTransform SoftwareOutputSurface::GetDispla // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/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 4ab14b893dc9..4a4f87be7964 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,4 +1,4 @@ ---- src/3rdparty/chromium/components/viz/service/display_embedder/software_output_surface.h.orig 2022-07-22 17:30:31 UTC +--- 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 @@ -47,7 +47,7 @@ class VIZ_SERVICE_EXPORT SoftwareOutputSurface : publi gfx::OverlayTransform GetDisplayTransform() override; @@ -9,7 +9,7 @@ void SetNeedsSwapSizeNotifications( bool needs_swap_size_notifications) override; #endif -@@ -69,7 +69,7 @@ class VIZ_SERVICE_EXPORT SoftwareOutputSurface : publi +@@ -70,7 +70,7 @@ class VIZ_SERVICE_EXPORT SoftwareOutputSurface : publi // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/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 a82120f17057..80fb716075d4 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 2023-10-11 18:22:24 UTC +--- 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 -@@ -1218,7 +1218,7 @@ void SkiaRenderer::ClearFramebuffer() { +@@ -1346,7 +1346,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 d56254e6b6a5..d45d99f69e61 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,20 +1,20 @@ ---- src/3rdparty/chromium/components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig 2023-10-11 18:22:24 UTC +--- 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 -@@ -110,7 +110,7 @@ RootCompositorFrameSinkImpl::Create( +@@ -109,7 +109,7 @@ RootCompositorFrameSinkImpl::Create( + output_surface->SetNeedsSwapSizeNotifications( + params->send_swap_size_notifications); - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(IS_OZONE_X11) // For X11, we need notify client about swap completion after resizing, so the // client can use it for synchronize with X11 WM. output_surface->SetNeedsSwapSizeNotifications(true); -@@ -709,7 +709,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw +@@ -713,7 +713,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw + #if BUILDFLAG(IS_ANDROID) + if (display_client_ && enable_swap_competion_callback_) display_client_->DidCompleteSwapWithSize(pixel_size); - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#elif BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11) ++#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(IS_OZONE_X11) if (display_client_ && pixel_size != last_swap_pixel_size_) { last_swap_pixel_size_ = pixel_size; display_client_->DidCompleteSwapWithNewSize(last_swap_pixel_size_); diff --git a/www/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 c33ac3839d6f..a07a3632f4bb 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,11 +1,11 @@ ---- src/3rdparty/chromium/components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h.orig 2023-10-11 18:22:24 UTC +--- 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 -@@ -211,7 +211,7 @@ class VIZ_SERVICE_EXPORT RootCompositorFrameSinkImpl +@@ -210,7 +210,7 @@ class VIZ_SERVICE_EXPORT RootCompositorFrameSinkImpl + // to actually unref. + LocalSurfaceId to_evict_on_next_draw_and_swap_ = LocalSurfaceId(); - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(IS_OZONE_X11) gfx::Size last_swap_pixel_size_; - #endif + #endif // BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11) diff --git a/www/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 e3db4f3c8780..134ac0181f04 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,6 +1,6 @@ ---- src/3rdparty/chromium/content/app/content_main.cc.orig 2023-12-12 22:08:45 UTC +--- src/3rdparty/chromium/content/app/content_main.cc.orig 2024-07-03 01:14:49 UTC +++ src/3rdparty/chromium/content/app/content_main.cc -@@ -207,7 +207,7 @@ RunContentProcess(ContentMainParams params, +@@ -209,7 +209,7 @@ RunContentProcess(ContentMainParams params, base::EnableTerminationOnOutOfMemory(); #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 242f9043efcc..e7edbde5dbb5 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 2023-12-12 22:08:45 UTC +--- 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 -@@ -142,13 +142,13 @@ +@@ -143,13 +143,13 @@ #include "content/browser/posix_file_descriptor_info_impl.h" #include "content/public/common/content_descriptors.h" @@ -16,7 +16,7 @@ #include "base/files/file_path_watcher_inotify.h" #include "base/native_library.h" #include "base/rand_util.h" -@@ -183,12 +183,16 @@ +@@ -184,12 +184,16 @@ #include "content/public/common/zygote/zygote_handle.h" #include "content/zygote/zygote_main.h" #include "media/base/media_switches.h" @@ -34,7 +34,7 @@ #if BUILDFLAG(IS_ANDROID) #include "base/system/sys_info.h" #include "content/browser/android/battery_metrics.h" -@@ -378,7 +382,7 @@ void InitializeZygoteSandboxForBrowserProcess( +@@ -379,7 +383,7 @@ void InitializeZygoteSandboxForBrowserProcess( } #endif // BUILDFLAG(USE_ZYGOTE) @@ -43,7 +43,7 @@ #if BUILDFLAG(ENABLE_PPAPI) // Loads the (native) libraries but does not initialize them (i.e., does not -@@ -416,7 +420,10 @@ void PreSandboxInit() { +@@ -417,7 +421,10 @@ void PreSandboxInit() { void PreSandboxInit() { // Ensure the /dev/urandom is opened. @@ -54,7 +54,7 @@ // May use sysinfo(), sched_getaffinity(), and open various /sys/ and /proc/ // files. -@@ -427,9 +434,16 @@ void PreSandboxInit() { +@@ -429,9 +436,16 @@ void PreSandboxInit() { // https://boringssl.googlesource.com/boringssl/+/HEAD/SANDBOXING.md CRYPTO_pre_sandbox_init(); @@ -71,7 +71,7 @@ #if BUILDFLAG(ENABLE_PPAPI) // Ensure access to the Pepper plugins before the sandbox is turned on. -@@ -838,11 +852,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam +@@ -842,11 +856,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam kFieldTrialDescriptor + base::GlobalDescriptors::kBaseDescriptor); #endif // !BUILDFLAG(IS_ANDROID) @@ -85,7 +85,7 @@ #endif // !BUILDFLAG(IS_WIN) -@@ -1039,8 +1052,20 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam +@@ -1041,8 +1054,20 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam process_type == switches::kZygoteProcess) { PreSandboxInit(); } @@ -106,7 +106,7 @@ delegate_->SandboxInitialized(process_type); #if BUILDFLAG(USE_ZYGOTE) -@@ -1108,7 +1133,7 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { +@@ -1110,7 +1135,7 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { ->ReconfigureAfterFeatureListInit(process_type); } @@ -115,7 +115,7 @@ // 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 -@@ -1143,6 +1168,11 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { +@@ -1145,6 +1170,11 @@ int NO_STACK_PROTECTOR 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 5c5ca02fd01c..caaa1dd6bd64 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,4 +1,4 @@ ---- src/3rdparty/chromium/content/browser/BUILD.gn.orig 2023-12-12 22:08:45 UTC +--- src/3rdparty/chromium/content/browser/BUILD.gn.orig 2024-10-02 15:40:01 UTC +++ src/3rdparty/chromium/content/browser/BUILD.gn @@ -2463,6 +2463,13 @@ jumbo_source_set("browser") { deps += [ "//media/mojo/mojom/stable:stable_video_decoder" ] 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 59bfb4d8fa95..b69ef3d01c9c 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 2023-04-05 11:05:06 UTC +--- 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 -@@ -33,7 +33,7 @@ +@@ -34,7 +34,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) -@@ -225,7 +225,7 @@ audio::mojom::AudioService& GetAudioService() { +@@ -202,7 +202,7 @@ audio::mojom::AudioService& GetAudioService() { ->PostTaskAndReplyWithResult( FROM_HERE, base::BindOnce(&ScanEdidBitstreams), base::BindOnce(&LaunchAudioService, std::move(receiver))); diff --git a/www/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 4519ecdbfe58..5b96b1ad8d74 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,6 +1,6 @@ ---- src/3rdparty/chromium/content/browser/browser_child_process_host_impl.cc.orig 2023-07-16 15:47:57 UTC +--- 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 -@@ -321,6 +321,7 @@ void BrowserChildProcessHostImpl::LaunchWithoutExtraCo +@@ -326,6 +326,7 @@ void BrowserChildProcessHostImpl::LaunchWithoutExtraCo switches::kDisableBestEffortTasks, switches::kDisableLogging, switches::kEnableLogging, @@ -8,3 +8,12 @@ switches::kIPCConnectionTimeout, switches::kLogBestEffortTasks, switches::kLogFile, +@@ -635,7 +636,7 @@ void BrowserChildProcessHostImpl::OnProcessLaunched() + ->child_process()); + #endif + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + child_thread_type_switcher_.SetPid(process.Pid()); + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) + diff --git a/www/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 new file mode 100644 index 000000000000..b0d805d00c30 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_browser__child__process__host__impl.h @@ -0,0 +1,20 @@ +--- 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 +@@ -34,7 +34,7 @@ + #include "base/win/object_watcher.h" + #endif + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #include "content/browser/child_thread_type_switcher_linux.h" + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) + +@@ -264,7 +264,7 @@ class BrowserChildProcessHostImpl + std::unique_ptr system_tracing_service_; + #endif + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + ChildThreadTypeSwitcher child_thread_type_switcher_; + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) + diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_browser__child__process__host__impl__receiver__bindings.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_browser__child__process__host__impl__receiver__bindings.cc new file mode 100644 index 000000000000..f498f42ec4b2 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_browser__child__process__host__impl__receiver__bindings.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/content/browser/browser_child_process_host_impl_receiver_bindings.cc.orig 2023-12-10 06:10:27 UTC ++++ src/3rdparty/chromium/content/browser/browser_child_process_host_impl_receiver_bindings.cc +@@ -62,7 +62,7 @@ void BrowserChildProcessHostImpl::BindHostReceiver( + } + } + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + if (auto r = receiver.As()) { + child_thread_type_switcher_.Bind(std::move(r)); + return; 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 3cba864debd2..ab952ea504c2 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 2023-12-12 22:08:45 UTC +--- 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 -@@ -251,6 +251,12 @@ +@@ -254,6 +254,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 -@@ -544,6 +550,12 @@ int BrowserMainLoop::EarlyInitialization() { +@@ -559,6 +565,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,8 +26,8 @@ #endif // GLib's spawning of new processes is buggy, so it's important that at this -@@ -581,7 +593,7 @@ int BrowserMainLoop::EarlyInitialization() { - base::PlatformThread::SetCurrentThreadType(base::ThreadType::kCompositing); +@@ -599,7 +611,7 @@ int BrowserMainLoop::EarlyInitialization() { + features::kBrowserUseCompositingThreadPriority)); #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ - BUILDFLAG(IS_ANDROID) 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 new file mode 100644 index 000000000000..154c10ac196c --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_child__process__launcher__helper.h @@ -0,0 +1,11 @@ +--- 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 +@@ -269,7 +269,7 @@ class ChildProcessLauncherHelper + std::unique_ptr delegate_; + base::WeakPtr child_process_launcher_; + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + // The priority of the process. The state is stored to avoid changing the + // setting repeatedly. + std::optional priority_; 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 7fee1010940d..8d9472406893 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,4 +1,4 @@ ---- src/3rdparty/chromium/content/browser/child_process_launcher_helper_linux.cc.orig 2023-12-12 22:08:45 UTC +--- 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 @@ -21,8 +21,12 @@ #include "content/public/common/result_codes.h" @@ -112,7 +112,7 @@ } void ChildProcessLauncherHelper::SetProcessPriorityOnLauncherThread( -@@ -178,11 +200,13 @@ void ChildProcessLauncherHelper::SetProcessPriorityOnL +@@ -179,11 +201,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 new file mode 100644 index 000000000000..60b7cc05cf16 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_child__thread__type__switcher__linux.cc @@ -0,0 +1,20 @@ +--- 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 +@@ -20,6 +20,9 @@ void SetThreadTypeOnLauncherThread(base::ProcessId pee + base::ThreadType thread_type) { + DCHECK(CurrentlyOnProcessLauncherTaskRunner()); + ++#if BUILDFLAG(IS_BSD) ++ NOTIMPLEMENTED(); ++#else + bool ns_pid_supported = false; + pid_t peer_tid = base::FindThreadID(peer_pid, ns_tid, &ns_pid_supported); + if (peer_tid == -1) { +@@ -37,6 +40,7 @@ void SetThreadTypeOnLauncherThread(base::ProcessId pee + + base::PlatformThread::SetThreadType(peer_pid, peer_tid, thread_type, + base::IsViaIPC(true)); ++#endif + } + + } // namespace diff --git a/www/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 82013d2983c7..d00cf1f5a125 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,11 +1,11 @@ ---- src/3rdparty/chromium/content/browser/compositor/viz_process_transport_factory.cc.orig 2023-10-11 18:22:24 UTC +--- 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 -@@ -108,7 +108,7 @@ class HostDisplayClient : public viz::HostDisplayClien +@@ -118,7 +118,7 @@ class HostDisplayClient : public viz::HostDisplayClien + HostDisplayClient& operator=(const HostDisplayClient&) = delete; + // viz::HostDisplayClient: - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(IS_OZONE_X11) void DidCompleteSwapWithNewSize(const gfx::Size& size) override { compositor_->OnCompleteSwapWithNewSize(size); } diff --git a/www/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 new file mode 100644 index 000000000000..3b5faa382b59 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_devtools_devtools__frontend__host__impl.cc @@ -0,0 +1,38 @@ +--- 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 +@@ -22,7 +22,7 @@ + #include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h" + #include "ui/base/webui/resource_path.h" + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #include "components/crash/content/browser/error_reporting/javascript_error_report.h" // nogncheck + #include "components/crash/content/browser/error_reporting/js_error_report_processor.h" // nogncheck + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +@@ -37,7 +37,7 @@ const char kCompatibilityScriptSourceURL[] = + "\n//# " + "sourceURL=devtools://devtools/bundled/devtools_compatibility.js"; + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + // Remove the pieces of the URL we don't want to send back with the error + // reports. In particular, do not send query or fragments as those can have + // privacy-sensitive information in them. +@@ -107,7 +107,7 @@ DevToolsFrontendHostImpl::DevToolsFrontendHostImpl( + const HandleMessageCallback& handle_message_callback) + : web_contents_(WebContents::FromRenderFrameHost(frame_host)), + handle_message_callback_(handle_message_callback) { +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + Observe(web_contents_); + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) + mojo::AssociatedRemote frontend; +@@ -132,7 +132,7 @@ void DevToolsFrontendHostImpl::DispatchEmbedderMessage + handle_message_callback_.Run(std::move(message)); + } + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + void DevToolsFrontendHostImpl::OnDidAddMessageToConsole( + RenderFrameHost* source_frame, + blink::mojom::ConsoleMessageLevel log_level, diff --git a/www/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 new file mode 100644 index 000000000000..6b525d08a736 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_devtools_devtools__frontend__host__impl.h @@ -0,0 +1,11 @@ +--- 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 +@@ -33,7 +33,7 @@ class DevToolsFrontendHostImpl : public DevToolsFronte + + void BadMessageReceived() override; + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + void OnDidAddMessageToConsole( + RenderFrameHost* source_frame, + blink::mojom::ConsoleMessageLevel log_level, diff --git a/www/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 95bcf928750a..4642d7ee3dca 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,6 +1,6 @@ ---- src/3rdparty/chromium/content/browser/file_system_access/file_system_access_local_path_watcher.cc.orig 2023-10-11 18:22:24 UTC +--- 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 -@@ -56,7 +56,7 @@ void FileSystemAccessLocalPathWatcher::Initialize( +@@ -63,7 +63,7 @@ void FileSystemAccessLocalPathWatcher::Initialize( base::FilePathWatcher::WatchOptions watch_options { .type = scope().IsRecursive() ? base::FilePathWatcher::Type::kRecursive : base::FilePathWatcher::Type::kNonRecursive, diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_font__access_font__enumeration__data__source.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_font__access_font__enumeration__data__source.cc index f14b624decaf..24b4ead48f74 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_font__access_font__enumeration__data__source.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_font__access_font__enumeration__data__source.cc @@ -1,8 +1,8 @@ ---- src/3rdparty/chromium/content/browser/font_access/font_enumeration_data_source.cc.orig 2022-05-19 14:06:27 UTC +--- src/3rdparty/chromium/content/browser/font_access/font_enumeration_data_source.cc.orig 2023-11-03 10:09:45 UTC +++ src/3rdparty/chromium/content/browser/font_access/font_enumeration_data_source.cc @@ -16,7 +16,7 @@ #include "content/browser/font_access/font_enumeration_data_source_win.h" - #elif BUILDFLAG(IS_MAC) + #elif BUILDFLAG(IS_APPLE) #include "content/browser/font_access/font_enumeration_data_source_mac.h" -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) @@ -11,7 +11,7 @@ @@ -61,7 +61,7 @@ std::unique_ptr FontEnumera return std::make_unique(); - #elif BUILDFLAG(IS_MAC) + #elif BUILDFLAG(IS_APPLE) return std::make_unique(); -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) @@ -20,7 +20,7 @@ return std::make_unique(); @@ -76,7 +76,7 @@ bool FontEnumerationDataSource::IsOsSupported() { return true; - #elif BUILDFLAG(IS_MAC) + #elif BUILDFLAG(IS_APPLE) return true; -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) diff --git a/www/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 aea5c4af3bbd..4e0e0b759cb0 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 2023-01-11 09:17:16 UTC +--- 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 -@@ -148,7 +148,7 @@ const GpuFeatureData GetGpuFeatureData( - {"video_decode", - SafeGetFeatureStatus(gpu_feature_info, - gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE), +@@ -149,7 +149,7 @@ const GpuFeatureData GetGpuFeatureData( + {"video_decode", + SafeGetFeatureStatus(gpu_feature_info, + gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE), -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - !base::FeatureList::IsEnabled(media::kVaapiVideoDecodeLinux) || + !base::FeatureList::IsEnabled(media::kVaapiVideoDecodeLinux) || #endif // BUILDFLAG(IS_LINUX) - command_line.HasSwitch(switches::kDisableAcceleratedVideoDecode), -@@ -159,7 +159,7 @@ const GpuFeatureData GetGpuFeatureData( - {"video_encode", - SafeGetFeatureStatus(gpu_feature_info, - gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_ENCODE), + command_line.HasSwitch(switches::kDisableAcceleratedVideoDecode), +@@ -160,7 +160,7 @@ const GpuFeatureData GetGpuFeatureData( + {"video_encode", + SafeGetFeatureStatus(gpu_feature_info, + gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_ENCODE), -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - !base::FeatureList::IsEnabled(media::kVaapiVideoEncodeLinux), + !base::FeatureList::IsEnabled(media::kVaapiVideoEncodeLinux), #else - command_line.HasSwitch(switches::kDisableAcceleratedVideoEncode), + command_line.HasSwitch(switches::kDisableAcceleratedVideoEncode), diff --git a/www/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 1af2cff7314f..a75987ad1bb5 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 2023-12-12 22:08:45 UTC +--- 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 -@@ -1787,7 +1787,7 @@ void GpuDataManagerImplPrivate::RecordCompositingMode( +@@ -1790,7 +1790,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__memory__buffer__manager__singleton.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_gpu_gpu__memory__buffer__manager__singleton.cc index fb3c0191ec87..161dd5425ec2 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 2023-04-28 17:01:32 UTC +--- 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 -@@ -53,7 +53,7 @@ scoped_refptr GetTaskRun +@@ -54,7 +54,7 @@ scoped_refptr GetTaskRun #endif } @@ -9,10 +9,10 @@ bool IsGpuMemoryBufferNV12Supported() { static bool is_computed = false; static bool supported = false; -@@ -116,7 +116,7 @@ void GpuMemoryBufferManagerSingleton::OnGpuExtraInfoUp +@@ -117,7 +117,7 @@ void GpuMemoryBufferManagerSingleton::OnGpuExtraInfoUp SetNativeConfigurations(std::move(configs)); } - #endif + #endif // BUILDFLAG(IS_OZONE_X11) -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Dynamic check whether the NV12 format is supported as it may be diff --git a/www/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 930a6df857d5..aa9cc2965b15 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 2023-12-12 22:08:45 UTC +--- 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 -@@ -256,6 +256,7 @@ static const char* const kSwitchNames[] = { - switches::kEnableBackgroundThreadPool, +@@ -258,6 +258,7 @@ static const char* const kSwitchNames[] = { switches::kEnableGpuRasterization, + switches::kEnableSkiaGraphite, switches::kEnableLogging, + switches::kDisableUnveil, switches::kDoubleBufferCompositing, switches::kHeadless, switches::kLoggingLevel, -@@ -289,7 +290,7 @@ static const char* const kSwitchNames[] = { +@@ -292,7 +293,7 @@ static const char* const kSwitchNames[] = { + switches::kDisableExplicitDmaFences, switches::kOzoneDumpFile, - switches::kDisableBufferBWCompression, #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) diff --git a/www/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 ab773b105b71..85a2910e5e31 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 2023-08-17 07:33:31 UTC +--- 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 -@@ -234,7 +234,7 @@ void MediaKeysListenerManagerImpl::StartListeningForMe - // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is - // complete. +@@ -300,7 +300,7 @@ void MediaKeysListenerManagerImpl::StartListeningForMe + } + #if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ - BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) + BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - system_media_controls_ = system_media_controls::SystemMediaControls::Create( - media::AudioManager::GetGlobalAppName()); - #endif + // Create SystemMediaControls with the SingletonHwnd. + browser_system_media_controls_ = + system_media_controls::SystemMediaControls::Create( diff --git a/www/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 7b48f931d99a..70ba01d3b945 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 2023-09-13 12:11:42 UTC +--- 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 -@@ -82,7 +82,7 @@ +@@ -81,7 +81,7 @@ #include "content/browser/network/network_service_process_tracker_win.h" #endif @@ -9,8 +9,8 @@ #include "content/browser/system_dns_resolution/system_dns_resolver.h" #include "services/network/public/mojom/system_dns_resolution.mojom-forward.h" #endif -@@ -421,7 +421,7 @@ void CreateInProcessNetworkService( - #endif +@@ -360,7 +360,7 @@ void CreateInProcessNetworkService( + std::move(receiver))); } -#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) @@ -18,7 +18,7 @@ // Runs a self-owned SystemDnsResolverMojoImpl. This is meant to run on a // high-priority thread pool. void RunSystemDnsResolverOnThreadPool( -@@ -488,7 +488,7 @@ network::mojom::NetworkServiceParamsPtr CreateNetworkS +@@ -429,7 +429,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 bc9b7da1b672..3b46313aa590 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 2023-09-13 12:11:42 UTC +--- 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 -@@ -312,7 +312,7 @@ void DelegatedFrameHost::EmbedSurface( +@@ -317,7 +317,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 fd80eb76142b..52fb401e6d41 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,6 +1,6 @@ ---- src/3rdparty/chromium/content/browser/renderer_host/media/service_video_capture_device_launcher.cc.orig 2023-09-13 12:11:42 UTC +--- 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 -@@ -24,7 +24,7 @@ +@@ -25,7 +25,7 @@ #include "media/base/media_switches.h" #endif @@ -9,7 +9,7 @@ #include "content/browser/gpu/gpu_data_manager_impl.h" #endif -@@ -166,7 +166,7 @@ void ServiceVideoCaptureDeviceLauncher::LaunchDeviceAs +@@ -172,7 +172,7 @@ void ServiceVideoCaptureDeviceLauncher::LaunchDeviceAs } #else if (switches::IsVideoCaptureUseGpuMemoryBufferEnabled()) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_pepper_pepper__file__io__host.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_pepper_pepper__file__io__host.cc index 4a338656e54c..11598708457a 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_pepper_pepper__file__io__host.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_pepper_pepper__file__io__host.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/browser/renderer_host/pepper/pepper_file_io_host.cc.orig 2022-05-19 14:06:27 UTC +--- src/3rdparty/chromium/content/browser/renderer_host/pepper/pepper_file_io_host.cc.orig 2024-01-30 07:53:34 UTC +++ src/3rdparty/chromium/content/browser/renderer_host/pepper/pepper_file_io_host.cc -@@ -455,7 +455,7 @@ void PepperFileIOHost::OnLocalFileOpened( +@@ -462,7 +462,7 @@ void PepperFileIOHost::OnLocalFileOpened( ppapi::host::ReplyMessageContext reply_context, const base::FilePath& path, base::File::Error error_code) { @@ -9,7 +9,7 @@ // Quarantining a file before its contents are available is only supported on // Windows and Linux. if (!FileOpenForWrite(open_flags_) || error_code != base::File::FILE_OK) { -@@ -489,7 +489,7 @@ void PepperFileIOHost::OnLocalFileOpened( +@@ -496,7 +496,7 @@ void PepperFileIOHost::OnLocalFileOpened( #endif } 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 c4ce8d2eff8f..b1fb4afd0702 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 2023-12-12 22:08:45 UTC +--- 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 -@@ -218,7 +218,7 @@ +@@ -222,7 +222,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 -@@ -955,7 +955,7 @@ size_t GetPlatformProcessLimit() { +@@ -970,7 +970,7 @@ size_t GetPlatformProcessLimit() { // to indicate failure and std::numeric_limits::max() to indicate // unlimited. size_t GetPlatformProcessLimit() { @@ -18,7 +18,16 @@ struct rlimit limit; if (getrlimit(RLIMIT_NPROC, &limit) != 0) return kUnknownPlatformProcessLimit; -@@ -1098,7 +1098,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public +@@ -1158,7 +1158,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public + IOThreadHostImpl& operator=(const IOThreadHostImpl& other) = delete; + + void SetPid(base::ProcessId child_pid) { +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + child_thread_type_switcher_.SetPid(child_pid); + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) + } +@@ -1175,7 +1175,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public return; } @@ -27,7 +36,7 @@ if (auto font_receiver = receiver.As()) { ConnectToFontService(std::move(font_receiver)); return; -@@ -1187,7 +1187,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public +@@ -1269,7 +1269,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public std::unique_ptr binders_; mojo::Receiver receiver_{this}; @@ -35,8 +44,8 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) mojo::Remote video_encode_accelerator_factory_remote_; - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -3287,7 +3287,7 @@ void RenderProcessHostImpl::AppendRendererCommandLine( + ChildThreadTypeSwitcher child_thread_type_switcher_; +@@ -3403,7 +3403,7 @@ void RenderProcessHostImpl::AppendRendererCommandLine( base::TimeTicks::UnixEpoch().since_origin().InMicroseconds())); } @@ -45,7 +54,7 @@ // Append `kDisableVideoCaptureUseGpuMemoryBuffer` flag if there is no support // for NV12 GPU memory buffer. if (switches::IsVideoCaptureUseGpuMemoryBufferEnabled() && -@@ -3347,6 +3347,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin +@@ -3463,6 +3463,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin switches::kDisableSpeechAPI, switches::kDisableThreadedCompositing, switches::kDisableTouchDragDrop, 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 9f56dc81fc8f..ae7400ba5a25 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,6 @@ ---- src/3rdparty/chromium/content/browser/renderer_host/render_process_host_impl.h.orig 2023-12-12 22:08:45 UTC +--- 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 -@@ -545,7 +545,7 @@ class CONTENT_EXPORT RenderProcessHostImpl +@@ -548,7 +548,7 @@ class CONTENT_EXPORT RenderProcessHostImpl // Sets this RenderProcessHost to be guest only. For Testing only. void SetForGuestsOnlyForTesting(); diff --git a/www/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 7d964a964f7e..46ae754dc74f 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 2023-10-11 18:22:24 UTC +--- 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 -@@ -273,7 +273,7 @@ void RenderViewHostImpl::GetPlatformSpecificPrefs( +@@ -270,7 +270,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 ae80ad304554..df40785beaa8 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,6 +1,6 @@ ---- src/3rdparty/chromium/content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2023-10-11 18:22:24 UTC +--- 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 -@@ -121,7 +121,7 @@ +@@ -120,7 +120,7 @@ #include "ui/gfx/gdi_util.h" #endif @@ -8,8 +8,8 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "content/browser/accessibility/browser_accessibility_auralinux.h" #include "ui/base/ime/linux/text_edit_command_auralinux.h" - #include "ui/linux/linux_ui.h" -@@ -461,7 +461,7 @@ gfx::NativeViewAccessible RenderWidgetHostViewAura::Ge + #include "ui/base/ime/text_input_flags.h" +@@ -458,7 +458,7 @@ gfx::NativeViewAccessible RenderWidgetHostViewAura::Ge return ToBrowserAccessibilityWin(manager->GetBrowserAccessibilityRoot()) ->GetCOM(); @@ -18,7 +18,7 @@ BrowserAccessibilityManager* manager = host()->GetOrCreateRootBrowserAccessibilityManager(); if (manager && manager->GetBrowserAccessibilityRoot()) -@@ -1720,7 +1720,7 @@ bool RenderWidgetHostViewAura::ShouldDoLearning() { +@@ -1696,7 +1696,7 @@ bool RenderWidgetHostViewAura::ShouldDoLearning() { return GetTextInputManager() && GetTextInputManager()->should_do_learning(); } @@ -27,7 +27,7 @@ bool RenderWidgetHostViewAura::SetCompositionFromExistingText( const gfx::Range& range, const std::vector& ui_ime_text_spans) { -@@ -2565,7 +2565,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { +@@ -2540,7 +2540,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { } bool RenderWidgetHostViewAura::NeedsMouseCapture() { @@ -36,7 +36,7 @@ return NeedsInputGrab(); #else return false; -@@ -2748,7 +2748,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit +@@ -2723,7 +2723,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 0322e463770c..ea2b5e006dba 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 2023-10-11 18:22:24 UTC +--- 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 -@@ -257,7 +257,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura +@@ -256,7 +256,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 22b15cee0a8c..b6ce175463e4 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,6 +1,6 @@ ---- src/3rdparty/chromium/content/browser/renderer_host/render_widget_host_view_event_handler.cc.orig 2023-07-16 15:47:57 UTC +--- 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 -@@ -597,7 +597,7 @@ bool RenderWidgetHostViewEventHandler::CanRendererHand +@@ -599,7 +599,7 @@ bool RenderWidgetHostViewEventHandler::CanRendererHand if (event->type() == ui::ET_MOUSE_EXITED) { if (mouse_locked || selection_popup) return false; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_service__worker_service__worker__context__wrapper.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_service__worker_service__worker__context__wrapper.cc deleted file mode 100644 index 477a7524b89c..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_service__worker_service__worker__context__wrapper.cc +++ /dev/null @@ -1,15 +0,0 @@ ---- src/3rdparty/chromium/content/browser/service_worker/service_worker_context_wrapper.cc.orig 2023-10-11 18:22:24 UTC -+++ src/3rdparty/chromium/content/browser/service_worker/service_worker_context_wrapper.cc -@@ -1409,7 +1409,12 @@ void ServiceWorkerContextWrapper::MaybeProcessPendingW - return; - } - -+#if defined(__clang__) && (__clang_major__ >= 16) - auto [document_url, key, callback] = std::move(*request); -+#else -+ auto [d_u, key, callback] = std::move(*request); -+ auto document_url = d_u; -+#endif - - DCHECK(document_url.is_valid()); - TRACE_EVENT1("ServiceWorker", diff --git a/www/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 82c2bac9c1b1..cfc0e6027657 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 2023-12-12 22:08:45 UTC +--- 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 -@@ -59,7 +59,7 @@ +@@ -61,7 +61,7 @@ #include "content/browser/v8_snapshot_files.h" #endif @@ -9,16 +9,16 @@ #include "base/files/file_util.h" #include "base/files/scoped_file.h" #include "base/pickle.h" -@@ -69,7 +69,7 @@ - #include "media/capture/capture_switches.h" +@@ -75,7 +75,7 @@ + #include "services/network/public/mojom/network_service.mojom.h" #endif --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) #include "base/task/sequenced_task_runner.h" #include "components/viz/host/gpu_client.h" #include "media/capture/capture_switches.h" -@@ -80,7 +80,7 @@ namespace { +@@ -86,7 +86,7 @@ namespace { namespace { @@ -27,16 +27,16 @@ base::ScopedFD PassNetworkContextParentDirs( std::vector network_context_parent_dirs) { base::Pickle pickle; -@@ -129,7 +129,7 @@ UtilityProcessHost::UtilityProcessHost(std::unique_ptr +@@ -150,7 +150,7 @@ UtilityProcessHost::UtilityProcessHost(std::unique_ptr started_(false), name_(u"utility process"), file_data_(std::make_unique()), --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) gpu_client_(nullptr, base::OnTaskRunnerDeleter(nullptr)), #endif client_(std::move(client)) { -@@ -421,7 +421,7 @@ bool UtilityProcessHost::StartProcess() { +@@ -435,7 +435,7 @@ bool UtilityProcessHost::StartProcess() { file_data_->files_to_preload.merge(GetV8SnapshotFilesToPreload()); #endif // BUILDFLAG(IS_POSIX) @@ -45,12 +45,19 @@ // The network service should have access to the parent directories // necessary for its usage. if (sandbox_type_ == sandbox::mojom::Sandbox::kNetwork) { -@@ -432,7 +432,7 @@ bool UtilityProcessHost::StartProcess() { +@@ -446,13 +446,13 @@ bool UtilityProcessHost::StartProcess() { } #endif // BUILDFLAG(IS_LINUX) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) + // Pass `kVideoCaptureUseGpuMemoryBuffer` flag to video capture service only + // when the video capture use GPU memory buffer enabled. + if (metrics_name_ == video_capture::mojom::VideoCaptureService::Name_) { + bool pass_gpu_buffer_flag = + switches::IsVideoCaptureUseGpuMemoryBufferEnabled(); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // Pass `kVideoCaptureUseGpuMemoryBuffer` flag to video capture service only - // when the video capture use GPU memory buffer enabled and NV12 GPU memory - // buffer supported. + // Check if NV12 GPU memory buffer supported at the same time. + pass_gpu_buffer_flag = + pass_gpu_buffer_flag && diff --git a/www/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 aea00e23d172..6cee8294e730 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,11 +1,11 @@ ---- src/3rdparty/chromium/content/browser/utility_process_host.h.orig 2023-09-13 12:11:42 UTC +--- 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 @@ -39,7 +39,7 @@ namespace base { class Thread; } // namespace base --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) namespace viz { class GpuClient; } // namespace viz @@ -13,8 +13,8 @@ std::vector pending_run_service_callbacks_; #endif --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) 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 d35523053a30..4b4d61fd429e 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 2023-09-13 12:11:42 UTC +--- 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 @@ -10,12 +10,12 @@ #include "content/public/browser/content_browser_client.h" @@ -10,8 +10,8 @@ #include "content/browser/font_service.h" // nogncheck #endif --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) #include "components/viz/host/gpu_client.h" #include "content/public/browser/gpu_client.h" #endif @@ -26,8 +26,8 @@ return; } #endif --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) if (auto gpu_receiver = receiver.As()) { gpu_client_ = content::CreateGpuClient(std::move(gpu_receiver), base::DoNothing()); 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 7ce84ddd1fc5..0d5c522ea731 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,11 +1,7 @@ ---- src/3rdparty/chromium/content/browser/utility_sandbox_delegate.cc.orig 2023-07-16 15:47:57 UTC +--- 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 -@@ -63,13 +63,13 @@ UtilitySandboxedProcessLauncherDelegate:: - #if BUILDFLAG(ENABLE_PPAPI) - sandbox_type_ == sandbox::mojom::Sandbox::kPpapi || - #endif --#if BUILDFLAG(IS_FUCHSIA) -+#if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) +@@ -67,10 +67,10 @@ UtilitySandboxedProcessLauncherDelegate:: + #if BUILDFLAG(IS_FUCHSIA) sandbox_type_ == sandbox::mojom::Sandbox::kVideoCapture || #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) @@ -17,10 +13,10 @@ sandbox_type_ == sandbox::mojom::Sandbox::kHardwareVideoEncoding || #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -124,10 +124,10 @@ ZygoteCommunication* UtilitySandboxedProcessLauncherDe - // unsandboxed zygote and then apply their actual sandboxes in the forked +@@ -126,10 +126,10 @@ ZygoteCommunication* UtilitySandboxedProcessLauncherDe // process upon startup. if (sandbox_type_ == sandbox::mojom::Sandbox::kNetwork || + sandbox_type_ == sandbox::mojom::Sandbox::kOnDeviceModelExecution || -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) sandbox_type_ == sandbox::mojom::Sandbox::kHardwareVideoDecoding || diff --git a/www/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 7fa4e49ef2cf..fb4b85f5b555 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,6 +1,6 @@ ---- src/3rdparty/chromium/content/browser/web_contents/web_contents_view_aura.cc.orig 2023-10-11 18:22:24 UTC +--- 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 -@@ -178,7 +178,7 @@ class WebDragSourceAura : public content::WebContentsO +@@ -174,7 +174,7 @@ class WebDragSourceAura : public content::WebContentsO raw_ptr window_; }; @@ -9,7 +9,7 @@ // Fill out the OSExchangeData with a file contents, synthesizing a name if // necessary. void PrepareDragForFileContents(const DropData& drop_data, -@@ -261,7 +261,7 @@ void PrepareDragData(const DropData& drop_data, +@@ -258,7 +258,7 @@ void PrepareDragData(const DropData& drop_data, if (!drop_data.download_metadata.empty()) PrepareDragForDownload(drop_data, provider, web_contents); #endif @@ -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. -@@ -1340,7 +1340,7 @@ void WebContentsViewAura::OnMouseEvent(ui::MouseEvent* +@@ -1319,7 +1319,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_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 dde0143d78ed..c51cfc29de2a 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 2023-12-12 22:08:45 UTC +--- 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 -@@ -20,13 +20,19 @@ +@@ -19,13 +19,19 @@ #include "build/chromeos_buildflags.h" #include "content/common/zygote/zygote_commands_linux.h" #include "content/common/zygote/zygote_communication_linux.h" @@ -20,7 +20,7 @@ #include "sandbox/policy/switches.h" #if BUILDFLAG(IS_CHROMEOS) -@@ -39,6 +45,7 @@ namespace { +@@ -38,6 +44,7 @@ namespace { namespace { @@ -28,7 +28,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, -@@ -60,6 +67,7 @@ bool ReceiveFixedMessage(int fd, +@@ -59,6 +66,7 @@ bool ReceiveFixedMessage(int fd, return false; return true; } @@ -36,7 +36,7 @@ } // namespace -@@ -69,9 +77,13 @@ ZygoteHostImpl::ZygoteHostImpl() +@@ -68,9 +76,13 @@ ZygoteHostImpl::ZygoteHostImpl() } ZygoteHostImpl::ZygoteHostImpl() @@ -50,7 +50,7 @@ sandbox_binary_(), zygote_pids_lock_(), zygote_pids_() {} -@@ -84,6 +96,7 @@ void ZygoteHostImpl::Init(const base::CommandLine& com +@@ -83,6 +95,7 @@ void ZygoteHostImpl::Init(const base::CommandLine& com } void ZygoteHostImpl::Init(const base::CommandLine& command_line) { @@ -58,7 +58,7 @@ if (command_line.HasSwitch(sandbox::policy::switches::kNoSandbox)) { return; } -@@ -134,6 +147,7 @@ void ZygoteHostImpl::Init(const base::CommandLine& com +@@ -133,6 +146,7 @@ void ZygoteHostImpl::Init(const base::CommandLine& com "you can try using --" << sandbox::policy::switches::kNoSandbox << "."; } @@ -66,15 +66,15 @@ } void ZygoteHostImpl::AddZygotePid(pid_t pid) { -@@ -158,6 +172,7 @@ pid_t ZygoteHostImpl::LaunchZygote( +@@ -157,6 +171,7 @@ pid_t ZygoteHostImpl::LaunchZygote( base::CommandLine* cmd_line, base::ScopedFD* control_fd, base::FileHandleMappingVector additional_remapped_fds) { +#if !BUILDFLAG(IS_BSD) int fds[2]; - #if !defined(TOOLKIT_QT) - CHECK_EQ(0, socketpair(AF_UNIX, SOCK_SEQPACKET, 0, fds)); -@@ -232,9 +247,12 @@ pid_t ZygoteHostImpl::LaunchZygote( + 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( 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 new file mode 100644 index 000000000000..026613279ecf --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_child_BUILD.gn @@ -0,0 +1,16 @@ +--- src/3rdparty/chromium/content/child/BUILD.gn.orig 2024-07-03 01:14:49 UTC ++++ src/3rdparty/chromium/content/child/BUILD.gn +@@ -132,6 +132,13 @@ target(link_target_type, "child") { + ] + } + ++ if (is_bsd) { ++ sources -= [ ++ "sandboxed_process_thread_type_handler.cc", ++ "sandboxed_process_thread_type_handler.h", ++ ] ++ } ++ + if (is_win) { + sources += [ + "dwrite_font_proxy/dwrite_font_proxy_init_impl_win.cc", diff --git a/www/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 5e6ce6e52391..f5d86c6d8539 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,11 @@ ---- src/3rdparty/chromium/content/child/child_process.cc.orig 2023-09-13 12:11:42 UTC +--- src/3rdparty/chromium/content/child/child_process.cc.orig 2023-11-03 10:09:45 UTC +++ src/3rdparty/chromium/content/child/child_process.cc -@@ -70,7 +70,7 @@ ChildProcess::ChildProcess(base::ThreadType io_thread_ +@@ -66,7 +66,7 @@ ChildProcess::ChildProcess(base::ThreadType io_thread_ + thread_pool_init_params) + : resetter_(&child_process, this, nullptr), io_thread_(std::make_unique()) { - const base::CommandLine& command_line = - *base::CommandLine::ForCurrentProcess(); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + const base::CommandLine& command_line = + *base::CommandLine::ForCurrentProcess(); const bool is_embedded_in_browser_process = - !command_line.HasSwitch(switches::kProcessType); - if (IsMojoCoreSharedLibraryEnabled() && !is_embedded_in_browser_process) { diff --git a/www/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 2c3e5ed10695..091c299a7cba 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,6 +1,40 @@ ---- src/3rdparty/chromium/content/common/BUILD.gn.orig 2023-12-12 22:08:45 UTC +--- src/3rdparty/chromium/content/common/BUILD.gn.orig 2024-07-03 01:14:49 UTC +++ src/3rdparty/chromium/content/common/BUILD.gn -@@ -452,6 +452,9 @@ if (is_linux || is_chromeos) { +@@ -452,19 +452,28 @@ jumbo_source_set("common") { + } + + if (is_linux || is_chromeos) { +- sources += [ +- "gpu_pre_sandbox_hook_linux.cc", +- "gpu_pre_sandbox_hook_linux.h", +- ] ++ if (is_bsd) { ++ sources += [ ++ "gpu_pre_sandbox_hook_bsd.cc", ++ "gpu_pre_sandbox_hook_bsd.h", ++ ] ++ } else { ++ sources += [ ++ "gpu_pre_sandbox_hook_linux.cc", ++ "gpu_pre_sandbox_hook_linux.h", ++ ] ++ } + public_deps += [ "//sandbox/policy" ] + deps += [ + ":sandbox_support_linux", + ":set_process_title_linux", + "//media/gpu:buildflags", + "//sandbox/linux:sandbox_services", +- "//sandbox/linux:seccomp_bpf", + "//sandbox/policy:chromecast_sandbox_allowlist_buildflags", + ] ++ if (use_seccomp_bpf) { ++ deps += [ "//sandbox/linux:seccomp_bpf" ] ++ } + 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" ] @@ -10,12 +44,3 @@ } } -@@ -498,7 +501,7 @@ mojom("mojo_bindings") { - if (enable_ipc_logging) { - enabled_features += [ "ipc_logging" ] - } -- if (is_linux || is_chromeos) { -+ if (!is_bsd && (is_linux || is_chromeos)) { - enabled_features += [ "supports_thread_types" ] - } - if (use_clang_profiling_inside_sandbox) { 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 new file mode 100644 index 000000000000..5cd3571a7619 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_common_features.cc @@ -0,0 +1,20 @@ +--- src/3rdparty/chromium/content/common/features.cc.orig 2024-07-03 01:14:49 UTC ++++ src/3rdparty/chromium/content/common/features.cc +@@ -170,7 +170,7 @@ BASE_FEATURE(kEnableBackForwardCacheForOngoingSubframe + base::FEATURE_DISABLED_BY_DEFAULT); + + // Enables error reporting for JS errors inside DevTools frontend host +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + BASE_FEATURE(kEnableDevToolsJsErrorReporting, + "EnableDevToolsJsErrorReporting", + base::FEATURE_DISABLED_BY_DEFAULT); +@@ -258,7 +258,7 @@ BASE_FEATURE(kGroupNIKByJoiningOrigin, + // process and having browser process handle adjusting thread properties (nice + // value, c-group, latency sensitivity...) for children which have sandbox + // restrictions. +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + BASE_FEATURE(kHandleChildThreadTypeChangesInBrowser, + "HandleChildThreadTypeChangesInBrowser", + base::FEATURE_ENABLED_BY_DEFAULT); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_common_features.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_common_features.h new file mode 100644 index 000000000000..8bd4d4b94a6d --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_common_features.h @@ -0,0 +1,20 @@ +--- src/3rdparty/chromium/content/common/features.h.orig 2024-02-23 21:04:38 UTC ++++ src/3rdparty/chromium/content/common/features.h +@@ -37,7 +37,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kDocumentPolicyNeg + CONTENT_EXPORT BASE_DECLARE_FEATURE(kEnableBackForwardCacheForScreenReader); + CONTENT_EXPORT BASE_DECLARE_FEATURE( + kEnableBackForwardCacheForOngoingSubframeNavigation); +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + CONTENT_EXPORT BASE_DECLARE_FEATURE(kEnableDevToolsJsErrorReporting); + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) + CONTENT_EXPORT BASE_DECLARE_FEATURE(kEnsureAllowBindingsIsAlwaysForWebUI); +@@ -58,7 +58,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kForwardMemoryPres + CONTENT_EXPORT BASE_DECLARE_FEATURE(kGpuInfoCollectionSeparatePrefetch); + #endif + CONTENT_EXPORT BASE_DECLARE_FEATURE(kGroupNIKByJoiningOrigin); +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + CONTENT_EXPORT BASE_DECLARE_FEATURE(kHandleChildThreadTypeChangesInBrowser); + #endif + CONTENT_EXPORT BASE_DECLARE_FEATURE(kHighPriorityBeforeUnload); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_gpu_gpu__sandbox__hook__bsd.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_common_gpu__pre__sandbox__hook__bsd.cc similarity index 84% rename from www/qt6-webengine/files/patch-src_3rdparty_chromium_content_gpu_gpu__sandbox__hook__bsd.cc rename to www/qt6-webengine/files/patch-src_3rdparty_chromium_content_common_gpu__pre__sandbox__hook__bsd.cc index 0ec98f987d6d..5bee1822c4f4 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_gpu_gpu__sandbox__hook__bsd.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_common_gpu__pre__sandbox__hook__bsd.cc @@ -1,11 +1,11 @@ ---- src/3rdparty/chromium/content/gpu/gpu_sandbox_hook_bsd.cc.orig 2023-04-28 17:01:32 UTC -+++ src/3rdparty/chromium/content/gpu/gpu_sandbox_hook_bsd.cc +--- 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 @@ -0,0 +1,69 @@ +// Copyright 2023 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + -+#include "content/gpu/gpu_sandbox_hook_bsd.h" ++#include "content/common/gpu_pre_sandbox_hook_bsd.h" + +#include +#include @@ -59,7 +59,7 @@ + +} // namespace + -+bool GpuProcessPreSandboxHook(sandbox::policy::SandboxLinux::Options options) { ++bool GpuPreSandboxHook(sandbox::policy::SandboxLinux::Options options) { + if (!LoadLibrariesForGpu(options)) + return false; + diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_common_gpu__pre__sandbox__hook__bsd.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_common_gpu__pre__sandbox__hook__bsd.h new file mode 100644 index 000000000000..5d4b594fc14d --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_common_gpu__pre__sandbox__hook__bsd.h @@ -0,0 +1,23 @@ +--- src/3rdparty/chromium/content/common/gpu_pre_sandbox_hook_bsd.h.orig 2024-01-30 07:53:34 UTC ++++ src/3rdparty/chromium/content/common/gpu_pre_sandbox_hook_bsd.h +@@ -0,0 +1,20 @@ ++// Copyright 2017 The Chromium Authors ++// Use of this source code is governed by a BSD-style license that can be ++// found in the LICENSE file. ++ ++#ifndef CONTENT_COMMON_GPU_PRE_SANDBOX_HOOK_BSD_H_ ++#define CONTENT_COMMON_GPU_PRE_SANDBOX_HOOK_BSD_H_ ++ ++#include "base/component_export.h" ++#include "sandbox/policy/sandbox.h" ++ ++namespace content { ++ ++// A pre-sandbox hook to use on Linux-based systems in sandboxed processes that ++// require general GPU usage. ++COMPONENT_EXPORT(GPU_PRE_SANDBOX_HOOK) ++bool GpuPreSandboxHook(sandbox::policy::SandboxLinux::Options options); ++ ++} // namespace content ++ ++#endif // CONTENT_COMMON_GPU_PRE_SANDBOX_HOOK_BSD_H_ diff --git a/www/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 index 87c9e5153a70..047b67de482d 100644 --- 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 @@ -1,9 +1,9 @@ ---- src/3rdparty/chromium/content/common/mojo_core_library_support.cc.orig 2022-02-28 16:54:41 UTC +--- 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() { } - absl::optional GetMojoCoreSharedLibraryPath() { + 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 = diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_gpu_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_gpu_BUILD.gn deleted file mode 100644 index c28dadfad11f..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_gpu_BUILD.gn +++ /dev/null @@ -1,20 +0,0 @@ ---- src/3rdparty/chromium/content/gpu/BUILD.gn.orig 2023-12-12 22:08:45 UTC -+++ src/3rdparty/chromium/content/gpu/BUILD.gn -@@ -107,6 +107,17 @@ target(link_target_type, "gpu_sources") { - } - } - -+ if (is_bsd) { -+ sources -= [ -+ "gpu_sandbox_hook_linux.cc", -+ "gpu_sandbox_hook_linux.h", -+ ] -+ sources += [ -+ "gpu_sandbox_hook_bsd.cc", -+ "gpu_sandbox_hook_bsd.h", -+ ] -+ } -+ - if (is_chromeos_ash) { - deps += [ - "//components/services/font/public/cpp", diff --git a/www/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 new file mode 100644 index 000000000000..30000bfd0d00 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_gpu_gpu__child__thread.cc @@ -0,0 +1,21 @@ +--- 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 +@@ -59,7 +59,7 @@ + #include "third_party/skia/include/ports/SkFontConfigInterface.h" + #endif + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #include "content/child/sandboxed_process_thread_type_handler.h" + #endif + +@@ -148,7 +148,8 @@ void GpuChildThread::Init(const base::TimeTicks& proce + + viz_main_.gpu_service()->set_start_time(process_start_time); + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++// XXX BSD ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && !BUILDFLAG(IS_BSD) + SandboxedProcessThreadTypeHandler::NotifyMainChildThreadCreated(); + #endif + diff --git a/www/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 e0b2facb3e42..447cc5b0e7df 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,19 +1,15 @@ ---- src/3rdparty/chromium/content/gpu/gpu_main.cc.orig 2023-12-12 22:08:45 UTC +--- src/3rdparty/chromium/content/gpu/gpu_main.cc.orig 2024-01-30 07:53:34 UTC +++ src/3rdparty/chromium/content/gpu/gpu_main.cc -@@ -96,6 +96,12 @@ - #include "sandbox/policy/sandbox_type.h" +@@ -91,7 +91,7 @@ + #include "sandbox/win/src/sandbox.h" #endif -+#if BUILDFLAG(IS_BSD) -+#include "content/gpu/gpu_sandbox_hook_bsd.h" -+#include "sandbox/policy/sandbox.h" -+#include "sandbox/policy/sandbox_type.h" -+#endif -+ - #if BUILDFLAG(IS_MAC) - #include "base/message_loop/message_pump_apple.h" - #include "components/metal_util/device_removal.h" -@@ -112,7 +118,7 @@ namespace { +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #include "content/child/sandboxed_process_thread_type_handler.h" + #include "content/common/gpu_pre_sandbox_hook_linux.h" + #include "sandbox/policy/linux/sandbox_linux.h" +@@ -114,7 +114,7 @@ namespace content { namespace { @@ -22,7 +18,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread*, const gpu::GPUInfo*, const gpu::GpuPreferences&); -@@ -177,7 +183,7 @@ class ContentSandboxHelper : public gpu::GpuSandboxHel +@@ -179,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 { @@ -31,7 +27,7 @@ return StartSandboxLinux(watchdog_thread, gpu_info, gpu_prefs); #elif BUILDFLAG(IS_WIN) return StartSandboxWindows(sandbox_info_); -@@ -287,7 +293,7 @@ int GpuMain(MainFunctionParams parameters) { +@@ -291,7 +291,7 @@ int GpuMain(MainFunctionParams parameters) { std::make_unique( gpu_preferences.message_pump_type); } @@ -40,7 +36,17 @@ #error "Unsupported Linux platform." #elif BUILDFLAG(IS_MAC) // Cross-process CoreAnimation requires a CFRunLoop to function at all, and -@@ -422,7 +428,7 @@ namespace { +@@ -330,7 +330,8 @@ int GpuMain(MainFunctionParams parameters) { + // before it. + InitializeSkia(); + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++// XXX BSD ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && !BUILDFLAG(IS_BSD) + // Thread type delegate of the process should be registered before + // first thread type change in ChildProcess constructor. + // It also needs to be registered before the process has multiple threads, +@@ -438,7 +439,7 @@ int GpuMain(MainFunctionParams parameters) { namespace { @@ -49,7 +55,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdog_thread, const gpu::GPUInfo* gpu_info, const gpu::GpuPreferences& gpu_prefs) { -@@ -462,7 +468,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo +@@ -478,7 +479,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_gpu_gpu__sandbox__hook__bsd.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_gpu_gpu__sandbox__hook__bsd.h deleted file mode 100644 index 128ed7a19949..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_gpu_gpu__sandbox__hook__bsd.h +++ /dev/null @@ -1,19 +0,0 @@ ---- src/3rdparty/chromium/content/gpu/gpu_sandbox_hook_bsd.h.orig 2023-04-28 17:01:32 UTC -+++ src/3rdparty/chromium/content/gpu/gpu_sandbox_hook_bsd.h -@@ -0,0 +1,16 @@ -+// Copyright 2023 The Chromium Authors -+// Use of this source code is governed by a BSD-style license that can be -+// found in the LICENSE file. -+ -+#ifndef CONTENT_GPU_GPU_SANDBOX_HOOK_BSD_H_ -+#define CONTENT_GPU_GPU_SANDBOX_HOOK_BSD_H_ -+ -+#include "sandbox/policy/sandbox.h" -+ -+namespace content { -+ -+bool GpuProcessPreSandboxHook(sandbox::policy::SandboxLinux::Options options); -+ -+} // namespace content -+ -+#endif // CONTENT_GPU_GPU_SANDBOX_HOOK_BSD_H_ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_ppapi__plugin_ppapi__blink__platform__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_ppapi__plugin_ppapi__blink__platform__impl.cc index f863f26662e2..7fe748f32093 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_ppapi__plugin_ppapi__blink__platform__impl.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_ppapi__plugin_ppapi__blink__platform__impl.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/ppapi_plugin/ppapi_blink_platform_impl.cc.orig 2023-05-31 08:12:17 UTC +--- src/3rdparty/chromium/content/ppapi_plugin/ppapi_blink_platform_impl.cc.orig 2024-02-23 21:04:38 UTC +++ src/3rdparty/chromium/content/ppapi_plugin/ppapi_blink_platform_impl.cc -@@ -20,7 +20,7 @@ +@@ -21,7 +21,7 @@ #if BUILDFLAG(IS_MAC) #include "content/child/child_process_sandbox_support_impl_mac.h" @@ -9,7 +9,7 @@ #include "content/child/child_process_sandbox_support_impl_linux.h" #include "mojo/public/cpp/bindings/pending_remote.h" #endif -@@ -35,7 +35,7 @@ typedef struct CGFont* CGFontRef; +@@ -36,7 +36,7 @@ typedef struct CGFont* CGFontRef; namespace content { PpapiBlinkPlatformImpl::PpapiBlinkPlatformImpl() { @@ -18,7 +18,7 @@ mojo::PendingRemote font_service; ChildThread::Get()->BindHostReceiver( font_service.InitWithNewPipeAndPassReceiver()); -@@ -54,7 +54,7 @@ PpapiBlinkPlatformImpl::~PpapiBlinkPlatformImpl() { +@@ -55,7 +55,7 @@ PpapiBlinkPlatformImpl::~PpapiBlinkPlatformImpl() { void PpapiBlinkPlatformImpl::Shutdown() {} blink::WebSandboxSupport* PpapiBlinkPlatformImpl::GetSandboxSupport() { diff --git a/www/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 f5eb17471071..9f9b934ef753 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 2023-05-31 08:12:17 UTC +--- 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 -@@ -33,7 +33,7 @@ class PpapiBlinkPlatformImpl : public BlinkPlatformImp +@@ -34,7 +34,7 @@ class PpapiBlinkPlatformImpl : public BlinkPlatformImp blink::WebString DefaultLocale() override; private: diff --git a/www/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 new file mode 100644 index 000000000000..7b6db7bcd2d6 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_browser_content__browser__client.cc @@ -0,0 +1,11 @@ +--- 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 +@@ -1273,7 +1273,7 @@ bool ContentBrowserClient::ShouldRunOutOfProcessSystem + // that can be adequately sandboxed. + // Currently Android's network service will not run out of process or sandboxed, + // so OutOfProcessSystemDnsResolution is not currently enabled on Android. +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + return true; + #else + return false; diff --git a/www/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 3084de3ef633..179010bd0158 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,42 @@ ---- src/3rdparty/chromium/content/public/common/content_features.cc.orig 2023-12-12 22:08:45 UTC +--- 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 -@@ -53,7 +53,7 @@ CONSTINIT const base::Feature kAudioServiceOutOfProces - "AudioServiceOutOfProcess", - // TODO(crbug.com/1052397): Remove !IS_CHROMEOS_LACROS once lacros starts being - // built with OS_CHROMEOS instead of OS_LINUX. +@@ -36,7 +36,7 @@ BASE_FEATURE(kAudioServiceLaunchOnStartup, + base::FEATURE_DISABLED_BY_DEFAULT); + + // 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)) - base::FEATURE_ENABLED_BY_DEFAULT - #else -@@ -65,7 +65,7 @@ CONSTINIT const base::Feature kAudioServiceSandbox( + 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. - CONSTINIT const base::Feature kAudioServiceSandbox( - "AudioServiceSandbox", -#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_ENABLED_BY_DEFAULT - #else - base::FEATURE_DISABLED_BY_DEFAULT -@@ -553,7 +553,7 @@ BASE_FEATURE(kGreaseUACH, "GreaseUACH", base::FEATURE_ - // (activated by kUserAgentClientHint) - BASE_FEATURE(kGreaseUACH, "GreaseUACH", base::FEATURE_ENABLED_BY_DEFAULT); + 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, --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - // Supports proxying thread type changes of renderer processes to browser - // process and having browser process handle adjusting thread properties (nice - // value, c-group, latency sensitivity...) for renderers which have sandbox -@@ -1463,7 +1463,7 @@ CONSTINIT const base::Feature kWebAssemblyTrapHandler( - CONSTINIT const base::Feature kWebAssemblyTrapHandler( - "WebAssemblyTrapHandler", + // 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)) - base::FEATURE_ENABLED_BY_DEFAULT -@@ -1515,7 +1515,11 @@ BASE_FEATURE(kWebUICodeCache, + BASE_FEATURE(kWebAssemblyTrapHandler, +@@ -1265,7 +1265,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__features.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__features.h deleted file mode 100644 index d7ee045c1029..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__features.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/content/public/common/content_features.h.orig 2023-10-11 18:22:24 UTC -+++ src/3rdparty/chromium/content/public/common/content_features.h -@@ -120,7 +120,7 @@ CONTENT_EXPORT extern const base::FeatureParam - kFledgeLimitNumAuctionsParam; - CONTENT_EXPORT BASE_DECLARE_FEATURE(kFractionalScrollOffsets); - CONTENT_EXPORT BASE_DECLARE_FEATURE(kGreaseUACH); --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - CONTENT_EXPORT BASE_DECLARE_FEATURE(kHandleRendererThreadTypeChangesInBrowser); - #endif - CONTENT_EXPORT BASE_DECLARE_FEATURE(kIdleDetection); diff --git a/www/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 99948ec551ee..5e4c4312c806 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 2023-12-12 22:08:45 UTC +--- 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 -@@ -367,6 +367,8 @@ const char kEnableLogging[] = "enable- +@@ -366,6 +366,8 @@ const char kEnableLogging[] = "enable- // builds. const char kEnableLogging[] = "enable-logging"; @@ -9,7 +9,7 @@ // 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. -@@ -994,7 +996,7 @@ const char kEnableAutomation[] = "enable-automation"; +@@ -1011,7 +1013,7 @@ const char kPreventResizingContentsForTesting[] = // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/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 ce4c47018ec3..1b8ab4dadbb9 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 2023-12-12 22:08:45 UTC +--- 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 -@@ -116,6 +116,7 @@ CONTENT_EXPORT extern const char kEnableLogging[]; +@@ -115,6 +115,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,7 +8,7 @@ CONTENT_EXPORT extern const char kEnableNetworkInformationDownlinkMax[]; CONTENT_EXPORT extern const char kEnableCanvas2DLayers[]; CONTENT_EXPORT extern const char kEnablePluginPlaceholderTesting[]; -@@ -267,7 +268,7 @@ CONTENT_EXPORT extern const char kRendererWaitForJavaD +@@ -271,7 +272,7 @@ CONTENT_EXPORT extern const char kPreventResizingConte // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_renderer_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_renderer_BUILD.gn deleted file mode 100644 index bf4e7b20e0a2..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_renderer_BUILD.gn +++ /dev/null @@ -1,16 +0,0 @@ ---- src/3rdparty/chromium/content/renderer/BUILD.gn.orig 2023-12-12 22:08:45 UTC -+++ src/3rdparty/chromium/content/renderer/BUILD.gn -@@ -202,6 +202,13 @@ target(link_target_type, "renderer") { - ] - } - -+ if (is_bsd) { -+ sources -= [ -+ "renderer_thread_type_handler.cc", -+ "renderer_thread_type_handler.h", -+ ] -+ } -+ - if (is_mac) { - sources += [ - "renderer_main_platform_delegate_mac.mm", diff --git a/www/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 index af37d4bcacc1..674cfd027ee7 100644 --- 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 @@ -1,20 +1,11 @@ ---- src/3rdparty/chromium/content/renderer/render_process_impl.cc.orig 2023-08-17 07:33:31 UTC +--- 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 -@@ -45,7 +45,7 @@ - #if BUILDFLAG(IS_WIN) - #include "base/win/win_util.h" - #endif --#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(ARCH_CPU_X86_64) -+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_X86_64) - #include "v8/include/v8-wasm-trap-handler-posix.h" - #endif +@@ -44,7 +44,7 @@ + #include "third_party/blink/public/web/web_frame.h" + #include "v8/include/v8-initialization.h" -@@ -211,7 +211,7 @@ RenderProcessImpl::RenderProcessImpl() - v8::V8::SetFlagsFromString(kSABPerContextFlag, sizeof(kSABPerContextFlag)); - } - --#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(ARCH_CPU_X86_64) -+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_X86_64) - if (base::FeatureList::IsEnabled(features::kWebAssemblyTrapHandler)) { - base::CommandLine* const command_line = - base::CommandLine::ForCurrentProcess(); +-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \ ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && \ + (defined(ARCH_CPU_X86_64) || defined(ARCH_CPU_ARM64)) + #define ENABLE_WEB_ASSEMBLY_TRAP_HANDLER_LINUX + #endif diff --git a/www/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 26b8b530e9d3..b961f6b4570c 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 2023-10-11 18:22:24 UTC +--- 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 -@@ -204,6 +204,8 @@ +@@ -203,6 +203,8 @@ #if BUILDFLAG(IS_APPLE) #include @@ -9,7 +9,7 @@ #else #include #endif -@@ -1054,7 +1056,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: +@@ -942,7 +944,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) && -@@ -1063,7 +1065,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: +@@ -951,7 +953,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) && -@@ -1835,7 +1837,7 @@ std::unique_ptr RenderThreadImpl::Create +@@ -1740,7 +1742,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 060686c4c243..0ff7a3fa123e 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,4 +1,4 @@ ---- src/3rdparty/chromium/content/renderer/renderer_blink_platform_impl.cc.orig 2023-10-11 18:22:24 UTC +--- 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 @@ -114,7 +114,7 @@ @@ -7,12 +7,12 @@ -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "content/child/child_process_sandbox_support_impl_linux.h" + #include "content/child/sandboxed_process_thread_type_handler.h" #endif - -@@ -182,13 +182,13 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( - sudden_termination_disables_(0), +@@ -184,13 +184,13 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( is_locked_to_site_(false), - main_thread_scheduler_(main_thread_scheduler) { + main_thread_scheduler_(main_thread_scheduler), + next_frame_sink_id_(uint32_t{std::numeric_limits::max()} + 1) { -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) sk_sp font_loader; @@ -25,7 +25,7 @@ mojo::PendingRemote font_service; RenderThreadImpl::current()->BindHostReceiver( font_service.InitWithNewPipeAndPassReceiver()); -@@ -197,7 +197,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( +@@ -199,7 +199,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( #endif } @@ -34,7 +34,7 @@ if (sandboxEnabled()) { #if BUILDFLAG(IS_MAC) sandbox_support_ = std::make_unique(); -@@ -255,7 +255,7 @@ void RendererBlinkPlatformImpl::SetThreadType(base::Pl +@@ -260,7 +260,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 dcb3e128fd14..154110905aa4 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 2023-12-12 22:08:45 UTC +--- 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 -@@ -238,7 +238,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi +@@ -250,7 +250,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 f359dfb9b3cf..3f2a8bc02264 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 2023-12-12 22:08:45 UTC +--- src/3rdparty/chromium/content/shell/BUILD.gn.orig 2024-07-03 01:14:49 UTC +++ src/3rdparty/chromium/content/shell/BUILD.gn -@@ -1029,7 +1029,7 @@ group("content_shell_crash_test") { +@@ -1032,7 +1032,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 e486515dc0f5..bf0318d77a64 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-04-28 17:01:32 UTC +--- 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 -@@ -223,7 +223,7 @@ void ShellMainDelegate::PreSandboxStartup() { +@@ -227,7 +227,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_test_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_test_BUILD.gn index 3ab8bdf4ba9f..88f3ed244f04 100644 --- 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 @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/test/BUILD.gn.orig 2023-12-12 22:08:45 UTC +--- src/3rdparty/chromium/content/test/BUILD.gn.orig 2024-07-03 01:14:49 UTC +++ src/3rdparty/chromium/content/test/BUILD.gn -@@ -2235,7 +2235,7 @@ static_library("run_all_unittests") { +@@ -2271,7 +2271,7 @@ static_library("run_all_unittests") { ":test_support", "//base/test:test_support", ] @@ -9,7 +9,7 @@ deps += [ "//content/common:set_process_title_linux" ] } } -@@ -3304,7 +3304,7 @@ test("content_unittests") { +@@ -3375,7 +3375,7 @@ test("content_unittests") { deps += [ "//third_party/boringssl" ] } 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 b9c83c39cd00..e15995225e85 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 2023-09-13 12:11:42 UTC +--- src/3rdparty/chromium/content/utility/services.cc.orig 2024-07-03 01:14:49 UTC +++ src/3rdparty/chromium/content/utility/services.cc -@@ -64,7 +64,7 @@ +@@ -69,7 +69,7 @@ extern sandbox::TargetServices* g_utility_target_servi extern sandbox::TargetServices* g_utility_target_services; #endif // BUILDFLAG(IS_WIN) @@ -9,25 +9,25 @@ #include "media/mojo/services/mojo_video_encode_accelerator_provider_factory.h" #include "sandbox/linux/services/libc_interceptor.h" #include "sandbox/policy/mojom/sandbox.mojom.h" -@@ -87,7 +87,7 @@ extern sandbox::TargetServices* g_utility_target_servi +@@ -92,7 +92,7 @@ extern sandbox::TargetServices* g_utility_target_servi #endif // BUILDFLAG(IS_CHROMEOS_ASH) && (BUILDFLAG(USE_VAAPI) || // BUILDFLAG(USE_V4L2_CODEC)) -#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) && \ +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)) && \ (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) + #include "content/common/features.h" #include "media/mojo/services/stable_video_decoder_factory_process_service.h" // nogncheck - #endif // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) && @@ -109,7 +109,7 @@ extern sandbox::TargetServices* g_utility_target_servi #include "ui/accessibility/accessibility_features.h" #endif // BUILDFLAG(ENABLE_ACCESSIBILITY_SERVICE) --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) #include "media/capture/capture_switches.h" #include "services/viz/public/cpp/gpu/gpu.h" - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) -@@ -226,7 +226,7 @@ auto RunAudio(mojo::PendingReceiver receiver) { auto service = std::make_unique( std::move(receiver), base::SingleThreadTaskRunner::GetCurrentDefault()); --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - if (switches::IsVideoCaptureUseGpuMemoryBufferEnabled()) { - mojo::PendingRemote remote_gpu; - content::UtilityThread::Get()->BindHostReceiver( -@@ -340,7 +340,7 @@ auto RunOOPArcVideoAcceleratorFactoryService( +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(IS_CHROMEOS_ASH) + { + #else +@@ -356,7 +356,7 @@ auto RunOOPArcVideoAcceleratorFactoryService( #endif // BUILDFLAG(IS_CHROMEOS_ASH) && (BUILDFLAG(USE_VAAPI) || // BUILDFLAG(USE_V4L2_CODEC)) @@ -54,7 +54,7 @@ (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) auto RunStableVideoDecoderFactoryProcessService( mojo::PendingReceiver< -@@ -351,7 +351,7 @@ auto RunStableVideoDecoderFactoryProcessService( +@@ -367,7 +367,7 @@ auto RunStableVideoDecoderFactoryProcessService( #endif // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) && // (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) @@ -63,14 +63,25 @@ auto RunVideoEncodeAcceleratorProviderFactory( mojo::PendingReceiver receiver) { -@@ -415,13 +415,13 @@ void RegisterMainThreadServices(mojo::ServiceFactory& +@@ -390,7 +390,7 @@ void RegisterIOThreadServices(mojo::ServiceFactory& se + // loop of type IO that can get notified when pipes have data. + services.Add(RunNetworkService); + +-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) && \ ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)) && \ + (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) + if (base::FeatureList::IsEnabled( + features::kRunStableVideoDecoderFactoryProcessServiceOnIOThread)) { +@@ -440,7 +440,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& #endif // BUILDFLAG(IS_CHROMEOS_ASH) && (BUILDFLAG(USE_VAAPI) || // BUILDFLAG(USE_V4L2_CODEC)) -#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) && \ +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)) && \ (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) - services.Add(RunStableVideoDecoderFactoryProcessService); + if (!base::FeatureList::IsEnabled( + features::kRunStableVideoDecoderFactoryProcessServiceOnIOThread)) { +@@ -449,7 +449,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_utility__main.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_utility_utility__main.cc index 686fe2e4cc1b..684d0dd4d918 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,6 +1,6 @@ ---- src/3rdparty/chromium/content/utility/utility_main.cc.orig 2023-12-12 22:08:45 UTC +--- src/3rdparty/chromium/content/utility/utility_main.cc.orig 2024-07-03 01:14:49 UTC +++ src/3rdparty/chromium/content/utility/utility_main.cc -@@ -34,7 +34,7 @@ +@@ -39,17 +39,21 @@ #include "third_party/icu/source/common/unicode/unistr.h" #include "third_party/icu/source/i18n/unicode/timezone.h" @@ -9,7 +9,11 @@ #include "base/file_descriptor_store.h" #include "base/files/file_util.h" #include "base/pickle.h" -@@ -42,7 +42,9 @@ + #include "content/child/sandboxed_process_thread_type_handler.h" ++#if BUILDFLAG(IS_LINUX) + #include "content/common/gpu_pre_sandbox_hook_linux.h" ++#endif + #include "content/public/common/content_descriptor_keys.h" #include "content/utility/speech/speech_recognition_sandbox_hook_linux.h" #include "gpu/config/gpu_info_collector.h" #include "media/gpu/sandbox/hardware_video_encoding_sandbox_hook_linux.h" @@ -19,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 -@@ -54,10 +56,14 @@ +@@ -61,10 +65,15 @@ #endif #endif @@ -30,12 +34,13 @@ +#if BUILDFLAG(IS_BSD) +#include "sandbox/policy/sandbox.h" ++#include "content/common/gpu_pre_sandbox_hook_bsd.h" +#endif + #if BUILDFLAG(IS_CHROMEOS_ASH) #include "chromeos/ash/components/assistant/buildflags.h" #include "chromeos/ash/services/ime/ime_sandbox_hook.h" -@@ -69,7 +75,7 @@ +@@ -76,7 +85,7 @@ #endif // BUILDFLAG(IS_CHROMEOS_ASH) #if (BUILDFLAG(ENABLE_SCREEN_AI_SERVICE) && \ @@ -44,7 +49,7 @@ #include "components/services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.h" // nogncheck #endif -@@ -95,7 +101,7 @@ namespace { +@@ -102,7 +111,7 @@ namespace { namespace { @@ -53,7 +58,7 @@ std::vector GetNetworkContextsParentDirectories() { base::MemoryMappedFile::Region region; base::ScopedFD read_pipe_fd = base::FileDescriptorStore::GetInstance().TakeFD( -@@ -123,7 +129,7 @@ bool ShouldUseAmdGpuPolicy(sandbox::mojom::Sandbox san +@@ -130,7 +139,7 @@ bool ShouldUseAmdGpuPolicy(sandbox::mojom::Sandbox san bool ShouldUseAmdGpuPolicy(sandbox::mojom::Sandbox sandbox_type) { const bool obtain_gpu_info = @@ -62,16 +67,26 @@ sandbox_type == sandbox::mojom::Sandbox::kHardwareVideoDecoding || #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) sandbox_type == sandbox::mojom::Sandbox::kHardwareVideoEncoding; -@@ -239,7 +245,7 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -255,7 +264,8 @@ int UtilityMain(MainFunctionParams parameters) { } } +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++// XXX BSD ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && !BUILDFLAG(IS_BSD) + // Thread type delegate of the process should be registered before + // first thread type change in ChildProcess constructor. + // It also needs to be registered before the process has multiple threads, +@@ -266,7 +276,7 @@ int UtilityMain(MainFunctionParams parameters) { + } + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) + -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Initializes the sandbox before any threads are created. // TODO(jorgelo): move this after GTK initialization when we enable a strict // Seccomp-BPF policy. -@@ -272,7 +278,7 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -307,7 +317,7 @@ int UtilityMain(MainFunctionParams parameters) { #endif break; #endif @@ -80,15 +95,15 @@ case sandbox::mojom::Sandbox::kHardwareVideoDecoding: pre_sandbox_hook = base::BindOnce(&media::HardwareVideoDecodingPreSandboxHook); -@@ -299,6 +305,7 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -334,6 +344,7 @@ int UtilityMain(MainFunctionParams parameters) { default: break; } +#if !BUILDFLAG(IS_BSD) if (!sandbox::policy::IsUnsandboxedSandboxType(sandbox_type) && (parameters.zygote_child || !pre_sandbox_hook.is_null())) { - sandbox::policy::SandboxLinux::Options sandbox_options; -@@ -307,6 +314,11 @@ int UtilityMain(MainFunctionParams parameters) { + sandbox_options.use_amd_specific_policies = +@@ -341,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 new file mode 100644 index 000000000000..2bb934f16bed --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_utility_utility__thread__impl.cc @@ -0,0 +1,21 @@ +--- 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 +@@ -32,7 +32,7 @@ + #include "mojo/public/cpp/bindings/pending_receiver.h" + #include "mojo/public/cpp/bindings/service_factory.h" + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #include "content/child/sandboxed_process_thread_type_handler.h" + #endif + +@@ -252,7 +252,8 @@ void UtilityThreadImpl::Init() { + + GetContentClient()->utility()->UtilityThreadStarted(); + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++// XXX BSD ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && !BUILDFLAG(IS_BSD) + SandboxedProcessThreadTypeHandler::NotifyMainChildThreadCreated(); + #endif + diff --git a/www/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 ef586f15e77a..cd9e947bd91f 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 2023-09-13 12:11:42 UTC +--- src/3rdparty/chromium/content/zygote/zygote_linux.cc.orig 2024-02-23 21:04:38 UTC +++ src/3rdparty/chromium/content/zygote/zygote_linux.cc @@ -1,6 +1,7 @@ // Copyright 2012 The Chromium Authors @@ -8,7 +8,7 @@ #include "content/zygote/zygote_linux.h" -@@ -707,3 +708,4 @@ void Zygote::HandleReinitializeLoggingRequest(base::Pi +@@ -709,3 +710,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 ec201757b5e7..abdbd813300a 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 2023-12-12 22:08:45 UTC +--- 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 @@ -11,7 +11,9 @@ #include diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_device_gamepad_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_device_gamepad_BUILD.gn index 72388af02332..9524e185dca6 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_device_gamepad_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_device_gamepad_BUILD.gn @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/device/gamepad/BUILD.gn.orig 2022-11-30 08:12:58 UTC +--- src/3rdparty/chromium/device/gamepad/BUILD.gn.orig 2023-11-03 10:09:45 UTC +++ src/3rdparty/chromium/device/gamepad/BUILD.gn -@@ -98,7 +98,7 @@ component("gamepad") { +@@ -99,7 +99,7 @@ component("gamepad") { "hid_writer_linux.cc", "hid_writer_linux.h", ] diff --git a/www/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 bc444409da16..a43d14b7864d 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 2023-12-12 22:08:45 UTC +--- 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 -@@ -118,7 +118,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt - MessageService::GetFactoryInstance(); +@@ -121,7 +121,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt MessagingAPIMessageFilter::EnsureAssociatedFactoryBuilt(); + #endif #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 new file mode 100644 index 000000000000..64e67c928e0c --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_browser_api_management_management__api.cc @@ -0,0 +1,11 @@ +--- 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 +@@ -279,7 +279,7 @@ bool PlatformSupportsApprovalFlowForExtensions() { + #if BUILDFLAG(IS_CHROMEOS) + // ChromeOS devices have this feature already shipped. + return true; +-#elif BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#elif BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + return base::FeatureList::IsEnabled( + supervised_user::kEnableExtensionsPermissionsForSupervisedUsersOnDesktop); + #else diff --git a/www/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 bfbb3c283998..f5f0135ac58d 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 2023-12-12 22:08:45 UTC +--- 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 -@@ -71,7 +71,7 @@ const char kReceivingEndDoesntExistError[] = +@@ -70,7 +70,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[] = -@@ -490,7 +490,7 @@ void MessageService::OpenChannelToNativeApp( +@@ -544,7 +544,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_api___permission__features.json b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_common_api___permission__features.json index 8b64105a88f3..0a837f34cfe2 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_common_api___permission__features.json +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_common_api___permission__features.json @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/extensions/common/api/_permission_features.json.orig 2023-07-16 15:47:57 UTC +--- src/3rdparty/chromium/extensions/common/api/_permission_features.json.orig 2023-12-10 06:10:27 UTC +++ src/3rdparty/chromium/extensions/common/api/_permission_features.json @@ -138,7 +138,7 @@ { @@ -18,7 +18,7 @@ "allowlist": [ "0DE0F05680A4A056BCEC864ED8DDA84296F82B40", // http://crbug.com/434651 "1C93BD3CF875F4A73C0B2A163BB8FBDA8B8B3D80", // http://crbug.com/293683 -@@ -474,7 +474,7 @@ +@@ -476,7 +476,7 @@ "networkingPrivate": { "channel": "stable", "extension_types": ["extension", "legacy_packaged_app", "platform_app"], diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_common_api_runtime.json b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_common_api_runtime.json index 60c4d4bfbe25..23e8da81359e 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_common_api_runtime.json +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_common_api_runtime.json @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/extensions/common/api/runtime.json.orig 2023-09-13 12:11:42 UTC +--- src/3rdparty/chromium/extensions/common/api/runtime.json.orig 2024-01-30 07:53:34 UTC +++ src/3rdparty/chromium/extensions/common/api/runtime.json -@@ -89,6 +89,7 @@ +@@ -86,6 +86,7 @@ {"name": "cros", "description": "Specifies the Chrome operating system."}, {"name": "linux", "description": "Specifies the Linux operating system."}, {"name": "openbsd", "description": "Specifies the OpenBSD operating system."}, diff --git a/www/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 ba234ebaf7f5..9fe832b28e09 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 2023-10-11 18:22:24 UTC +--- src/3rdparty/chromium/extensions/common/command.cc.orig 2024-02-23 21:04:38 UTC +++ src/3rdparty/chromium/extensions/common/command.cc -@@ -282,7 +282,7 @@ std::string Command::CommandPlatform() { +@@ -283,7 +283,7 @@ std::string Command::CommandPlatform() { return values::kKeybindingPlatformMac; #elif BUILDFLAG(IS_CHROMEOS) return values::kKeybindingPlatformChromeOs; diff --git a/www/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 73b8d7d4a181..60c21fd36c2f 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,15 +1,15 @@ ---- src/3rdparty/chromium/extensions/shell/app/shell_main_delegate.cc.orig 2022-02-28 16:54:41 UTC +--- 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 -@@ -42,7 +42,7 @@ - +@@ -43,7 +43,7 @@ #if BUILDFLAG(IS_WIN) #include "base/base_paths_win.h" + #include "base/process/process_info.h" -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "base/nix/xdg_util.h" #elif BUILDFLAG(IS_MAC) #include "base/base_paths_mac.h" -@@ -61,7 +61,7 @@ base::FilePath GetDataPath() { +@@ -62,7 +62,7 @@ base::FilePath GetDataPath() { return cmd_line->GetSwitchValuePath(switches::kContentShellDataPath); base::FilePath data_dir; 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 df5720390dd5..3f23f289eb61 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,11 +1,11 @@ ---- src/3rdparty/chromium/gpu/command_buffer/service/dawn_context_provider.cc.orig 2023-10-11 18:22:24 UTC +--- 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 -@@ -145,7 +145,7 @@ wgpu::BackendType DawnContextProvider::GetDefaultBacke +@@ -186,7 +186,7 @@ wgpu::BackendType DawnContextProvider::GetDefaultBacke return base::FeatureList::IsEnabled(features::kSkiaGraphiteDawnUseD3D12) ? wgpu::BackendType::D3D12 : wgpu::BackendType::D3D11; --#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) return wgpu::BackendType::Vulkan; #elif BUILDFLAG(IS_APPLE) return wgpu::BackendType::Metal; diff --git a/www/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 c71dfc2e8b62..5aa0320936e1 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 2023-12-12 22:08:45 UTC +--- 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 -@@ -2982,7 +2982,7 @@ GLES2Decoder* GLES2Decoder::Create( +@@ -3001,7 +3001,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__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 e7b1efc2ebbd..1f74e598a479 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,4 +1,4 @@ ---- src/3rdparty/chromium/gpu/command_buffer/service/shared_image/angle_vulkan_image_backing_factory.cc.orig 2023-04-28 17:01:32 UTC +--- 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 @@ -21,7 +21,7 @@ namespace { // TODO(penghuang): verify the scanout is the right usage for video playback. @@ -8,4 +8,4 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) SHARED_IMAGE_USAGE_SCANOUT | #endif - SHARED_IMAGE_USAGE_GLES2 | SHARED_IMAGE_USAGE_GLES2_FRAMEBUFFER_HINT | + SHARED_IMAGE_USAGE_GLES2_READ | SHARED_IMAGE_USAGE_GLES2_WRITE | diff --git a/www/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 46fe9b90ef76..39ba3bbb2bce 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,18 +1,18 @@ ---- src/3rdparty/chromium/gpu/command_buffer/service/shared_image/external_vk_image_backing.cc.orig 2023-10-11 18:22:24 UTC +--- 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 -@@ -47,7 +47,7 @@ +@@ -49,7 +49,7 @@ #include "ui/gl/gl_version_info.h" #include "ui/gl/scoped_binders.h" -#if BUILDFLAG(IS_LINUX) && BUILDFLAG(USE_DAWN) +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(USE_DAWN) #include "gpu/command_buffer/service/shared_image/external_vk_image_dawn_representation.h" - #endif - -@@ -673,7 +673,7 @@ std::unique_ptr ExternalVkIma - const wgpu::Device& wgpuDevice, + #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 wgpu::BackendType backend_type, - std::vector view_formats) { + std::vector view_formats, + scoped_refptr context_state) { -#if BUILDFLAG(IS_LINUX) && BUILDFLAG(USE_DAWN) +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(USE_DAWN) auto wgpu_format = ToDawnFormat(format()); diff --git a/www/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 7e0e594df65b..3ad2b8d29e9d 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,6 +1,6 @@ ---- src/3rdparty/chromium/gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.cc.orig 2023-12-12 22:08:45 UTC +--- 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 -@@ -89,7 +89,7 @@ constexpr uint32_t kSupportedUsage = +@@ -147,7 +147,7 @@ bool IsFormatSupported(viz::SharedImageFormat format, } // namespace constexpr uint32_t kSupportedUsage = @@ -9,12 +9,3 @@ SHARED_IMAGE_USAGE_WEBGPU | SHARED_IMAGE_USAGE_WEBGPU_SWAP_CHAIN_TEXTURE | SHARED_IMAGE_USAGE_WEBGPU_STORAGE_TEXTURE | #endif -@@ -258,7 +258,7 @@ bool ExternalVkImageBackingFactory::IsSupported( - return false; - } - --#if BUILDFLAG(IS_LINUX) && !defined(TOOLKIT_QT) -+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !defined(TOOLKIT_QT) - if (format.IsLegacyMultiplanar()) { - // ExternalVkImageBacking doesn't work properly with external sampler - // multi-planar formats on Linux, see https://crbug.com/1394888. diff --git a/www/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 beaf9fc60a42..061b05703dba 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,6 @@ ---- src/3rdparty/chromium/gpu/command_buffer/service/shared_image/shared_image_factory.cc.orig 2023-09-13 12:11:42 UTC +--- 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 -@@ -142,7 +142,7 @@ gfx::GpuMemoryBufferType GetNativeBufferType() { +@@ -143,7 +143,7 @@ gfx::GpuMemoryBufferType GetNativeBufferType() { return gfx::GpuMemoryBufferType::IO_SURFACE_BUFFER; #elif BUILDFLAG(IS_ANDROID) return gfx::GpuMemoryBufferType::ANDROID_HARDWARE_BUFFER; 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 ff053561c04e..33b961cc39ca 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 2023-09-13 12:11:42 UTC +--- 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 -@@ -507,7 +507,7 @@ bool SharedImageManager::SupportsScanoutImages() { +@@ -550,7 +550,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 bb5a1de33a97..b30cb289780f 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-09-13 12:11:42 UTC +--- 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 -@@ -211,7 +211,7 @@ bool WrappedSkImageBacking::Initialize(const std::stri +@@ -212,7 +212,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 118c8c18e993..aa5762befa17 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 2023-10-11 18:22:24 UTC +--- 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 -@@ -1194,7 +1194,7 @@ void WebGPUDecoderImpl::RequestAdapterImpl( +@@ -1243,7 +1243,7 @@ void WebGPUDecoderImpl::RequestAdapterImpl( force_fallback_adapter = true; } @@ -9,7 +9,7 @@ if (!shared_context_state_->GrContextIsVulkan() && !shared_context_state_->IsGraphiteDawnVulkan() && use_webgpu_adapter_ != WebGPUAdapterName::kOpenGLES) { -@@ -1849,7 +1849,7 @@ WebGPUDecoderImpl::AssociateMailboxDawn( +@@ -1895,7 +1895,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 0aa02325b5b0..8db4b1e23523 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,4 +1,4 @@ ---- src/3rdparty/chromium/gpu/config/gpu_control_list.cc.orig 2023-08-17 07:33:31 UTC +--- 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 @@ -276,7 +276,7 @@ bool GpuControlList::More::GLVersionInfoMismatch( GpuControlList::GLType GpuControlList::More::GetDefaultGLType() { @@ -9,7 +9,7 @@ return kGLTypeGL; #elif BUILDFLAG(IS_MAC) return kGLTypeGL; -@@ -817,7 +817,7 @@ GpuControlList::OsType GpuControlList::GetOsType() { +@@ -811,7 +811,7 @@ GpuControlList::OsType GpuControlList::GetOsType() { return kOsAndroid; #elif BUILDFLAG(IS_FUCHSIA) return kOsFuchsia; diff --git a/www/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 5d0e01de4b5b..0eded630cb5b 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,21 @@ ---- src/3rdparty/chromium/gpu/config/gpu_finch_features.cc.orig 2023-12-12 22:08:45 UTC +--- 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 -@@ -58,7 +58,7 @@ CONSTINIT const base::Feature kUseGles2ForOopR( - CONSTINIT const base::Feature kUseGles2ForOopR( - "UseGles2ForOopR", +@@ -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_DISABLED_BY_DEFAULT - #else - base::FEATURE_ENABLED_BY_DEFAULT -@@ -142,7 +142,8 @@ CONSTINIT const base::Feature kDefaultEnableGpuRasteri - CONSTINIT const base::Feature kDefaultEnableGpuRasterization( - "DefaultEnableGpuRasterization", + BASE_FEATURE(kUseGles2ForOopR, + "UseGles2ForOopR", + base::FEATURE_DISABLED_BY_DEFAULT); +@@ -142,7 +142,8 @@ BASE_FEATURE(kAggressiveSkiaGpuResourcePurge, + // 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) - base::FEATURE_ENABLED_BY_DEFAULT - #else - base::FEATURE_DISABLED_BY_DEFAULT + BASE_FEATURE(kDefaultEnableGpuRasterization, + "DefaultEnableGpuRasterization", + 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 new file mode 100644 index 000000000000..5f54598ac39e --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_config_gpu__info__collector.cc @@ -0,0 +1,11 @@ +--- 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 +@@ -364,7 +364,7 @@ void ReportWebGPUAdapterMetrics(dawn::native::Instance + void ReportWebGPUSupportMetrics(dawn::native::Instance* instance) { + static BASE_FEATURE(kCollectWebGPUSupportMetrics, + "CollectWebGPUSupportMetrics", +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + base::FEATURE_DISABLED_BY_DEFAULT); + #else + base::FEATURE_ENABLED_BY_DEFAULT); diff --git a/www/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 1e31e8949854..1dc39b5b1783 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 2023-12-12 22:08:45 UTC +--- 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 -@@ -363,7 +363,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -370,7 +370,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 -@@ -400,7 +400,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -407,7 +407,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL } bool attempted_startsandbox = false; @@ -18,8 +18,8 @@ // 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. -@@ -457,7 +457,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL - } +@@ -508,7 +508,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL + gpu_preferences_.gr_context_type = GrContextType::kGL; } -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -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 -@@ -539,7 +539,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -590,7 +590,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; -@@ -692,7 +692,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -747,7 +747,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. -@@ -746,7 +746,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -802,7 +802,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 -@@ -900,7 +900,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c +@@ -956,7 +956,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 -@@ -976,7 +976,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c +@@ -1032,7 +1032,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c } } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_service_x__util.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_service_x__util.h index c53ca709d947..0aa61e2f3dc4 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_service_x__util.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_service_x__util.h @@ -1,16 +1,11 @@ ---- src/3rdparty/chromium/gpu/ipc/service/x_util.h.orig 2022-02-28 16:54:41 UTC +--- src/3rdparty/chromium/gpu/ipc/service/x_util.h.orig 2024-02-23 21:04:38 UTC +++ src/3rdparty/chromium/gpu/ipc/service/x_util.h -@@ -11,11 +11,11 @@ - #include "build/build_config.h" +@@ -12,7 +12,7 @@ #include "gpu/ipc/service/gpu_config.h" + #include "ui/base/ozone_buildflags.h" --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - #include "ui/ozone/buildflags.h" - #endif - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - #if BUILDFLAG(OZONE_PLATFORM_X11) +-#if BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(IS_OZONE_X11) namespace gpu { + diff --git a/www/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 3fc4935c7a65..eeb4007c4983 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-09-13 12:11:42 UTC +--- src/3rdparty/chromium/gpu/vulkan/generate_bindings.py.orig 2023-11-03 10:09:45 UTC +++ src/3rdparty/chromium/gpu/vulkan/generate_bindings.py -@@ -260,7 +260,7 @@ VULKAN_DEVICE_FUNCTIONS = [ +@@ -270,7 +270,7 @@ VULKAN_DEVICE_FUNCTIONS = [ ] }, { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_semaphore__handle.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_semaphore__handle.cc index a7b61ad210ab..3519fd1d0e8a 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_semaphore__handle.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_semaphore__handle.cc @@ -1,20 +1,20 @@ ---- src/3rdparty/chromium/gpu/vulkan/semaphore_handle.cc.orig 2023-10-11 18:22:24 UTC +--- src/3rdparty/chromium/gpu/vulkan/semaphore_handle.cc.orig 2023-11-03 10:09:45 UTC +++ src/3rdparty/chromium/gpu/vulkan/semaphore_handle.cc @@ -39,7 +39,7 @@ SemaphoreHandle::SemaphoreHandle(gfx::GpuFenceHandle f // https://fuchsia.dev/reference/fidl/fuchsia.ui.scenic. Init(VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_ZIRCON_EVENT_BIT_FUCHSIA, - std::move(fence_handle.owned_event)); + fence_handle.Release()); -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) Init(VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_SYNC_FD_BIT_KHR, - std::move(fence_handle.owned_fd)); + fence_handle.Release()); #elif BUILDFLAG(IS_POSIX) @@ -64,7 +64,7 @@ gfx::GpuFenceHandle SemaphoreHandle::ToGpuFenceHandle( // VkSemaphore, which can then be used to submit present work, see // https://fuchsia.dev/reference/fidl/fuchsia.ui.scenic. - fence_handle.owned_event = TakeHandle(); + fence_handle.Adopt(TakeHandle()); -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) if (type_ == VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_SYNC_FD_BIT_KHR) { - fence_handle.owned_fd = TakeHandle(); + fence_handle.Adopt(TakeHandle()); } else { 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 d67111ec0331..017d115545b4 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,4 +1,4 @@ ---- src/3rdparty/chromium/gpu/vulkan/vulkan_device_queue.cc.orig 2023-09-13 12:11:42 UTC +--- 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 @@ -121,7 +121,7 @@ bool VulkanDeviceQueue::Initialize( @@ -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)) { -@@ -263,7 +263,7 @@ bool VulkanDeviceQueue::Initialize( +@@ -264,7 +264,7 @@ bool VulkanDeviceQueue::Initialize( // Android, Fuchsia, Linux, and CrOS (VaapiVideoDecoder) need YCbCr sampler // support. #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/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 bc33c334dbab..13126216b757 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,6 +1,6 @@ ---- src/3rdparty/chromium/gpu/vulkan/vulkan_device_queue.h.orig 2023-09-13 12:11:42 UTC +--- 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 -@@ -166,7 +166,7 @@ class COMPONENT_EXPORT(VULKAN) VulkanDeviceQueue +@@ -169,7 +169,7 @@ class COMPONENT_EXPORT(VULKAN) VulkanDeviceQueue bool allow_protected_memory_ = false; #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/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 cfa5f590ebf5..3fee5e6a7287 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 2023-09-13 12:11:42 UTC +--- 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 -@@ -1161,7 +1161,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer +@@ -1289,7 +1289,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer } } @@ -8,8 +8,8 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) if (gfx::HasExtension(enabled_extensions, VK_EXT_IMAGE_DRM_FORMAT_MODIFIER_EXTENSION_NAME)) { - vkGetImageDrmFormatModifierPropertiesEXT = -@@ -1350,7 +1350,7 @@ void VulkanFunctionPointers::ResetForTesting() { + constexpr char kvkGetImageDrmFormatModifierPropertiesEXT[] = +@@ -1489,7 +1489,7 @@ void VulkanFunctionPointers::ResetForTesting() { vkGetSwapchainImagesKHR = nullptr; vkQueuePresentKHR = nullptr; diff --git a/www/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 8c52f65fe0a8..3fbc27bdad93 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-09-13 12:11:42 UTC +--- 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 -@@ -311,7 +311,7 @@ struct COMPONENT_EXPORT(VULKAN) VulkanFunctionPointers +@@ -321,7 +321,7 @@ struct COMPONENT_EXPORT(VULKAN) VulkanFunctionPointers VulkanFunction vkGetSwapchainImagesKHR; VulkanFunction vkQueuePresentKHR; @@ -9,7 +9,7 @@ VulkanFunction vkGetImageDrmFormatModifierPropertiesEXT; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -1235,7 +1235,7 @@ ALWAYS_INLINE VkResult vkQueuePresentKHR(VkQueue queue +@@ -1324,7 +1324,7 @@ ALWAYS_INLINE VkResult vkQueuePresentKHR(VkQueue queue pPresentInfo); } @@ -18,7 +18,7 @@ ALWAYS_INLINE VkResult vkGetImageDrmFormatModifierPropertiesEXT( VkDevice device, VkImage image, -@@ -1245,4 +1245,4 @@ ALWAYS_INLINE VkResult vkGetImageDrmFormatModifierProp +@@ -1334,4 +1334,4 @@ ALWAYS_INLINE VkResult vkGetImageDrmFormatModifierProp } #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) diff --git a/www/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 16b86dba4c0b..03eeded45086 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 2023-08-17 07:33:31 UTC +--- src/3rdparty/chromium/gpu/vulkan/vulkan_util.cc.orig 2024-02-23 21:04:38 UTC +++ src/3rdparty/chromium/gpu/vulkan/vulkan_util.cc -@@ -343,7 +343,7 @@ bool CheckVulkanCompabilities(const VulkanInfo& vulkan +@@ -443,7 +443,7 @@ bool CheckVulkanCompatibilities(const VulkanInfo& vulk } } 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 index 6cd50c8d80d8..c117aa3d9cdd 100644 --- 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 @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/headless/lib/browser/headless_request_context_manager.cc.orig 2022-06-17 14:20:10 UTC +--- 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 -@@ -65,7 +65,7 @@ void SetCryptKeyOnce(const base::FilePath& user_data_p +@@ -64,7 +64,7 @@ void SetCryptKeyOnce(const base::FilePath& user_data_p return; done_once = true; diff --git a/www/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 85f9b3d5814d..89793f90d3c9 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-09-13 12:11:42 UTC +--- 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 -@@ -344,7 +344,7 @@ void HeadlessContentMainDelegate::InitCrashReporter( +@@ -362,7 +362,7 @@ void HeadlessContentMainDelegate::InitCrashReporter( if (process_type != ::switches::kZygoteProcess) { g_headless_crash_client.Pointer()->set_crash_dumps_dir( command_line.GetSwitchValuePath(switches::kCrashDumpsDir)); diff --git a/www/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 b788e631fe3a..a9915790f024 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 2023-03-09 06:31:50 UTC +--- src/3rdparty/chromium/ipc/ipc_channel.h.orig 2024-01-30 07:53:34 UTC +++ src/3rdparty/chromium/ipc/ipc_channel.h -@@ -233,7 +233,7 @@ class COMPONENT_EXPORT(IPC) Channel : public Sender { +@@ -240,7 +240,7 @@ class COMPONENT_EXPORT(IPC) Channel : public Sender { static std::string GenerateUniqueRandomChannelID(); #endif diff --git a/www/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 0b4fb6c20bac..f04800884e62 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 2023-09-13 12:11:42 UTC +--- src/3rdparty/chromium/ipc/ipc_message_utils.cc.orig 2024-02-23 21:04:38 UTC +++ src/3rdparty/chromium/ipc/ipc_message_utils.cc -@@ -393,7 +393,7 @@ void ParamTraits::Log(const param_type& +@@ -394,7 +394,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 196ee0c0a3c4..07e76e709142 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,6 +1,6 @@ ---- src/3rdparty/chromium/media/BUILD.gn.orig 2023-12-12 22:08:45 UTC +--- src/3rdparty/chromium/media/BUILD.gn.orig 2024-10-02 15:40:01 UTC +++ src/3rdparty/chromium/media/BUILD.gn -@@ -96,6 +96,9 @@ config("media_config") { +@@ -99,6 +99,9 @@ config("media_config") { defines += [ "DLOPEN_PULSEAUDIO" ] } } 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 db6fd122165c..6b7cad37b27d 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,7 +1,7 @@ ---- src/3rdparty/chromium/media/audio/BUILD.gn.orig 2023-12-12 22:08:45 UTC +--- src/3rdparty/chromium/media/audio/BUILD.gn.orig 2024-07-03 01:14:49 UTC +++ src/3rdparty/chromium/media/audio/BUILD.gn -@@ -278,9 +278,20 @@ jumbo_source_set("audio") { - ] +@@ -269,9 +269,20 @@ jumbo_source_set("audio") { + deps += [ "//media/base/android:media_jni_headers" ] } - if (is_linux || is_chromeos) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_cdm__promise__adapter.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_cdm__promise__adapter.cc deleted file mode 100644 index 8661d571c150..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_cdm__promise__adapter.cc +++ /dev/null @@ -1,16 +0,0 @@ ---- src/3rdparty/chromium/media/base/cdm_promise_adapter.cc.orig 2023-08-17 07:33:31 UTC -+++ src/3rdparty/chromium/media/base/cdm_promise_adapter.cc -@@ -94,7 +94,13 @@ void CdmPromiseAdapter::RejectPromise(uint32_t promise - void CdmPromiseAdapter::Clear(ClearReason reason) { - // Reject all outstanding promises. - DCHECK(thread_checker_.CalledOnValidThread()); -+#if defined(__clang__) && (__clang_major__ >= 16) - for (auto& [promise_id, promise] : promises_) { -+#else -+ for (auto& [p_i, p_e] : promises_) { -+ auto& promise_id = p_i; -+ auto& promise = p_e; -+#endif - TRACE_EVENT_NESTABLE_ASYNC_END1( - "media", "CdmPromise", TRACE_ID_WITH_SCOPE("CdmPromise", promise_id), - "status", "cleared"); diff --git a/www/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 5cfee7ed784c..c3ce1186c080 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,6 +1,6 @@ ---- src/3rdparty/chromium/media/base/media_switches.cc.orig 2023-12-12 22:08:45 UTC +--- src/3rdparty/chromium/media/base/media_switches.cc.orig 2024-07-03 01:14:49 UTC +++ src/3rdparty/chromium/media/base/media_switches.cc -@@ -17,7 +17,7 @@ +@@ -21,7 +21,7 @@ #include "ui/gl/gl_features.h" #include "ui/gl/gl_utils.h" @@ -9,34 +9,45 @@ #include "base/cpu.h" #endif -@@ -673,7 +673,7 @@ CONSTINIT const base::Feature kGlobalMediaControls( +@@ -369,8 +369,8 @@ BASE_FEATURE(kMacLoopbackAudioForScreenShare, + "MacLoopbackAudioForScreenShare", + base::FEATURE_DISABLED_BY_DEFAULT); + #endif // BUILDFLAG(IS_MAC) +- +-#if BUILDFLAG(IS_LINUX) ++ ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Enables system audio mirroring using pulseaudio. + BASE_FEATURE(kPulseaudioLoopbackForCast, + "PulseaudioLoopbackForCast", +@@ -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); + // Show toolbar button that opens dialog for controlling media sessions. - CONSTINIT const base::Feature kGlobalMediaControls( - "GlobalMediaControls", -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - base::FEATURE_ENABLED_BY_DEFAULT - #else - base::FEATURE_DISABLED_BY_DEFAULT -@@ -696,7 +696,7 @@ CONSTINIT const base::Feature kMediaRemotingWithoutFul + BASE_FEATURE(kGlobalMediaControls, + "GlobalMediaControls", + base::FEATURE_ENABLED_BY_DEFAULT); +@@ -743,7 +743,7 @@ BASE_FEATURE(kGlobalMediaControlsCrOSUpdatedUI, + + #if !BUILDFLAG(IS_ANDROID) // If enabled, users can request Media Remoting without fullscreen-in-tab. - CONSTINIT const base::Feature kMediaRemotingWithoutFullscreen( - "MediaRemotingWithoutFullscreen", -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - base::FEATURE_ENABLED_BY_DEFAULT - #else - base::FEATURE_DISABLED_BY_DEFAULT -@@ -708,7 +708,7 @@ CONSTINIT const base::Feature kGlobalMediaControlsPict - CONSTINIT const base::Feature kGlobalMediaControlsPictureInPicture( - "GlobalMediaControlsPictureInPicture", - #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_ENABLED_BY_DEFAULT - #else - base::FEATURE_DISABLED_BY_DEFAULT -@@ -752,7 +752,7 @@ BASE_FEATURE(kUnifiedAutoplay, + BASE_FEATURE(kMediaRemotingWithoutFullscreen, + "MediaRemotingWithoutFullscreen", + base::FEATURE_ENABLED_BY_DEFAULT); +@@ -788,7 +788,7 @@ BASE_FEATURE(kUnifiedAutoplay, "UnifiedAutoplay", base::FEATURE_ENABLED_BY_DEFAULT); @@ -45,21 +56,30 @@ // Enable vaapi video decoding on linux. This is already enabled by default on // chromeos, but needs an experiment on linux. BASE_FEATURE(kVaapiVideoDecodeLinux, -@@ -832,7 +832,7 @@ BASE_FEATURE(kVaapiVp9kSVCHWEncoding, - "VaapiVp9kSVCHWEncoding", - base::FEATURE_ENABLED_BY_DEFAULT); +@@ -874,7 +874,7 @@ BASE_FEATURE(kVaapiVp9SModeHWEncoding, + "VaapiVp9SModeHWEncoding", + base::FEATURE_DISABLED_BY_DEFAULT); #endif // defined(ARCH_CPU_X86_FAMILY) && BUILDFLAG(IS_CHROMEOS) -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Enables the new V4L2StatefulVideoDecoder instead of V4L2VideoDecoder. BASE_FEATURE(kV4L2FlatStatelessVideoDecoder, "V4L2FlatStatelessVideoDecoder", -@@ -1348,7 +1348,7 @@ const base::Feature MEDIA_EXPORT kUseOutOfProcessVideo - }; +@@ -981,7 +981,7 @@ BASE_FEATURE(kLiveCaptionUseWaitK, + 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) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Spawn utility processes to perform hardware encode acceleration instead of // using the GPU process. - const base::Feature MEDIA_EXPORT kUseOutOfProcessVideoEncoding{ + BASE_FEATURE(kUseOutOfProcessVideoEncoding, diff --git a/www/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 7bf6a2138bd1..2ddf447328fd 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,24 +1,33 @@ ---- src/3rdparty/chromium/media/base/media_switches.h.orig 2023-10-11 18:22:24 UTC +--- src/3rdparty/chromium/media/base/media_switches.h.orig 2024-02-23 21:04:38 UTC +++ src/3rdparty/chromium/media/base/media_switches.h -@@ -305,7 +305,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseElementInsteadOf +@@ -307,7 +307,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kPlatformHEVCEncoder + MEDIA_EXPORT BASE_DECLARE_FEATURE(kPlaybackSpeedButton); + MEDIA_EXPORT BASE_DECLARE_FEATURE(kPreloadMediaEngagementData); + MEDIA_EXPORT BASE_DECLARE_FEATURE(kPreloadMetadataSuspend); +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + MEDIA_EXPORT BASE_DECLARE_FEATURE(kPulseaudioLoopbackForCast); + MEDIA_EXPORT BASE_DECLARE_FEATURE(kPulseaudioLoopbackForScreenShare); + #endif // BUILDFLAG(IS_LINUX) +@@ -325,7 +325,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kUnifiedAutoplay); + MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseAndroidOverlayForSecureOnly); + MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseDecoderStreamForWebRTC); MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseFakeDeviceForMediaStream); - MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseMediaHistoryStore); - MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseR16Texture); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVideoDecodeLinux); MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVideoDecodeLinuxGL); MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVideoEncodeLinux); -@@ -323,7 +323,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiH264TemporalLa +@@ -344,7 +344,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiH264TemporalLa MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVp8TemporalLayerHWEncoding); - MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVp9kSVCHWEncoding); + MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVp9SModeHWEncoding); #endif // defined(ARCH_CPU_X86_FAMILY) && BUILDFLAG(IS_CHROMEOS) -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) MEDIA_EXPORT BASE_DECLARE_FEATURE(kV4L2FlatStatelessVideoDecoder); MEDIA_EXPORT BASE_DECLARE_FEATURE(kV4L2FlatStatefulVideoDecoder); #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -@@ -443,7 +443,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kExposeOutOfProcessV +@@ -471,7 +471,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kExposeOutOfProcessV MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseOutOfProcessVideoDecoding); #endif // BUILDFLAG(ALLOW_OOP_VIDEO_DECODER) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_scopedfd__helper.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_scopedfd__helper.h deleted file mode 100644 index c1555a9ae943..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_scopedfd__helper.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/media/base/scopedfd_helper.h.orig 2022-02-28 16:54:41 UTC -+++ src/3rdparty/chromium/media/base/scopedfd_helper.h -@@ -15,7 +15,7 @@ namespace media { - // but since the only current user is V4L2 we are limiting the scope to OS_LINUX - // so the binary size does not inflate on non-using systems. Feel free to adapt - // this and BUILD.gn as our needs evolve. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - - // Return a new vector containing duplicates of |fds|, or PCHECKs in case of an - // error. diff --git a/www/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 347d8ca3beab..3c52679c29de 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,4 +1,4 @@ ---- src/3rdparty/chromium/media/base/video_frame.cc.orig 2023-10-11 18:22:24 UTC +--- src/3rdparty/chromium/media/base/video_frame.cc.orig 2024-02-23 21:04:38 UTC +++ src/3rdparty/chromium/media/base/video_frame.cc @@ -80,7 +80,7 @@ std::string VideoFrame::StorageTypeToString( return "OWNED_MEMORY"; @@ -27,7 +27,7 @@ // 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 -@@ -635,7 +635,7 @@ scoped_refptr VideoFrame::WrapExternalGpuM +@@ -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); uint64_t modifier = gfx::NativePixmapHandle::kNoModifier; @@ -36,7 +36,7 @@ if (gpu_memory_buffer->GetType() == gfx::NATIVE_PIXMAP) { const auto gmb_handle = gpu_memory_buffer->CloneHandle(); if (gmb_handle.is_null() || -@@ -681,7 +681,7 @@ scoped_refptr VideoFrame::WrapExternalGpuM +@@ -682,7 +682,7 @@ scoped_refptr VideoFrame::WrapExternalGpuM return frame; } @@ -45,7 +45,7 @@ // static scoped_refptr VideoFrame::WrapExternalDmabufs( const VideoFrameLayout& layout, -@@ -902,7 +902,7 @@ scoped_refptr VideoFrame::WrapVideoFrame( +@@ -901,7 +901,7 @@ scoped_refptr VideoFrame::WrapVideoFrame( } } @@ -54,16 +54,16 @@ DCHECK(frame->dmabuf_fds_); // If there are any |dmabuf_fds_| plugged in, we should refer them too. wrapping_frame->dmabuf_fds_ = frame->dmabuf_fds_; -@@ -1310,7 +1310,7 @@ const gpu::MailboxHolder& VideoFrame::mailbox_holder( +@@ -1312,7 +1312,7 @@ const gpu::MailboxHolder& VideoFrame::mailbox_holder( : mailbox_holders_[texture_index]; } -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - const std::vector& VideoFrame::DmabufFds() const { - DCHECK_EQ(storage_type_, STORAGE_DMABUFS); - -@@ -1423,7 +1423,7 @@ VideoFrame::VideoFrame(const VideoFrameLayout& layout, + 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), 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 537115395142..a1b76fc212de 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,4 +1,4 @@ ---- src/3rdparty/chromium/media/base/video_frame.h.orig 2023-10-11 18:22:24 UTC +--- src/3rdparty/chromium/media/base/video_frame.h.orig 2024-02-23 21:04:38 UTC +++ src/3rdparty/chromium/media/base/video_frame.h @@ -44,7 +44,7 @@ #include "base/apple/scoped_cftyperef.h" @@ -33,9 +33,9 @@ -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - // Returns a vector containing the backing DmaBufs for this frame. The number - // of returned DmaBufs will be equal or less than the number of planes of + // The number of DmaBufs will be equal or less than the number of planes of // the frame. If there are less, this means that the last FD contains the + // 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_; 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 286f02368daf..d2ba9190dc3f 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 2023-08-17 07:33:31 UTC +--- 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 -@@ -229,7 +229,7 @@ void FakeVideoCaptureDeviceFactory::GetDevicesInfo( +@@ -230,7 +230,7 @@ void FakeVideoCaptureDeviceFactory::GetDevicesInfo( int entry_index = 0; for (const auto& entry : devices_config_) { VideoCaptureApi api = diff --git a/www/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 d5c23f1e1c31..efdc7882508f 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 2023-09-13 12:11:42 UTC +--- 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 -@@ -560,7 +560,7 @@ int FakeV4L2Impl::close(int fd) { +@@ -561,7 +561,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 2bbd51b2e2c5..361eab2976a2 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,17 +1,17 @@ ---- src/3rdparty/chromium/media/capture/video/linux/v4l2_capture_delegate.cc.orig 2023-10-11 18:22:24 UTC +--- 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 -@@ -4,8 +4,10 @@ - +@@ -5,8 +5,10 @@ #include "media/capture/video/linux/v4l2_capture_delegate.h" + #include +#if !BUILDFLAG(IS_BSD) #include #include +#endif #include - #include #include -@@ -26,17 +28,19 @@ + #include +@@ -27,17 +29,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. -@@ -46,6 +50,14 @@ using media::mojom::MeteringMode; +@@ -47,6 +51,14 @@ using media::mojom::MeteringMode; #define V4L2_PIX_FMT_INVZ v4l2_fourcc('I', 'N', 'V', 'Z') #endif @@ -47,7 +47,7 @@ namespace media { namespace { -@@ -260,7 +272,7 @@ bool V4L2CaptureDelegate::IsBlockedControl(int control +@@ -264,7 +276,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 -@@ -316,7 +328,7 @@ V4L2CaptureDelegate::V4L2CaptureDelegate( +@@ -320,7 +332,7 @@ V4L2CaptureDelegate::V4L2CaptureDelegate( is_capturing_(false), timeout_count_(0), rotation_(rotation) { @@ -65,7 +65,7 @@ use_gpu_buffer_ = switches::IsVideoCaptureUseGpuMemoryBufferEnabled(); #endif // BUILDFLAG(IS_LINUX) } -@@ -443,7 +455,7 @@ void V4L2CaptureDelegate::AllocateAndStart( +@@ -447,7 +459,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_)); -@@ -793,7 +805,7 @@ void V4L2CaptureDelegate::SetGPUEnvironmentForTesting( +@@ -797,7 +809,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) { -@@ -803,7 +815,7 @@ bool V4L2CaptureDelegate::RunIoctl(int request, void* +@@ -807,7 +819,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)); } -@@ -814,6 +826,7 @@ bool V4L2CaptureDelegate::IsControllableControl(int co +@@ -818,6 +830,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, -@@ -841,6 +854,7 @@ void V4L2CaptureDelegate::ReplaceControlEventSubscript +@@ -845,6 +858,7 @@ void V4L2CaptureDelegate::ReplaceControlEventSubscript << ", {type = V4L2_EVENT_CTRL, id = " << control_id << "}"; } } @@ -108,7 +108,7 @@ } mojom::RangePtr V4L2CaptureDelegate::RetrieveUserControlRange(int control_id) { -@@ -1021,7 +1035,11 @@ void V4L2CaptureDelegate::DoCapture() { +@@ -1025,7 +1039,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)); -@@ -1059,6 +1077,7 @@ void V4L2CaptureDelegate::DoCapture() { +@@ -1063,6 +1081,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; -@@ -1093,6 +1112,7 @@ void V4L2CaptureDelegate::DoCapture() { +@@ -1097,6 +1116,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) { -@@ -1146,7 +1166,7 @@ void V4L2CaptureDelegate::DoCapture() { +@@ -1150,7 +1170,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(), -@@ -1219,7 +1239,7 @@ void V4L2CaptureDelegate::SetErrorState(VideoCaptureEr +@@ -1223,7 +1243,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_video__capture__buffer__tracker__factory__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_video__capture__buffer__tracker__factory__impl.cc index bfa563fa7b66..e233efa20441 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_video__capture__buffer__tracker__factory__impl.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_video__capture__buffer__tracker__factory__impl.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/media/capture/video/video_capture_buffer_tracker_factory_impl.cc.orig 2023-09-13 12:11:42 UTC +--- src/3rdparty/chromium/media/capture/video/video_capture_buffer_tracker_factory_impl.cc.orig 2023-12-10 06:10:27 UTC +++ src/3rdparty/chromium/media/capture/video/video_capture_buffer_tracker_factory_impl.cc @@ -14,7 +14,7 @@ #include "media/capture/video/chromeos/gpu_memory_buffer_tracker_cros.h" @@ -8,8 +8,8 @@ +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "media/capture/video/linux/v4l2_gpu_memory_buffer_tracker.h" #elif BUILDFLAG(IS_WIN) - #include "media/capture/video/shared_memory_buffer_tracker.h" -@@ -43,7 +43,7 @@ VideoCaptureBufferTrackerFactoryImpl::CreateTracker( + #include "media/capture/video/win/gpu_memory_buffer_tracker_win.h" +@@ -42,7 +42,7 @@ VideoCaptureBufferTrackerFactoryImpl::CreateTracker( return std::make_unique(); #elif BUILDFLAG(IS_APPLE) return std::make_unique(); 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 842b9dda9100..05c0ce3cc494 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-07-16 15:47:57 UTC +--- 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 -@@ -149,7 +149,7 @@ FourccAndFlip GetFourccAndFlipFromPixelFormat( +@@ -150,7 +150,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_gpu_buffer__validation.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_buffer__validation.cc index 68e7cc0f92f2..3ea6a7bac46e 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_buffer__validation.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_buffer__validation.cc @@ -1,29 +1,46 @@ ---- src/3rdparty/chromium/media/gpu/buffer_validation.cc.orig 2023-05-31 08:12:17 UTC +--- src/3rdparty/chromium/media/gpu/buffer_validation.cc.orig 2024-02-23 21:04:38 UTC +++ src/3rdparty/chromium/media/gpu/buffer_validation.cc -@@ -15,7 +15,7 @@ +@@ -16,7 +16,7 @@ #include "ui/gfx/geometry/size.h" #include "ui/gfx/gpu_memory_buffer.h" -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #include #include #include - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -23,7 +23,7 @@ +@@ -29,7 +29,7 @@ namespace media { + namespace { +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #ifndef I915_FORMAT_MOD_4_TILED_MTL_MC_CCS + // TODO(b/271455200): Remove this definition once drm_fourcc.h contains it. + /* +@@ -55,7 +55,7 @@ bool IsIntelMediaCompressedModifier(uint64_t modifier) + } // namespace + bool GetFileSize(const int fd, size_t* size) { -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) if (fd < 0) { VLOG(1) << "Invalid file descriptor"; return false; -@@ -76,7 +76,7 @@ bool VerifyGpuMemoryBufferHandle( +@@ -109,14 +109,14 @@ bool VerifyGpuMemoryBufferHandle( VLOG(1) << "Unsupported: " << pixel_format; return false; } -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - const size_t num_planes = media::VideoFrame::NumPlanes(pixel_format); - if (num_planes != gmb_handle.native_pixmap_handle.planes.size() || - num_planes == 0) { + const uint64_t modifier = gmb_handle.native_pixmap_handle.modifier; + const bool is_intel_media_compressed_buffer = + IsIntelMediaCompressedModifier(modifier); + const bool is_intel_media_compression_enabled = + #if BUILDFLAG(IS_CHROMEOS) + base::FeatureList::IsEnabled(features::kEnableIntelMediaCompression); +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + false; + #endif + diff --git a/www/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 new file mode 100644 index 000000000000..d6e58ac07b83 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_chromeos_libyuv__image__processor__backend.cc @@ -0,0 +1,29 @@ +--- 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 +@@ -47,7 +47,7 @@ static constexpr struct { + #define CONV(in, out, trans, result) \ + {Fourcc::in, Fourcc::out, Transform::trans, SupportResult::result} + // Conversion. +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + CONV(NV12, AR24, kConversion, Supported), + #endif + CONV(NV12, NV12, kConversion, Supported), +@@ -430,7 +430,7 @@ int LibYUVImageProcessorBackend::DoConversion(const Vi + fr->GetWritableVisibleData(VideoFrame::kUVPlane)), \ + fr->stride(VideoFrame::kUVPlane) + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #define ARGB_DATA(fr) \ + fr->GetWritableVisibleData(VideoFrame::kARGBPlane), \ + fr->stride(VideoFrame::kARGBPlane) +@@ -573,7 +573,7 @@ int LibYUVImageProcessorBackend::DoConversion(const Vi + } + } + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (output->format() == PIXEL_FORMAT_ARGB) { + if (input_config_.fourcc == Fourcc(Fourcc::NV12)) { + return LIBYUV_FUNC(NV12ToARGB, Y_UV_DATA(input), diff --git a/www/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 new file mode 100644 index 000000000000..06d93c8691cb --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_chromeos_mailbox__video__frame__converter.cc @@ -0,0 +1,11 @@ +--- 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 +@@ -61,7 +61,7 @@ viz::SharedImageFormat GetSharedImageFormat(gfx::Buffe + << static_cast(buffer_format); + NOTREACHED_NORETURN(); + } +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // If format is true multiplanar format, we prefer external sampler on + // ChromeOS and Linux. + if (format.is_multi_plane()) { diff --git a/www/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 new file mode 100644 index 000000000000..2834f03ec3c5 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_chromeos_platform__video__frame__utils.cc @@ -0,0 +1,20 @@ +--- 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 +@@ -68,7 +68,7 @@ static std::unique_ptr CreateGbmDevice( + const base::FilePath dev_path(FILE_PATH_LITERAL( + base::StrCat({drm_node_file_prefix, base::NumberToString(i)}))); + +-#if BUILDFLAG(IS_LINUX) && BUILDFLAG(USE_V4L2_CODEC) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(USE_V4L2_CODEC) + const bool is_render_node = base::Contains(drm_node_file_prefix, "render"); + + // TODO(b/313513760): don't guard base::File::FLAG_WRITE behind +@@ -301,7 +301,7 @@ scoped_refptr CreateGpuMemoryBufferVideoFr + const bool is_intel_media_compression_enabled = + #if BUILDFLAG(IS_CHROMEOS) + base::FeatureList::IsEnabled(features::kEnableIntelMediaCompression); +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + false; + #endif + diff --git a/www/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 2a6874c36898..1274930b6a3c 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,8 +1,8 @@ ---- src/3rdparty/chromium/media/gpu/chromeos/video_decoder_pipeline.cc.orig 2023-10-11 18:22:24 UTC +--- 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 -@@ -1026,14 +1026,14 @@ VideoDecoderPipeline::PickDecoderOutputFormat( - } +@@ -1009,14 +1009,14 @@ VideoDecoderPipeline::PickDecoderOutputFormat( } + #endif -#if BUILDFLAG(IS_LINUX) && BUILDFLAG(USE_VAAPI) +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(USE_VAAPI) @@ -17,7 +17,7 @@ // Linux w/ V4L2 should not use a custom allocator // Only tested with video_decode_accelerator_tests // TODO(wenst@) Test with full Chromium Browser -@@ -1170,7 +1170,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( +@@ -1158,7 +1158,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( << " VideoFrames"; auxiliary_frame_pool_->set_parent_task_runner(decoder_task_runner_); 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 541298f16108..b1cdfb439f88 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,6 +1,6 @@ ---- src/3rdparty/chromium/media/gpu/vaapi/vaapi_video_decoder.cc.orig 2023-12-12 22:08:45 UTC +--- 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 -@@ -782,7 +782,7 @@ void VaapiVideoDecoder::ApplyResolutionChangeWithScree +@@ -792,7 +792,7 @@ void VaapiVideoDecoder::ApplyResolutionChangeWithScree const gfx::Size decoder_natural_size = aspect_ratio_.GetNaturalSize(decoder_visible_rect); 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 78386389a125..7a9f0b5a9ebe 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 2023-10-11 18:22:24 UTC +--- 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 -@@ -70,7 +70,7 @@ +@@ -66,7 +66,7 @@ using media_gpu_vaapi::kModuleVa_prot; #endif @@ -9,48 +9,3 @@ #include "base/files/file_util.h" #include "base/strings/string_split.h" #endif -@@ -1441,7 +1441,7 @@ bool IsVBREncodingSupported(VAProfile va_profile) { - return VASupportedProfiles::Get().IsProfileSupported(mode, va_profile); - } - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // Some VA-API drivers (vdpau-va-driver) will crash if used with VA/DRM on - // NVIDIA GPUs. This function checks if such drivers are present. - bool IsBrokenNvidiaVaapiDriverPresent() { -@@ -1502,7 +1502,7 @@ void VADisplayStateSingleton::PreSandboxInitialization - VADisplayStateSingleton& va_display_state = GetInstance(); - base::AutoLock lock(va_display_state.lock_); - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - std::string va_driver_name; - auto env = base::Environment::Create(); - if (env->GetVar("LIBVA_DRIVER_NAME", &va_driver_name) && -@@ -1539,7 +1539,7 @@ void VADisplayStateSingleton::PreSandboxInitialization - if (base::EqualsCaseInsensitiveASCII(version_name, "vgem")) { - continue; - } --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // Skip NVIDIA GPUs if the VA-API driver used for them is known for crashing - // with VA/DRM. - if (is_nvidia_va_drm_broken && -@@ -1572,7 +1572,7 @@ VADisplayStateHandle VADisplayStateSingleton::GetHandl - return {}; - } - --#if BUILDFLAG(IS_OZONE) && BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_OZONE) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) - // TODO(crbug.com/1116701): add vaapi support for other Ozone platforms on - // Linux. See comment in OzonePlatform::PlatformProperties::supports_vaapi - // for more details. This will also require revisiting everything that's -@@ -2403,7 +2403,7 @@ scoped_refptr VaapiWrapper::CreateVASurface - return nullptr; - } - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // TODO(crbug.com/1326754): enable use DRIME_PRIME_2 API on Linux with the - // iHD driver. - const bool use_drm_prime_2 = false; 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 737749461c1f..bee30638ac59 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,6 +1,6 @@ ---- src/3rdparty/chromium/media/media_options.gni.orig 2023-12-12 22:08:45 UTC +--- src/3rdparty/chromium/media/media_options.gni.orig 2024-10-02 15:40:01 UTC +++ src/3rdparty/chromium/media/media_options.gni -@@ -189,12 +189,15 @@ declare_args() { +@@ -202,12 +202,15 @@ declare_args() { # Enables runtime selection of ALSA library for audio. use_alsa = false @@ -17,7 +17,7 @@ (!is_castos || (target_cpu == "x86" || target_cpu == "x64") || is_cast_audio_only)) { use_alsa = true -@@ -210,6 +213,10 @@ declare_args() { +@@ -223,6 +226,10 @@ declare_args() { if (!use_cras && !is_castos && !is_asan && !is_tsan) { use_pulseaudio = true } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_video_fake__gpu__memory__buffer.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_video_fake__gpu__memory__buffer.cc index 6ec1a163f695..73f93b684389 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_video_fake__gpu__memory__buffer.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_video_fake__gpu__memory__buffer.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/media/video/fake_gpu_memory_buffer.cc.orig 2022-02-28 16:54:41 UTC +--- src/3rdparty/chromium/media/video/fake_gpu_memory_buffer.cc.orig 2024-02-23 21:04:38 UTC +++ src/3rdparty/chromium/media/video/fake_gpu_memory_buffer.cc @@ -9,7 +9,7 @@ #include "media/base/format_utils.h" @@ -27,7 +27,7 @@ for (size_t i = 0; i < VideoFrame::NumPlanes(video_pixel_format_); i++) { const gfx::Size plane_size_in_bytes = VideoFrame::PlaneSize(video_pixel_format_, i, size_); -@@ -134,7 +134,7 @@ gfx::GpuMemoryBufferHandle FakeGpuMemoryBuffer::CloneH +@@ -132,7 +132,7 @@ gfx::GpuMemoryBufferHandle FakeGpuMemoryBuffer::CloneH gfx::GpuMemoryBufferHandle handle; handle.type = gfx::NATIVE_PIXMAP; handle.id = handle_.id; 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 7330db5c2cd0..5153aad2197d 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,6 @@ ---- src/3rdparty/chromium/media/video/gpu_memory_buffer_video_frame_pool.cc.orig 2023-10-11 18:22:24 UTC +--- 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 -@@ -727,7 +727,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa +@@ -803,7 +803,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa } bool is_software_backed_video_frame = !video_frame->HasTextures(); @@ -9,7 +9,7 @@ is_software_backed_video_frame &= !video_frame->HasDmaBufs(); #endif -@@ -1199,7 +1199,7 @@ scoped_refptr GpuMemoryBufferVideoFramePoo +@@ -1285,7 +1285,7 @@ scoped_refptr GpuMemoryBufferVideoFramePoo } #endif @@ -18,7 +18,7 @@ is_webgpu_compatible = (gpu_memory_buffer != nullptr); if (is_webgpu_compatible) { is_webgpu_compatible &= -@@ -1218,7 +1218,7 @@ scoped_refptr GpuMemoryBufferVideoFramePoo +@@ -1305,7 +1305,7 @@ scoped_refptr GpuMemoryBufferVideoFramePoo gpu::SHARED_IMAGE_USAGE_DISPLAY_READ | gpu::SHARED_IMAGE_USAGE_SCANOUT; 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 035aa5896513..fc5a713014cf 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 2023-09-13 12:11:42 UTC +--- 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 -@@ -140,7 +140,7 @@ VideoEncodeAccelerator::Config SetUpVeaConfig( +@@ -154,7 +154,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 -@@ -465,7 +465,7 @@ void VideoEncodeAcceleratorAdapter::InitializeInternal +@@ -479,7 +479,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_mojo_public_c_system_thunks.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_mojo_public_c_system_thunks.cc index 66cd31a21d90..d64bb4466ba0 100644 --- 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 @@ -1,14 +1,14 @@ ---- src/3rdparty/chromium/mojo/public/c/system/thunks.cc.orig 2022-11-30 08:12:58 UTC +--- 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 -@@ -23,7 +23,7 @@ +@@ -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" - #include "base/scoped_native_library.h" @@ -72,7 +72,7 @@ class CoreLibraryInitializer { MojoResult LoadLibrary(base::FilePath library_path) { @@ -33,6 +33,6 @@ #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \ - BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - absl::optional library_; + 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 da3560fe7f91..9413f904912e 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 2023-09-13 12:11:42 UTC +--- 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 -@@ -743,6 +743,16 @@ template("mojom") { +@@ -748,6 +748,16 @@ template("mojom") { enabled_features += [ "is_apple" ] } 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 b35ef2592495..db42c6487a4c 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,4 +1,4 @@ ---- src/3rdparty/chromium/net/BUILD.gn.orig 2023-12-12 22:08:45 UTC +--- src/3rdparty/chromium/net/BUILD.gn.orig 2024-07-03 01:14:49 UTC +++ src/3rdparty/chromium/net/BUILD.gn @@ -126,7 +126,7 @@ net_configs = [ "//build/config/compiler:wexit_time_destructors", @@ -9,8 +9,8 @@ net_configs += [ "//build/config/linux:libresolv" ] } -@@ -1255,6 +1255,19 @@ component("net") { - deps += [ "//third_party/xdg_shared_mime_info" ] +@@ -1183,6 +1183,19 @@ component("net") { + ] } + if (is_bsd) { @@ -29,7 +29,7 @@ if (is_mac) { sources += [ "base/network_notification_thread_mac.cc", -@@ -1410,7 +1423,7 @@ component("net") { +@@ -1340,7 +1353,7 @@ component("net") { } # Use getifaddrs() on POSIX platforms, except Linux. @@ -38,7 +38,7 @@ sources += [ "base/network_interfaces_getifaddrs.cc", "base/network_interfaces_getifaddrs.h", -@@ -2905,7 +2918,7 @@ test("net_unittests") { +@@ -2810,7 +2823,7 @@ test("net_unittests") { ] } @@ -47,9 +47,9 @@ sources += [ "base/address_tracker_linux_unittest.cc", "base/network_interfaces_linux_unittest.cc", -@@ -2973,6 +2986,10 @@ test("net_unittests") { - "//url:buildflags", - ] +@@ -2898,6 +2911,10 @@ test("net_unittests") { + ] + } + if (is_bsd) { + deps += [ "//sandbox/policy" ] @@ -58,7 +58,7 @@ if (enable_websockets) { deps += [ "//net/server:tests" ] } -@@ -3055,7 +3072,7 @@ test("net_unittests") { +@@ -2968,7 +2985,7 @@ test("net_unittests") { ] } @@ -67,7 +67,7 @@ sources += [ "tools/quic/quic_simple_server_test.cc" ] } -@@ -3190,7 +3207,7 @@ test("net_unittests") { +@@ -3103,7 +3120,7 @@ test("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 f9d3da04f73d..401d54661280 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,11 +1,15 @@ ---- src/3rdparty/chromium/net/base/features.cc.orig 2023-12-12 22:08:45 UTC +--- src/3rdparty/chromium/net/base/features.cc.orig 2024-07-03 01:14:49 UTC +++ src/3rdparty/chromium/net/base/features.cc -@@ -181,7 +181,7 @@ BASE_FEATURE(kChromeRootStoreUsed, - #if BUILDFLAG(CHROME_ROOT_STORE_OPTIONAL) - BASE_FEATURE(kChromeRootStoreUsed, - "ChromeRootStoreUsed", --#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) -+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) - base::FEATURE_ENABLED_BY_DEFAULT - #else - base::FEATURE_DISABLED_BY_DEFAULT +@@ -508,7 +508,12 @@ BASE_FEATURE(kSpdyHeadersToHttpResponseUseBuilder, + "SpdyHeadersToHttpResponseUseBuilder", + base::FEATURE_DISABLED_BY_DEFAULT); + ++#if BUILDFLAG(IS_OPENBSD) ++// No IP_RECVTOS support + BASE_FEATURE(kReceiveEcn, "ReceiveEcn", base::FEATURE_DISABLED_BY_DEFAULT); ++#else ++BASE_FEATURE(kReceiveEcn, "ReceiveEcn", base::FEATURE_DISABLED_BY_DEFAULT); ++#endif + + // TODO(crbug.com/634470): Remove this feature flag in January 2024 if the new + // limit sticks. diff --git a/www/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 54dd12bf63a8..78e17cdc4f1b 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,9 +1,9 @@ ---- src/3rdparty/chromium/net/base/network_change_notifier.cc.orig 2023-05-31 08:12:17 UTC +--- 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 @@ -37,7 +37,7 @@ #include "net/base/network_change_notifier_linux.h" #elif BUILDFLAG(IS_APPLE) - #include "net/base/network_change_notifier_mac.h" + #include "net/base/network_change_notifier_apple.h" -#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) +#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) #include "net/base/network_change_notifier_passive.h" diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_cert_cert__verifier.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_cert_cert__verifier.cc deleted file mode 100644 index 49de64966dff..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_cert_cert__verifier.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/net/cert/cert_verifier.cc.orig 2023-05-31 08:12:17 UTC -+++ src/3rdparty/chromium/net/cert/cert_verifier.cc -@@ -40,7 +40,7 @@ class DefaultCertVerifyProcFactory : public net::CertV - return CertVerifyProc::CreateBuiltinWithChromeRootStore( - std::move(cert_net_fetcher), impl_params.crl_set, - base::OptionalToPtr(impl_params.root_store_data)); --#elif BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#elif BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - return CertVerifyProc::CreateBuiltinVerifyProc(std::move(cert_net_fetcher), - impl_params.crl_set); - #else diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_cert_cert__verify__proc.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_cert_cert__verify__proc.cc deleted file mode 100644 index 99e797965813..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_cert_cert__verify__proc.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/net/cert/cert_verify_proc.cc.orig 2023-05-31 08:12:17 UTC -+++ src/3rdparty/chromium/net/cert/cert_verify_proc.cc -@@ -409,7 +409,7 @@ base::Value::Dict CertVerifyParams( - - } // namespace - --#if !(BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || \ -+#if !(BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(CHROME_ROOT_STORE_ONLY)) - // static - scoped_refptr CertVerifyProc::CreateSystemVerifyProc( 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 9946d7f3a1f4..44428363d94a 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 2023-08-17 07:33:31 UTC +--- 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 -@@ -79,7 +79,7 @@ class NET_EXPORT CertVerifyProc +@@ -145,7 +145,7 @@ class NET_EXPORT CertVerifyProc kMaxValue = kChainLengthOne }; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_cert_pki_general__names.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_cert_pki_general__names.h deleted file mode 100644 index 3beddde56ec9..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_cert_pki_general__names.h +++ /dev/null @@ -1,10 +0,0 @@ ---- src/3rdparty/chromium/net/cert/pki/general_names.h.orig 2023-12-12 22:08:45 UTC -+++ src/3rdparty/chromium/net/cert/pki/general_names.h -@@ -8,6 +8,7 @@ - #include - #include - #include -+#include - - #include "net/base/net_export.h" - #include "net/cert/pki/cert_error_id.h" 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 3617747ac2ba..b63013bddcaf 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 2023-08-17 07:33:31 UTC +--- src/3rdparty/chromium/net/dns/BUILD.gn.orig 2024-07-03 01:14:49 UTC +++ src/3rdparty/chromium/net/dns/BUILD.gn -@@ -128,7 +128,7 @@ source_set("dns") { +@@ -134,7 +134,7 @@ source_set("dns") { "dns_config_service_android.cc", "dns_config_service_android.h", ] @@ -9,26 +9,16 @@ sources += [ "dns_config_service_linux.cc", "dns_config_service_linux.h", -@@ -162,6 +162,9 @@ source_set("dns") { - } - - deps = [ "//net:net_deps" ] -+ if (is_bsd) { -+ deps += [ "//components/services/screen_ai/buildflags" ] -+ } - - public_deps = [ - ":dns_client", -@@ -169,6 +172,7 @@ source_set("dns") { +@@ -175,6 +175,7 @@ source_set("dns") { ":host_resolver_manager", ":mdns_client", "//net:net_public_deps", + "//printing/buildflags", ] - + allow_circular_includes_from = [ -@@ -436,9 +440,9 @@ source_set("tests") { - +@@ -440,9 +441,9 @@ source_set("tests") { + if (is_android) { sources += [ "dns_config_service_android_unittest.cc" ] - } else if (is_linux) { @@ -38,4 +28,4 @@ + } else if (is_posix && !is_bsd) { sources += [ "dns_config_service_posix_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 645bc6db9596..5d147be62e98 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 2023-09-29 10:14:06 UTC +--- src/3rdparty/chromium/net/dns/address_info.cc.orig 2024-02-23 21:04:38 UTC +++ src/3rdparty/chromium/net/dns/address_info.cc -@@ -77,8 +77,12 @@ AddressInfo::AddressInfoAndResult AddressInfo::Get( +@@ -78,8 +78,12 @@ AddressInfo::AddressInfoAndResult AddressInfo::Get( // error. // http://crbug.com/134142 err = ERR_NAME_NOT_RESOLVED; diff --git a/www/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 ebd3292f4857..c397076cb596 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 2022-10-24 13:33:33 UTC +--- src/3rdparty/chromium/net/dns/public/BUILD.gn.orig 2023-11-03 10:09:45 UTC +++ src/3rdparty/chromium/net/dns/public/BUILD.gn -@@ -76,7 +76,7 @@ source_set("tests") { +@@ -77,7 +77,7 @@ source_set("tests") { "doh_provider_entry_unittest.cc", ] diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_public_scoped__res__state.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_public_scoped__res__state.h index cb41d167b23e..8eb3b329ed67 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_public_scoped__res__state.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_public_scoped__res__state.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/net/dns/public/scoped_res_state.h.orig 2022-02-28 16:54:41 UTC +--- src/3rdparty/chromium/net/dns/public/scoped_res_state.h.orig 2024-02-23 21:04:38 UTC +++ src/3rdparty/chromium/net/dns/public/scoped_res_state.h @@ -5,6 +5,7 @@ #ifndef NET_DNS_PUBLIC_SCOPED_RES_STATE_H_ @@ -7,4 +7,4 @@ +#include #include - #include "build/build_config.h" + #include 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 a9af59c8661f..b842ea9b7696 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,4 +1,4 @@ ---- src/3rdparty/chromium/net/proxy_resolution/proxy_config_service_linux.cc.orig 2023-05-31 08:12:17 UTC +--- 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 @@ -6,7 +6,9 @@ @@ -10,7 +10,7 @@ #include #include -@@ -504,6 +506,7 @@ bool SettingGetterImplGSettings::CheckVersion( +@@ -505,6 +507,7 @@ bool SettingGetterImplGSettings::CheckVersion( } #endif // defined(USE_GIO) @@ -18,7 +18,7 @@ // Converts |value| from a decimal string to an int. If there was a failure // parsing, returns |default_value|. int StringToIntOrDefault(base::StringPiece value, int default_value) { -@@ -1032,6 +1035,7 @@ class SettingGetterImplKDE : public ProxyConfigService +@@ -1033,6 +1036,7 @@ class SettingGetterImplKDE : public ProxyConfigService // events on. scoped_refptr file_task_runner_; }; @@ -26,7 +26,7 @@ } // namespace -@@ -1249,9 +1253,11 @@ ProxyConfigServiceLinux::Delegate::Delegate( +@@ -1251,9 +1255,11 @@ ProxyConfigServiceLinux::Delegate::Delegate( case base::nix::DESKTOP_ENVIRONMENT_KDE4: case base::nix::DESKTOP_ENVIRONMENT_KDE5: case base::nix::DESKTOP_ENVIRONMENT_KDE6: diff --git a/www/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 68a680130778..a7a8da6eb5f2 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,6 +1,16 @@ ---- src/3rdparty/chromium/net/socket/udp_socket_posix.cc.orig 2023-07-16 15:47:57 UTC +--- 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 -@@ -591,7 +591,7 @@ int UDPSocketPosix::SetDoNotFragment() { +@@ -592,12 +592,17 @@ int UDPSocketPosix::SetRecvEcn() { + } + } + ++#ifdef IP_RECVTOS + int rv = setsockopt(socket_, IPPROTO_IP, IP_RECVTOS, &ecn, sizeof(ecn)); ++#else ++ int rv = -1; ++ errno = EOPNOTSUPP; ++#endif + return rv == 0 ? OK : MapSystemError(errno); } void UDPSocketPosix::SetMsgConfirm(bool confirm) { @@ -9,7 +19,7 @@ if (confirm) { sendto_flags_ |= MSG_CONFIRM; } else { -@@ -612,7 +612,7 @@ int UDPSocketPosix::SetBroadcast(bool broadcast) { +@@ -618,7 +623,7 @@ int UDPSocketPosix::SetBroadcast(bool broadcast) { DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); int value = broadcast ? 1 : 0; int rv; @@ -18,7 +28,7 @@ // SO_REUSEPORT on OSX permits multiple processes to each receive // UDP multicast or broadcast datagrams destined for the bound // port. -@@ -925,7 +925,7 @@ int UDPSocketPosix::DoBind(const IPEndPoint& address) +@@ -931,7 +936,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_third__party_quiche_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_third__party_quiche_BUILD.gn index cff74e16d5e5..98ddd74ef682 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_third__party_quiche_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_third__party_quiche_BUILD.gn @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/net/third_party/quiche/BUILD.gn.orig 2022-11-30 08:12:58 UTC +--- src/3rdparty/chromium/net/third_party/quiche/BUILD.gn.orig 2023-11-03 10:09:45 UTC +++ src/3rdparty/chromium/net/third_party/quiche/BUILD.gn -@@ -28,7 +28,7 @@ import("//build/config/chromeos/ui_mode.gni") +@@ -29,7 +29,7 @@ import("//net/third_party/quiche/src/build/source_list import("//testing/libfuzzer/fuzzer_test.gni") import("//third_party/protobuf/proto_library.gni") diff --git a/www/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 index c715ee91ed28..fd13d1a1de1f 100644 --- 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 @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/net/tools/cert_verify_tool/cert_verify_comparision_tool.cc.orig 2023-05-31 08:12:17 UTC +--- 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" @@ -18,7 +18,7 @@ // On Linux, use a fixed ProxyConfigService, since the default one // depends on glib. // -@@ -126,7 +126,7 @@ class CertVerifyImpl { +@@ -123,7 +123,7 @@ class CertVerifyImpl { std::unique_ptr CreateCertVerifyImplFromName( base::StringPiece impl_name, scoped_refptr cert_net_fetcher) { 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 4d2b90081384..7f55892e0c28 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,15 +1,15 @@ ---- src/3rdparty/chromium/net/tools/cert_verify_tool/cert_verify_tool.cc.orig 2023-05-31 08:12:17 UTC +--- 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 -@@ -31,7 +31,7 @@ - #include "net/url_request/url_request_context_builder.h" - #include "net/url_request/url_request_context_getter.h" +@@ -33,7 +33,7 @@ + #include "third_party/boringssl/src/pki/trust_store.h" + #include "third_party/boringssl/src/pki/trust_store_collection.h" -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "net/proxy_resolution/proxy_config.h" #include "net/proxy_resolution/proxy_config_service_fixed.h" #endif -@@ -61,7 +61,7 @@ void SetUpOnNetworkThread( +@@ -65,7 +65,7 @@ void SetUpOnNetworkThread( base::WaitableEvent* initialization_complete_event) { net::URLRequestContextBuilder url_request_context_builder; url_request_context_builder.set_user_agent(GetUserAgent()); @@ -18,16 +18,7 @@ // On Linux, use a fixed ProxyConfigService, since the default one // depends on glib. // -@@ -223,7 +223,7 @@ std::unique_ptr CreateCertVerifyImplFr - scoped_refptr cert_net_fetcher, - scoped_refptr crl_set, - RootStoreType root_store_type) { --#if !(BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || \ -+#if !(BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(CHROME_ROOT_STORE_ONLY)) - if (impl_name == "platform") { - if (root_store_type != RootStoreType::kSystem) { -@@ -537,7 +537,7 @@ int main(int argc, char** argv) { +@@ -566,7 +566,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_url__request_url__request__context.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_url__request_url__request__context.cc index f4330b86cbaf..fb2066f66c81 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,6 +1,6 @@ ---- src/3rdparty/chromium/net/url_request/url_request_context.cc.orig 2023-01-11 09:17:16 UTC +--- 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 -@@ -109,7 +109,7 @@ const HttpNetworkSessionContext* URLRequestContext::Ge +@@ -117,7 +117,7 @@ const HttpNetworkSessionContext* URLRequestContext::Ge // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. #if !BUILDFLAG(IS_WIN) && \ diff --git a/www/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 4dfeee5c61ad..2480018fda35 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,6 +1,6 @@ ---- src/3rdparty/chromium/net/url_request/url_request_context.h.orig 2023-01-11 09:17:16 UTC +--- 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 -@@ -86,7 +86,7 @@ class NET_EXPORT URLRequestContext final { +@@ -85,7 +85,7 @@ class NET_EXPORT URLRequestContext final { // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. #if !BUILDFLAG(IS_WIN) && \ diff --git a/www/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 1d82ab2392fc..60599c4dd5fc 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 2023-10-11 18:22:24 UTC +--- 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 -@@ -446,7 +446,7 @@ std::unique_ptr URLRequestContextBu +@@ -434,7 +434,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 7bfd41e35275..09d25d29fb11 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 2023-08-17 07:33:31 UTC +--- src/3rdparty/chromium/pdf/pdfium/pdfium_engine.cc.orig 2024-02-23 21:04:38 UTC +++ src/3rdparty/chromium/pdf/pdfium/pdfium_engine.cc -@@ -83,7 +83,7 @@ +@@ -85,7 +85,7 @@ #include "gin/public/cppgc.h" #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_mojom_printing__context__mojom__traits.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_mojom_printing__context__mojom__traits.cc index 5e70a52bef9b..613fd337eaaf 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_mojom_printing__context__mojom__traits.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_mojom_printing__context__mojom__traits.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/printing/mojom/printing_context_mojom_traits.cc.orig 2023-10-11 18:22:24 UTC +--- src/3rdparty/chromium/printing/mojom/printing_context_mojom_traits.cc.orig 2023-11-03 10:09:45 UTC +++ src/3rdparty/chromium/printing/mojom/printing_context_mojom_traits.cc @@ -19,7 +19,7 @@ #include "base/numerics/safe_conversions.h" @@ -18,12 +18,12 @@ DCHECK(out->advanced_settings().empty()); if (!data.ReadAdvancedSettings(&out->advanced_settings())) return false; -@@ -239,7 +239,7 @@ bool StructTraits< +@@ -238,7 +238,7 @@ bool StructTraits< + if (system_print_dialog_data.size() != dictionary_entries) { return false; } - -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // The dictionary must contain three strings. - base::Value* value = system_print_dialog_data.Find( + const base::Value* value = system_print_dialog_data.Find( printing::kLinuxSystemPrintDialogDataPrinter); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_printing__context__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_printing__context__linux.cc index 948fad7aa10e..85bc9279fa3c 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_printing__context__linux.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_printing__context__linux.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/printing/printing_context_linux.cc.orig 2023-10-11 18:22:24 UTC +--- src/3rdparty/chromium/printing/printing_context_linux.cc.orig 2023-12-10 06:10:27 UTC +++ src/3rdparty/chromium/printing/printing_context_linux.cc @@ -23,7 +23,7 @@ #endif @@ -9,7 +9,7 @@ #include "ui/linux/linux_ui.h" #endif -@@ -72,7 +72,7 @@ mojom::ResultCode PrintingContextLinux::UseDefaultSett +@@ -68,7 +68,7 @@ mojom::ResultCode PrintingContextLinux::UseDefaultSett ResetSettings(); @@ -18,7 +18,7 @@ if (!ui::LinuxUi::instance()) return mojom::ResultCode::kSuccess; -@@ -88,7 +88,7 @@ mojom::ResultCode PrintingContextLinux::UseDefaultSett +@@ -84,7 +84,7 @@ mojom::ResultCode PrintingContextLinux::UseDefaultSett } gfx::Size PrintingContextLinux::GetPdfPaperSizeDeviceUnits() { @@ -27,7 +27,7 @@ if (ui::LinuxUi::instance()) return ui::LinuxUi::instance()->GetPdfPaperSize(this); #endif -@@ -101,7 +101,7 @@ mojom::ResultCode PrintingContextLinux::UpdatePrinterS +@@ -97,7 +97,7 @@ mojom::ResultCode PrintingContextLinux::UpdatePrinterS DCHECK(!printer_settings.show_system_dialog); DCHECK(!in_print_job_); 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 2d970ec34ee7..6a194dad400e 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,15 +1,15 @@ ---- src/3rdparty/chromium/sandbox/policy/BUILD.gn.orig 2023-08-17 07:33:31 UTC +--- src/3rdparty/chromium/sandbox/policy/BUILD.gn.orig 2024-02-23 21:04:38 UTC +++ src/3rdparty/chromium/sandbox/policy/BUILD.gn -@@ -35,7 +35,7 @@ component("policy") { - "//sandbox/policy/mojom", - ] - public_deps = [ "//sandbox:common" ] +@@ -49,7 +49,7 @@ component("policy") { + "//third_party/jni_zero", + ] + } - if (is_linux || is_chromeos) { + if ((is_linux || is_chromeos) && !is_bsd) { sources += [ "linux/bpf_audio_policy_linux.cc", "linux/bpf_audio_policy_linux.h", -@@ -106,6 +106,27 @@ component("policy") { +@@ -120,6 +120,27 @@ component("policy") { "//sandbox/linux:sandbox_services", "//sandbox/linux:seccomp_bpf", "//sandbox/linux:suid_sandbox_client", diff --git a/www/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 b5c11fdb5f0b..7a1563355551 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,6 +1,6 @@ ---- src/3rdparty/chromium/sandbox/policy/features.cc.orig 2023-10-11 18:22:24 UTC +--- src/3rdparty/chromium/sandbox/policy/features.cc.orig 2024-01-30 07:53:34 UTC +++ src/3rdparty/chromium/sandbox/policy/features.cc -@@ -19,7 +19,11 @@ namespace sandbox::policy::features { +@@ -20,7 +20,11 @@ namespace sandbox::policy::features { // (Only causes an effect when feature kNetworkServiceInProcess is disabled.) BASE_FEATURE(kNetworkServiceSandbox, "NetworkServiceSandbox", @@ -12,3 +12,12 @@ #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); + #endif // BUILDFLAG(IS_CHROMEOS_ASH) + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + // Enabling the kNetworkServiceSandbox feature automatically enables Spectre + // variant 2 mitigations in the network service. This can lead to performance + // regressions, so enabling this feature will turn off the Spectre Variant 2 diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_features.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_features.h new file mode 100644 index 000000000000..0e361f7a5beb --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_features.h @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/sandbox/policy/features.h.orig 2024-01-30 07:53:34 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); + #endif // BUILDFLAG(IS_CHROMEOS_ASH) + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + SANDBOX_POLICY_EXPORT BASE_DECLARE_FEATURE( + kForceDisableSpectreVariant2MitigationInNetworkService); + diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_freebsd_sandbox__freebsd.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_freebsd_sandbox__freebsd.h index bf58da39099d..63c091d8eaab 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_freebsd_sandbox__freebsd.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_freebsd_sandbox__freebsd.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/sandbox/policy/freebsd/sandbox_freebsd.h.orig 2023-12-22 15:04:02 UTC +--- src/3rdparty/chromium/sandbox/policy/freebsd/sandbox_freebsd.h.orig 2022-11-30 08:12:58 UTC +++ src/3rdparty/chromium/sandbox/policy/freebsd/sandbox_freebsd.h @@ -0,0 +1,278 @@ +// Copyright (c) 2012 The Chromium Authors. All rights reserved. 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 39ac0d6e34b4..921f2fea6386 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-07-16 15:47:57 UTC +--- src/3rdparty/chromium/sandbox/policy/mojom/sandbox.mojom.orig 2023-12-10 06:10:27 UTC +++ src/3rdparty/chromium/sandbox/policy/mojom/sandbox.mojom -@@ -72,6 +72,12 @@ enum Sandbox { +@@ -77,6 +77,12 @@ enum Sandbox { [EnableIf=is_fuchsia] kVideoCapture, diff --git a/www/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 3adb46cdb0a8..ae57f59a4132 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 2023-04-28 17:01:32 UTC +--- src/3rdparty/chromium/sandbox/policy/sandbox.cc.orig 2024-02-23 21:04:38 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) -@@ -31,7 +35,7 @@ +@@ -33,7 +37,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 a9c05cd93b7d..551032ad6c21 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-07-16 15:47:57 UTC +--- src/3rdparty/chromium/sandbox/policy/sandbox_type.cc.orig 2023-12-10 06:10:27 UTC +++ src/3rdparty/chromium/sandbox/policy/sandbox_type.cc @@ -38,7 +38,7 @@ bool IsUnsandboxedSandboxType(Sandbox sandbox_type) { #endif @@ -9,7 +9,7 @@ case Sandbox::kVideoCapture: return false; #endif -@@ -61,7 +61,7 @@ bool IsUnsandboxedSandboxType(Sandbox sandbox_type) { +@@ -63,7 +63,7 @@ bool IsUnsandboxedSandboxType(Sandbox sandbox_type) { case Sandbox::kMirroring: case Sandbox::kNaClLoader: #endif @@ -18,7 +18,7 @@ case Sandbox::kHardwareVideoDecoding: #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -71,7 +71,7 @@ bool IsUnsandboxedSandboxType(Sandbox sandbox_type) { +@@ -73,7 +73,7 @@ bool IsUnsandboxedSandboxType(Sandbox sandbox_type) { case Sandbox::kLibassistant: #endif // BUILDFLAG(ENABLE_CROS_LIBASSISTANT) #endif // // BUILDFLAG(IS_CHROMEOS_ASH) @@ -27,7 +27,7 @@ case Sandbox::kZygoteIntermediateSandbox: case Sandbox::kHardwareVideoEncoding: #endif -@@ -127,7 +127,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi +@@ -130,7 +130,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi #endif case Sandbox::kPrintCompositor: case Sandbox::kAudio: @@ -36,7 +36,7 @@ case Sandbox::kVideoCapture: #endif #if BUILDFLAG(IS_WIN) -@@ -138,10 +138,10 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi +@@ -141,10 +141,10 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi case Sandbox::kMediaFoundationCdm: case Sandbox::kWindowsSystemProxyResolver: #endif // BUILDFLAG(IS_WIN) @@ -49,7 +49,7 @@ case Sandbox::kHardwareVideoEncoding: #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -169,7 +169,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi +@@ -172,7 +172,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi case Sandbox::kNaClLoader: break; #endif // BUILDFLAG(IS_MAC) @@ -59,15 +59,15 @@ break; #endif @@ -216,7 +216,7 @@ sandbox::mojom::Sandbox SandboxTypeFromCommandLine( - if (process_type == switches::kNaClBrokerProcess) - return Sandbox::kNoSandbox; + #endif + } -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Intermediate process gains a sandbox later. if (process_type == switches::kZygoteProcessType) return Sandbox::kZygoteIntermediateSandbox; -@@ -260,7 +260,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb +@@ -262,7 +262,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb return switches::kUtilitySandbox; case Sandbox::kAudio: return switches::kAudioSandbox; @@ -76,7 +76,7 @@ case Sandbox::kVideoCapture: return switches::kVideoCaptureSandbox; #endif -@@ -290,11 +290,11 @@ std::string StringFromUtilitySandboxType(Sandbox sandb +@@ -292,11 +292,11 @@ std::string StringFromUtilitySandboxType(Sandbox sandb case Sandbox::kMirroring: return switches::kMirroringSandbox; #endif @@ -90,7 +90,7 @@ case Sandbox::kHardwareVideoEncoding: return switches::kHardwareVideoEncodingSandbox; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -314,7 +314,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb +@@ -316,7 +316,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb #if BUILDFLAG(IS_MAC) case Sandbox::kNaClLoader: #endif // BUILDFLAG(IS_MAC) @@ -99,7 +99,7 @@ case Sandbox::kZygoteIntermediateSandbox: #endif NOTREACHED(); -@@ -382,11 +382,11 @@ sandbox::mojom::Sandbox UtilitySandboxTypeFromString( +@@ -388,11 +388,11 @@ sandbox::mojom::Sandbox UtilitySandboxTypeFromString( if (sandbox_string == switches::kScreenAISandbox) return Sandbox::kScreenAI; #endif diff --git a/www/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 90b08ff08439..97e156d3e29c 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-07-16 15:47:57 UTC +--- src/3rdparty/chromium/sandbox/policy/switches.cc.orig 2023-12-10 06:10:27 UTC +++ src/3rdparty/chromium/sandbox/policy/switches.cc -@@ -53,10 +53,10 @@ const char kWindowsSystemProxyResolverSandbox[] = "pro +@@ -54,10 +54,10 @@ const char kWindowsSystemProxyResolverSandbox[] = "pro const char kMirroringSandbox[] = "mirroring"; #endif // BUILDFLAG(IS_MAC) @@ -13,7 +13,7 @@ const char kHardwareVideoEncodingSandbox[] = "hardware_video_encoding"; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -95,7 +95,9 @@ const char kGpuSandboxFailuresFatal[] = "gpu-sandbox-f +@@ -96,7 +96,9 @@ const char kGpuSandboxFailuresFatal[] = "gpu-sandbox-f // Meant to be used as a browser-level switch for testing purposes only. const char kNoSandbox[] = "no-sandbox"; diff --git a/www/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 592df44c1c2b..95c85fb8df49 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-07-16 15:47:57 UTC +--- src/3rdparty/chromium/sandbox/policy/switches.h.orig 2023-12-10 06:10:27 UTC +++ src/3rdparty/chromium/sandbox/policy/switches.h -@@ -56,10 +56,10 @@ SANDBOX_POLICY_EXPORT extern const char kWindowsSystem +@@ -57,10 +57,10 @@ SANDBOX_POLICY_EXPORT extern const char kWindowsSystem SANDBOX_POLICY_EXPORT extern const char kMirroringSandbox[]; #endif // BUILDFLAG(IS_MAC) @@ -13,7 +13,7 @@ SANDBOX_POLICY_EXPORT extern const char kHardwareVideoEncodingSandbox[]; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -80,7 +80,8 @@ SANDBOX_POLICY_EXPORT extern const char kDisableSetuid +@@ -81,7 +81,8 @@ SANDBOX_POLICY_EXPORT extern const char kDisableSetuid SANDBOX_POLICY_EXPORT extern const char kGpuSandboxAllowSysVShm[]; SANDBOX_POLICY_EXPORT extern const char kGpuSandboxFailuresFatal[]; SANDBOX_POLICY_EXPORT extern const char kNoSandbox[]; diff --git a/www/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 b1f86a21a7c0..c134661979ae 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 2023-09-13 12:11:42 UTC +--- 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 -@@ -143,6 +143,7 @@ void AddPulseAudioFilePermissions( +@@ -144,6 +144,7 @@ void AddPulseAudioFilePermissions( } #endif @@ -8,7 +8,7 @@ std::vector GetAudioFilePermissions() { std::vector permissions{ BrokerFilePermission::ReadOnly("/dev/urandom"), -@@ -171,10 +172,12 @@ void LoadAudioLibraries() { +@@ -172,10 +173,12 @@ void LoadAudioLibraries() { } } } @@ -21,7 +21,7 @@ LoadAudioLibraries(); auto* instance = sandbox::policy::SandboxLinux::GetInstance(); instance->StartBrokerProcess(MakeBrokerCommandSet({ -@@ -194,6 +197,7 @@ bool AudioPreSandboxHook(sandbox::policy::SandboxLinux +@@ -195,6 +198,7 @@ bool AudioPreSandboxHook(sandbox::policy::SandboxLinux // TODO(https://crbug.com/850878) enable namespace sandbox. Currently, if // enabled, connect() on pulse native socket fails with ENOENT (called from // pa_context_connect). diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_cert__verifier_cert__verifier__creation.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_cert__verifier_cert__verifier__creation.cc deleted file mode 100644 index 992107b54222..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_cert__verifier_cert__verifier__creation.cc +++ /dev/null @@ -1,28 +0,0 @@ ---- src/3rdparty/chromium/services/cert_verifier/cert_verifier_creation.cc.orig 2023-08-17 07:33:31 UTC -+++ src/3rdparty/chromium/services/cert_verifier/cert_verifier_creation.cc -@@ -13,7 +13,7 @@ - #include "net/cert/multi_threaded_cert_verifier.h" - #include "net/net_buildflags.h" - --#if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - #include "net/cert/cert_verify_proc_builtin.h" - #include "net/cert/internal/system_trust_store.h" - #endif -@@ -112,7 +112,7 @@ class CertVerifyProcFactoryImpl : public net::CertVeri - user_slot_restriction_ ? crypto::ScopedPK11Slot(PK11_ReferenceSlot( - user_slot_restriction_.get())) - : nullptr)); --#elif BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) -+#elif BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - return net::CreateCertVerifyProcBuiltin(std::move(cert_net_fetcher), - std::move(crl_set), - net::CreateSslSystemTrustStore()); -@@ -212,6 +212,7 @@ std::unique_ptr Cr - bool IsUsingCertNetFetcher() { - #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || \ -+ BUILDFLAG(IS_BSD) || \ - BUILDFLAG(TRIAL_COMPARISON_CERT_VERIFIER_SUPPORTED) || \ - BUILDFLAG(CHROME_ROOT_STORE_SUPPORTED) - return true; diff --git a/www/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 bf4c1ec35216..6fdeb69f0c6f 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 2022-11-30 08:12:58 UTC +--- src/3rdparty/chromium/services/device/BUILD.gn.orig 2023-11-03 10:09:45 UTC +++ src/3rdparty/chromium/services/device/BUILD.gn -@@ -16,7 +16,7 @@ if (is_android) { +@@ -13,7 +13,7 @@ if (is_android) { } is_serial_enabled_platform = diff --git a/www/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 index 34292de6c8f9..6c073df0dc08 100644 --- 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 @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/services/device/compute_pressure/cpu_probe.cc.orig 2023-04-28 17:01:32 UTC +--- 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 -@@ -44,6 +44,7 @@ std::unique_ptr CpuProbe::Create( +@@ -60,6 +60,7 @@ std::unique_ptr CpuProbe::Create( #elif BUILDFLAG(IS_MAC) return CpuProbeMac::Create(sampling_interval, std::move(sampling_callback)); #else 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 index 118fd20757cb..c39999c59ef6 100644 --- 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 @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/services/device/geolocation/location_arbitrator.cc.orig 2023-12-12 22:08:45 UTC +--- 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 -@@ -190,7 +190,7 @@ LocationArbitrator::NewSystemLocationProvider() { +@@ -196,7 +196,7 @@ LocationArbitrator::NewSystemLocationProvider() { std::unique_ptr LocationArbitrator::NewSystemLocationProvider() { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_hid_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_hid_BUILD.gn index 5ab6b092215f..cfa79d9ad2cd 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_hid_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_hid_BUILD.gn @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/services/device/hid/BUILD.gn.orig 2023-07-16 15:47:57 UTC +--- src/3rdparty/chromium/services/device/hid/BUILD.gn.orig 2024-01-30 07:53:34 UTC +++ src/3rdparty/chromium/services/device/hid/BUILD.gn -@@ -34,7 +34,26 @@ source_set("hid") { +@@ -36,7 +36,26 @@ source_set("hid") { "//services/device/public/mojom", ] diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_public_cpp_generic__sensor_sensor__reading.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_public_cpp_generic__sensor_sensor__reading.h index 021f577d67fc..3536acad910c 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_public_cpp_generic__sensor_sensor__reading.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_public_cpp_generic__sensor_sensor__reading.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/services/device/public/cpp/generic_sensor/sensor_reading.h.orig 2023-12-12 22:08:45 UTC +--- src/3rdparty/chromium/services/device/public/cpp/generic_sensor/sensor_reading.h.orig 2023-11-03 10:09:45 UTC +++ src/3rdparty/chromium/services/device/public/cpp/generic_sensor/sensor_reading.h @@ -8,6 +8,8 @@ #include 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 0f25748aedb0..1e2a4eaf1112 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,6 +1,6 @@ ---- src/3rdparty/chromium/services/device/usb/BUILD.gn.orig 2023-09-13 12:11:42 UTC +--- src/3rdparty/chromium/services/device/usb/BUILD.gn.orig 2024-01-30 07:53:34 UTC +++ src/3rdparty/chromium/services/device/usb/BUILD.gn -@@ -89,15 +89,17 @@ static_library("usb") { +@@ -92,15 +92,17 @@ static_library("usb") { deps += [ "//third_party/re2" ] } @@ -27,7 +27,7 @@ # These sources and deps are required for libusb. # TODO(https://crbug.com/1096743) Remove these sources. -@@ -121,6 +123,13 @@ static_library("usb") { +@@ -124,6 +126,13 @@ static_library("usb") { deps += [ "//third_party/libusb" ] } @@ -41,7 +41,7 @@ if (is_linux || is_chromeos) { sources += [ "usb_device_linux.cc", -@@ -138,7 +147,7 @@ static_library("usb") { +@@ -141,7 +150,7 @@ static_library("usb") { deps += [ "//device/udev_linux" ] } diff --git a/www/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 dd715b10d896..36f3c3da4ac1 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,10 +1,10 @@ ---- src/3rdparty/chromium/services/network/BUILD.gn.orig 2023-12-12 22:08:45 UTC +--- src/3rdparty/chromium/services/network/BUILD.gn.orig 2024-07-03 01:14:49 UTC +++ src/3rdparty/chromium/services/network/BUILD.gn -@@ -393,7 +393,6 @@ if (is_linux || is_chromeos) { +@@ -398,7 +398,6 @@ if (is_linux || is_chromeos) { ] deps = [ "//base:base", - "//sandbox/linux:sandbox_services", "//sandbox/policy:policy", ] - } + configs += [ "//build/config/compiler:wexit_time_destructors" ] diff --git a/www/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 5c50f6899215..a7d29d2a73a1 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 2023-12-12 22:08:45 UTC +--- src/3rdparty/chromium/services/network/network_context.cc.orig 2024-07-03 01:14:49 UTC +++ src/3rdparty/chromium/services/network/network_context.cc -@@ -447,7 +447,7 @@ NetworkContext::NetworkContextHttpAuthPreferences:: +@@ -522,7 +522,7 @@ NetworkContext::NetworkContextHttpAuthPreferences:: NetworkContext::NetworkContextHttpAuthPreferences:: ~NetworkContextHttpAuthPreferences() = default; @@ -9,7 +9,7 @@ bool NetworkContext::NetworkContextHttpAuthPreferences::AllowGssapiLibraryLoad() const { if (network_service_) { -@@ -2322,7 +2322,7 @@ void NetworkContext::OnHttpAuthDynamicParamsChanged( +@@ -2281,7 +2281,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 ef65756f7dca..666e6f4dbdd1 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 2023-12-12 22:08:45 UTC +--- src/3rdparty/chromium/services/network/network_context.h.orig 2024-07-03 01:14:49 UTC +++ src/3rdparty/chromium/services/network/network_context.h -@@ -668,7 +668,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext +@@ -664,7 +664,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__service.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_network_network__service.cc index 0387004ccf70..5b0945b293e5 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,4 +1,4 @@ ---- src/3rdparty/chromium/services/network/network_service.cc.orig 2023-10-11 18:22:24 UTC +--- src/3rdparty/chromium/services/network/network_service.cc.orig 2024-02-23 21:04:38 UTC +++ src/3rdparty/chromium/services/network/network_service.cc @@ -96,7 +96,7 @@ #include "third_party/boringssl/src/include/openssl/cpu.h" @@ -9,7 +9,7 @@ BUILDFLAG(IS_CHROMEOS_LACROS) #include "components/os_crypt/sync/key_storage_config_linux.h" -@@ -1003,7 +1003,7 @@ void NetworkService::SetExplicitlyAllowedPorts( +@@ -963,7 +963,7 @@ void NetworkService::SetExplicitlyAllowedPorts( net::SetExplicitlyAllowedPorts(ports); } @@ -18,7 +18,7 @@ void NetworkService::SetGssapiLibraryLoadObserver( mojo::PendingRemote gssapi_library_load_observer) { -@@ -1085,7 +1085,7 @@ NetworkService::CreateHttpAuthHandlerFactory(NetworkCo +@@ -1045,7 +1045,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 49004dda8f15..74d5f0f72166 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,6 +1,6 @@ ---- src/3rdparty/chromium/services/network/network_service.h.orig 2023-10-11 18:22:24 UTC +--- src/3rdparty/chromium/services/network/network_service.h.orig 2024-02-23 21:04:38 UTC +++ src/3rdparty/chromium/services/network/network_service.h -@@ -235,7 +235,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService +@@ -221,7 +221,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService mojo::PendingReceiver receiver) override; void SetFirstPartySets(net::GlobalFirstPartySets sets) override; void SetExplicitlyAllowedPorts(const std::vector& ports) override; @@ -9,7 +9,7 @@ void SetGssapiLibraryLoadObserver( mojo::PendingRemote gssapi_library_load_observer) override; -@@ -266,7 +266,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService +@@ -247,7 +247,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) -@@ -507,7 +507,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService +@@ -477,7 +477,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 98fa9af485a3..131360c68cf3 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 2023-12-12 22:08:45 UTC +--- 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 -@@ -481,7 +481,7 @@ jumbo_component("cpp_base") { +@@ -494,7 +494,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 d2cc30bdf15a..196948275380 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,11 +1,11 @@ ---- src/3rdparty/chromium/services/network/public/cpp/features.cc.orig 2023-12-12 22:08:45 UTC +--- 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 -@@ -383,7 +383,7 @@ CONSTINIT const base::Feature kOutOfProcessSystemDnsRe - // that can be adequately sandboxed. - CONSTINIT const base::Feature kOutOfProcessSystemDnsResolution( - "OutOfProcessSystemDnsResolution", --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - base::FEATURE_ENABLED_BY_DEFAULT - #else - base::FEATURE_DISABLED_BY_DEFAULT +@@ -96,7 +96,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) || \ +- BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) ++ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + BASE_FEATURE(kDnsOverHttpsUpgrade, + "DnsOverHttpsUpgrade", + base::FEATURE_ENABLED_BY_DEFAULT); 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 05b8728422f8..a511e1437713 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 2023-09-13 12:11:42 UTC +--- 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 -@@ -515,11 +515,11 @@ mojom("url_loader_base") { +@@ -522,11 +522,11 @@ mojom("url_loader_base") { } enabled_features = [] @@ -14,7 +14,7 @@ # TODO(crbug.com/1431866): Remove this once is_linux in the mojom IDL does # not include lacros. enabled_features += [ "use_network_interface_change_listener" ] -@@ -1435,7 +1435,7 @@ mojom("mojom") { +@@ -1443,7 +1443,7 @@ mojom("mojom") { } } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc index 13f892b50c1b..c6d0c0116650 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc.orig 2023-10-11 18:22:24 UTC +--- src/3rdparty/chromium/services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc.orig 2024-01-30 07:53:34 UTC +++ src/3rdparty/chromium/services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc -@@ -53,7 +53,7 @@ uint32_t CalculatePrivateFootprintKb(const mojom::RawO +@@ -54,7 +54,7 @@ uint32_t CalculatePrivateFootprintKb(const mojom::RawO uint32_t shared_resident_kb) { DCHECK(os_dump.platform_private_footprint); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ @@ -9,7 +9,7 @@ uint64_t rss_anon_bytes = os_dump.platform_private_footprint->rss_anon_bytes; uint64_t vm_swap_bytes = os_dump.platform_private_footprint->vm_swap_bytes; return (rss_anon_bytes + vm_swap_bytes) / 1024; -@@ -81,7 +81,7 @@ memory_instrumentation::mojom::OSMemDumpPtr CreatePubl +@@ -83,7 +83,7 @@ memory_instrumentation::mojom::OSMemDumpPtr CreatePubl os_dump->is_peak_rss_resettable = internal_os_dump.is_peak_rss_resettable; os_dump->private_footprint_kb = CalculatePrivateFootprintKb(internal_os_dump, shared_resident_kb); @@ -18,7 +18,7 @@ os_dump->private_footprint_swap_kb = internal_os_dump.platform_private_footprint->vm_swap_bytes / 1024; #endif -@@ -217,7 +217,7 @@ void QueuedRequestDispatcher::SetUpAndDispatch( +@@ -219,7 +219,7 @@ void QueuedRequestDispatcher::SetUpAndDispatch( // On most platforms each process can dump data about their own process // so ask each process to do so Linux is special see below. @@ -27,7 +27,7 @@ request->pending_responses.insert({client_info.pid, ResponseType::kOSDump}); client->RequestOSMemoryDump(request->memory_map_option(), {base::kNullProcessId}, -@@ -232,7 +232,7 @@ void QueuedRequestDispatcher::SetUpAndDispatch( +@@ -234,7 +234,7 @@ void QueuedRequestDispatcher::SetUpAndDispatch( // In some cases, OS stats can only be dumped from a privileged process to // get around to sandboxing/selinux restrictions (see crbug.com/461788). @@ -36,7 +36,7 @@ std::vector pids; mojom::ClientProcess* browser_client = nullptr; base::ProcessId browser_client_pid = base::kNullProcessId; -@@ -278,7 +278,7 @@ void QueuedRequestDispatcher::SetUpAndDispatchVmRegion +@@ -280,7 +280,7 @@ void QueuedRequestDispatcher::SetUpAndDispatchVmRegion const OsCallback& os_callback) { // On Linux, OS stats can only be dumped from a privileged process to // get around to sandboxing/selinux restrictions (see crbug.com/461788). @@ -45,7 +45,7 @@ mojom::ClientProcess* browser_client = nullptr; base::ProcessId browser_client_pid = 0; for (const auto& client_info : clients) { -@@ -328,7 +328,7 @@ QueuedRequestDispatcher::FinalizeVmRegionRequest( +@@ -330,7 +330,7 @@ QueuedRequestDispatcher::FinalizeVmRegionRequest( // each client process provides 1 OS dump, % the case where the client is // disconnected mid dump. OSMemDumpMap& extra_os_dumps = response.second.os_dumps; @@ -54,7 +54,7 @@ for (auto& kv : extra_os_dumps) { auto pid = kv.first == base::kNullProcessId ? original_pid : kv.first; DCHECK(results.find(pid) == results.end()); -@@ -389,7 +389,7 @@ void QueuedRequestDispatcher::Finalize(QueuedRequest* +@@ -391,7 +391,7 @@ void QueuedRequestDispatcher::Finalize(QueuedRequest* // crash). In the latter case (OS_LINUX) we expect the full map to come // from the browser process response. OSMemDumpMap& extra_os_dumps = response.second.os_dumps; diff --git a/www/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 da4d13bb211d..271741477e28 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,6 +1,6 @@ ---- src/3rdparty/chromium/services/tracing/public/cpp/stack_sampling/tracing_sampler_profiler.cc.orig 2023-12-12 22:08:45 UTC +--- 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 -@@ -39,7 +39,7 @@ +@@ -40,7 +40,7 @@ #include "third_party/perfetto/protos/perfetto/trace/track_event/process_descriptor.pbzero.h" #include "third_party/perfetto/protos/perfetto/trace/track_event/thread_descriptor.pbzero.h" diff --git a/www/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 75a613c10a31..2e039f39354c 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,38 +1,38 @@ ---- src/3rdparty/chromium/services/video_capture/video_capture_service_impl.cc.orig 2023-10-11 18:22:24 UTC +--- 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 -@@ -40,7 +40,7 @@ +@@ -41,7 +41,7 @@ #include "services/video_capture/lacros/device_factory_adapter_lacros.h" #endif // BUILDFLAG(IS_CHROMEOS_LACROS) --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) #include "media/capture/capture_switches.h" #include "media/capture/video/video_capture_gpu_channel_host.h" #include "services/viz/public/cpp/gpu/context_provider_command_buffer.h" -@@ -107,7 +107,7 @@ class VideoCaptureServiceImpl::GpuDependenciesContext +@@ -109,7 +109,7 @@ class VideoCaptureServiceImpl::GpuDependenciesContext this}; }; --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) // Intended usage of this class is to create viz::Gpu in utility process and // connect to viz::GpuClient of browser process, which will call to Gpu service. // Also, this class holds the viz::ContextProvider to listen and monitor Gpu -@@ -288,7 +288,7 @@ void VideoCaptureServiceImpl::LazyInitializeGpuDepende - if (!gpu_dependencies_context_) +@@ -307,7 +307,7 @@ void VideoCaptureServiceImpl::LazyInitializeGpuDepende gpu_dependencies_context_ = std::make_unique(); --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) +-#if BUILDFLAG(IS_CHROMEOS_ASH) ++#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) + { + #else if (switches::IsVideoCaptureUseGpuMemoryBufferEnabled()) { - if (!viz_gpu_context_provider_) { - viz_gpu_context_provider_ = -@@ -384,7 +384,7 @@ void VideoCaptureServiceImpl::OnGpuInfoUpdate(const CH +@@ -421,7 +421,7 @@ void VideoCaptureServiceImpl::OnGpuInfoUpdate(const CH } #endif --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) void VideoCaptureServiceImpl::SetVizGpu(std::unique_ptr viz_gpu) { viz_gpu_ = std::move(viz_gpu); } 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 acb5813fd8f4..d3abfdc0f686 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,29 +1,29 @@ ---- src/3rdparty/chromium/services/video_capture/video_capture_service_impl.h.orig 2023-09-13 12:11:42 UTC +--- 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 -@@ -24,7 +24,7 @@ +@@ -26,7 +26,7 @@ #include "services/video_capture/ash/video_capture_device_factory_ash.h" #endif // BUILDFLAG(IS_CHROMEOS_ASH) --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) #include "services/viz/public/cpp/gpu/gpu.h" - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) - -@@ -62,7 +62,7 @@ class VideoCaptureServiceImpl : public mojom::VideoCap + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || + // BUILDFLAG(IS_CHROMEOS_ASH) +@@ -70,7 +70,7 @@ class VideoCaptureServiceImpl : public mojom::VideoCap #if BUILDFLAG(IS_WIN) void OnGpuInfoUpdate(const CHROME_LUID& luid) override; #endif --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) void SetVizGpu(std::unique_ptr viz_gpu); - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) - private: -@@ -87,7 +87,7 @@ class VideoCaptureServiceImpl : public mojom::VideoCap + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || + // BUILDFLAG(IS_CHROMEOS_ASH) +@@ -107,7 +107,7 @@ class VideoCaptureServiceImpl : public mojom::VideoCap factory_receivers_ash_; #endif --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) class VizGpuContextProvider; std::unique_ptr viz_gpu_context_provider_; std::unique_ptr viz_gpu_; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_abseil-cpp_absl_base_internal_raw__logging.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_abseil-cpp_absl_base_internal_raw__logging.cc deleted file mode 100644 index a00606557592..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_abseil-cpp_absl_base_internal_raw__logging.cc +++ /dev/null @@ -1,16 +0,0 @@ ---- src/3rdparty/chromium/third_party/abseil-cpp/absl/base/internal/raw_logging.cc.orig 2023-08-17 07:33:31 UTC -+++ src/3rdparty/chromium/third_party/abseil-cpp/absl/base/internal/raw_logging.cc -@@ -56,10 +56,12 @@ - // ABSL_HAVE_SYSCALL_WRITE is defined when the platform provides the syscall - // syscall(SYS_write, /*int*/ fd, /*char* */ buf, /*size_t*/ len); - // for low level operations that want to avoid libc. --#if (defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__)) && \ -+#if (defined(__linux__) || defined(__FreeBSD__)) && \ - !defined(__ANDROID__) - #include - #define ABSL_HAVE_SYSCALL_WRITE 1 -+#define ABSL_LOW_LEVEL_WRITE_SUPPORTED 1 -+#elif defined(__OpenBSD__) - #define ABSL_LOW_LEVEL_WRITE_SUPPORTED 1 - #else - #undef ABSL_HAVE_SYSCALL_WRITE diff --git a/www/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 b8e4d18eabb0..fae0adce0e08 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,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/abseil-cpp/absl/base/internal/sysinfo.cc.orig 2023-09-13 12:11:42 UTC +--- 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 -@@ -30,10 +30,14 @@ +@@ -30,7 +30,7 @@ #include #endif @@ -9,14 +9,7 @@ #include #endif -+#if defined(__FreeBSD__) -+#include -+#endif -+ - #if defined(__myriad2__) - #include - #endif -@@ -186,6 +190,7 @@ static double GetNominalCPUFrequency() { +@@ -194,6 +194,7 @@ static double GetNominalCPUFrequency() { #else @@ -24,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) { -@@ -218,6 +223,7 @@ static bool ReadLongFromFile(const char *file, long *v +@@ -226,6 +227,7 @@ static bool ReadLongFromFile(const char *file, long *v } return ret; } @@ -32,7 +25,7 @@ #if defined(ABSL_INTERNAL_UNSCALED_CYCLECLOCK_FREQUENCY_IS_CPU_FREQUENCY) -@@ -317,9 +323,11 @@ static double GetNominalCPUFrequency() { +@@ -325,9 +327,11 @@ static double GetNominalCPUFrequency() { // a new mode (turbo mode). Essentially, those frequencies cannot // always be relied upon. The same reasons apply to /proc/cpuinfo as // well. @@ -44,7 +37,7 @@ #if defined(ABSL_INTERNAL_UNSCALED_CYCLECLOCK_FREQUENCY_IS_CPU_FREQUENCY) // On these platforms, the TSC frequency is the nominal CPU -@@ -338,10 +346,12 @@ static double GetNominalCPUFrequency() { +@@ -346,10 +350,12 @@ static double GetNominalCPUFrequency() { // If CPU scaling is in effect, we want to use the *maximum* // frequency, not whatever CPU speed some random processor happens // to be using now. @@ -57,7 +50,7 @@ return 1.0; #endif // !ABSL_INTERNAL_UNSCALED_CYCLECLOCK_FREQUENCY_IS_CPU_FREQUENCY -@@ -439,6 +449,18 @@ pid_t GetTID() { +@@ -459,6 +465,12 @@ pid_t GetTID() { static_assert(sizeof(pid_t) == sizeof(thread), "In NaCL int expected to be the same size as a pointer"); return reinterpret_cast(thread); @@ -67,12 +60,6 @@ + +pid_t GetTID() { + return getthrid(); -+} -+ -+#elif defined(__FreeBSD__) -+ -+pid_t GetTID() { -+ return pthread_getthreadid_np(); } #else 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 8829526ae674..55ae4d32736f 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 2023-10-11 18:22:24 UTC +--- src/3rdparty/chromium/third_party/angle/BUILD.gn.orig 2024-02-23 21:04:38 UTC +++ src/3rdparty/chromium/third_party/angle/BUILD.gn -@@ -325,7 +325,6 @@ config("extra_warnings") { +@@ -316,7 +316,6 @@ config("extra_warnings") { "-Wtautological-type-limit-compare", "-Wundefined-reinterpret-cast", "-Wunneeded-internal-declaration", @@ -8,7 +8,7 @@ "-Wsuggest-destructor-override", "-Wsuggest-override", -@@ -496,7 +495,7 @@ template("angle_common_lib") { +@@ -487,7 +486,7 @@ template("angle_common_lib") { all_dependent_configs = [ ":angle_disable_pool_alloc" ] } @@ -17,7 +17,7 @@ libs = [ "dl" ] } -@@ -651,6 +650,9 @@ angle_static_library("angle_gpu_info_util") { +@@ -642,6 +641,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_common_system__utils.cpp b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_common_system__utils.cpp new file mode 100644 index 000000000000..df5caaa53995 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_common_system__utils.cpp @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/third_party/angle/src/common/system_utils.cpp.orig 2024-01-30 07:53:34 UTC ++++ src/3rdparty/chromium/third_party/angle/src/common/system_utils.cpp +@@ -25,7 +25,7 @@ namespace angle + { + std::string GetExecutableName() + { +-#if defined(ANGLE_PLATFORM_ANDROID) && __ANDROID_API__ >= 21 ++#if (defined(ANGLE_PLATFORM_ANDROID) && __ANDROID_API__ >= 21) || defined(ANGLE_PLATFORM_BSD) + // Support for "getprogname" function in bionic was introduced in L (API level 21) + const char *executableName = getprogname(); + return (executableName) ? std::string(executableName) : "ANGLE"; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_common_system__utils__linux.cpp b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_common_system__utils__linux.cpp new file mode 100644 index 000000000000..a221cb4ed157 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_common_system__utils__linux.cpp @@ -0,0 +1,35 @@ +--- src/3rdparty/chromium/third_party/angle/src/common/system_utils_linux.cpp.orig 2024-01-30 07:53:34 UTC ++++ src/3rdparty/chromium/third_party/angle/src/common/system_utils_linux.cpp +@@ -15,8 +15,13 @@ + + #include + ++#if ANGLE_PLATFORM_OPENBSD ++#include ++#endif ++ + namespace angle + { ++#if ANGLE_PLATFORM_LINUX + std::string GetExecutablePath() + { + // We cannot use lstat to get the size of /proc/self/exe as it always returns 0 +@@ -32,6 +37,7 @@ std::string GetExecutablePath() + path[result] = '\0'; + return path; + } ++#endif + + std::string GetExecutableDirectory() + { +@@ -56,6 +62,10 @@ void SetCurrentThreadName(const char *name) + { + // There's a 15-character (16 including '\0') limit. If the name is too big (and ERANGE is + // returned), just ignore the name. ++#if ANGLE_PLATFORM_OPENBSD ++ pthread_set_name_np(pthread_self(), name); ++#else + pthread_setname_np(pthread_self(), name); ++#endif + } + } // namespace angle diff --git a/www/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 8d52ddf1e027..602c9cf64f18 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 2023-10-11 18:22:24 UTC +--- 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 @@ -60,7 +60,7 @@ # include "libANGLE/renderer/gl/cgl/DisplayCGL.h" @@ -9,7 +9,7 @@ # include "libANGLE/renderer/gl/egl/DisplayEGL.h" # if defined(ANGLE_USE_X11) # include "libANGLE/renderer/gl/glx/DisplayGLX.h" -@@ -411,7 +411,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di +@@ -408,7 +408,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di impl = new rx::DisplayEAGL(state); break; @@ -18,7 +18,7 @@ # if defined(ANGLE_USE_GBM) if (platformType == 0) { -@@ -457,7 +457,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di +@@ -454,7 +454,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) { -@@ -508,7 +508,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di +@@ -505,7 +505,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()) { -@@ -2148,7 +2148,7 @@ static ClientExtensions GenerateClientExtensions() +@@ -2130,7 +2130,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 9e33b07c62d0..a2b5ecdf3ba6 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 2023-08-17 07:33:31 UTC +--- 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 -@@ -66,7 +66,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 32cad4b736ee..c39c8a0ee8c8 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 2023-08-17 07:33:31 UTC +--- 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 -@@ -64,7 +64,7 @@ struct BLINK_COMMON_EXPORT RendererPreferences { +@@ -63,7 +63,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 67169fd8511f..2c5c0c7f20d3 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 2023-08-17 07:33:31 UTC +--- 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 -@@ -162,7 +162,7 @@ struct BLINK_COMMON_EXPORT +@@ -157,7 +157,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 23a41de0d93b..b48b0cfcd87f 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 2023-09-13 12:11:42 UTC +--- 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 -@@ -338,7 +338,7 @@ class BLINK_PLATFORM_EXPORT Platform { +@@ -348,7 +348,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 e2eb5ca637f1..b2ec059fddaf 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 2022-02-07 13:39:41 UTC +--- 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 -@@ -81,7 +81,7 @@ class WebVector { +@@ -86,7 +86,7 @@ class WebVector { // The vector can be populated using reserve() and emplace_back(). WebVector() = default; diff --git a/www/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 ac6d110766df..6d33af403262 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 2023-10-11 18:22:24 UTC +--- 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 -@@ -78,12 +78,12 @@ +@@ -75,12 +75,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 -@@ -227,7 +227,7 @@ void BlinkInitializer::RegisterInterfaces(mojo::Binder +@@ -247,7 +247,7 @@ void BlinkInitializer::RegisterInterfaces(mojo::Binder main_thread_task_runner); #endif @@ -24,7 +24,7 @@ binders.Add( ConvertToBaseRepeatingCallback( CrossThreadBindRepeating(&MemoryUsageMonitorPosix::Bind)), -@@ -266,7 +266,7 @@ void BlinkInitializer::RegisterMemoryWatchers(Platform +@@ -286,7 +286,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_core_editing_editing__behavior.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_editing_editing__behavior.cc index 8114b1262190..587e00a13f61 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-04-05 11:05:06 UTC +--- 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 -@@ -284,7 +284,7 @@ bool EditingBehavior::ShouldInsertCharacter(const Keyb +@@ -324,7 +324,7 @@ bool EditingBehavior::ShouldInsertCharacter(const Keyb // unexpected behaviour if (ch < ' ') return false; diff --git a/www/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 9687f1a1ba46..4028efcb2c17 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 2023-10-11 18:22:24 UTC +--- 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 -@@ -421,7 +421,7 @@ SkFontHinting RendererPreferencesToSkiaHinting( +@@ -425,7 +425,7 @@ SkFontHinting RendererPreferencesToSkiaHinting( const blink::RendererPreferences& prefs) { // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. @@ -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' -@@ -3323,7 +3323,7 @@ void WebViewImpl::UpdateFontRenderingFromRendererPrefs +@@ -3368,7 +3368,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 7f9ab08a9e53..ea1ace0a7a61 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 2023-09-13 12:11:42 UTC +--- 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 -@@ -6456,7 +6456,7 @@ TEST_F(WebFrameTest, DISABLED_PositionForPointTest) { +@@ -6468,7 +6468,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 \ -@@ -6865,7 +6865,7 @@ TEST_F(CompositedSelectionBoundsTest, LargeSelectionSc +@@ -6877,7 +6877,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 f11b44ff51f0..2a4596a43aaf 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 2023-10-11 18:22:24 UTC +--- 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 -@@ -48,7 +48,7 @@ constexpr base::TimeDelta kEncodeRowSlackBeforeDeadlin +@@ -50,7 +50,7 @@ constexpr base::TimeDelta kEncodeRowSlackBeforeDeadlin /* The value is based on user statistics on Nov 2017. */ #if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_inspector_inspector__memory__agent.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_inspector_inspector__memory__agent.cc index 304806dd92eb..23825e3999a7 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_inspector_inspector__memory__agent.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_inspector_inspector__memory__agent.cc @@ -1,11 +1,11 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/core/inspector/inspector_memory_agent.cc.orig 2023-05-31 08:12:17 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/core/inspector/inspector_memory_agent.cc.orig 2024-01-30 07:53:34 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/core/inspector/inspector_memory_agent.cc -@@ -189,7 +189,7 @@ InspectorMemoryAgent::GetSamplingProfileById(uint32_t +@@ -192,7 +192,7 @@ InspectorMemoryAgent::GetSamplingProfileById(uint32_t Vector InspectorMemoryAgent::Symbolize( - const WebVector& addresses) { + const WebVector& addresses) { -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // TODO(alph): Move symbolization to the client. - Vector addresses_to_symbolize; - for (size_t i = 0; i < addresses.size(); i++) { + Vector addresses_to_symbolize; + for (const void* address : addresses) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_layout_ng_layout__ng__view.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_layout_layout__view.cc similarity index 70% rename from www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_layout_ng_layout__ng__view.cc rename to www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_layout_layout__view.cc index f850372415f1..a97aab33c2e7 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_layout_ng_layout__ng__view.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_layout_layout__view.cc @@ -1,16 +1,16 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/core/layout/ng/layout_ng_view.cc.orig 2023-09-13 12:11:42 UTC -+++ src/3rdparty/chromium/third_party/blink/renderer/core/layout/ng/layout_ng_view.cc -@@ -15,7 +15,7 @@ - #include "third_party/blink/renderer/core/svg/svg_document_extensions.h" - #include "ui/display/screen_info.h" +--- 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 +@@ -72,7 +72,7 @@ + #include "ui/gfx/geometry/quad_f.h" + #include "ui/gfx/geometry/size_conversions.h" -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "third_party/blink/renderer/platform/fonts/font_cache.h" #endif -@@ -53,7 +53,7 @@ void LayoutNGView::UpdateLayout() { - fragmentation_context_.Clear(); +@@ -813,7 +813,7 @@ void LayoutView::UpdateLayout() { + intrinsic_logical_widths_ = LogicalWidth(); } -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) 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 fba7e07799ee..34f6be1b4543 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,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/core/paint/paint_layer.cc.orig 2023-10-11 18:22:24 UTC +--- 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 -@@ -118,7 +118,7 @@ namespace blink { +@@ -120,7 +120,7 @@ namespace blink { namespace { 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 66cc9a32e6e7..7460bb6ef92d 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 2023-10-11 18:22:24 UTC +--- 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 -@@ -155,7 +155,7 @@ bool ScrollbarThemeAura::SupportsDragSnapBack() const +@@ -150,7 +150,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,7 +9,7 @@ return false; #else return true; -@@ -355,7 +355,7 @@ bool ScrollbarThemeAura::ShouldCenterOnThumb(const Scr +@@ -363,7 +363,7 @@ bool ScrollbarThemeAura::ShouldCenterOnThumb(const Scr const WebMouseEvent& event) { // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_canvas_canvas2d_canvas__style.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_canvas_canvas2d_canvas__style.cc deleted file mode 100644 index faf4d28f3312..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_canvas_canvas2d_canvas__style.cc +++ /dev/null @@ -1,12 +0,0 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/modules/canvas/canvas2d/canvas_style.cc.orig 2023-12-12 22:08:45 UTC -+++ src/3rdparty/chromium/third_party/blink/renderer/modules/canvas/canvas2d/canvas_style.cc -@@ -76,6 +76,9 @@ void CanvasStyle::ApplyToFlags(cc::PaintFlags& flags, - - void CanvasStyle::ApplyToFlags(cc::PaintFlags& flags, - float global_alpha) const { -+#if defined(__clang__) && (__clang_major__ < 16) -+ SkColor4f custom_color = SkColor4f{0.0f, 0.0f, 0.0f, global_alpha}; -+#endif - switch (type_) { - case kColor: - ApplyColorToFlags(flags, global_alpha); 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 0a7db99120cf..feb498e57155 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 2023-10-11 18:22:24 UTC +--- 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 -@@ -724,7 +724,7 @@ TEST_F(AudioRendererMixerManagerTest, MixerParamsLaten +@@ -726,7 +726,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 index 3486073555fc..9ed3a736b3cb 100644 --- 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 @@ -1,11 +1,11 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/modules/ml/webnn/features.gni.orig 2023-05-31 08:12:17 UTC +--- 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 -@@ -7,7 +7,7 @@ declare_args() { +@@ -6,7 +6,7 @@ import("//build/config/chrome_build.gni") + declare_args() { # This enables building WebNN with XNNPACK. Currently only available for - # Windows and Linux on x64 or x86. - build_webnn_with_xnnpack = -- (is_linux || is_win) && (current_cpu == "x64" || current_cpu == "x86") -+ !is_bsd && (is_win && (current_cpu == "x64" || current_cpu == "x86")) + # 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)) - # This build flag enables WebNN on ChromeOS platform to access hardware - # acceleration by using ModelLoader mojo interface. 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 index b232a528b725..c426bb3c776c 100644 --- 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 @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/modules/ml/webnn/ml_graph_xnnpack.cc.orig 2023-09-13 12:11:42 UTC +--- 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 -@@ -191,7 +191,7 @@ class SharedXnnpackContext : public ThreadSafeRefCount +@@ -202,7 +202,7 @@ class SharedXnnpackContext : public ThreadSafeRefCount ~SharedXnnpackContext() { base::AutoLock auto_lock(SharedXnnpackContextLock()); 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 07b7f12fde5d..2929e4a0b7c8 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 2023-07-16 15:47:57 UTC +--- 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 -@@ -297,7 +297,7 @@ TEST_F(WebRtcAudioRendererTest, DISABLED_VerifySinkPar +@@ -300,7 +300,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_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 668add41a422..162b0fcfdfdd 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 2023-10-11 18:22:24 UTC +--- 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 -@@ -6321,7 +6321,7 @@ void WebGLRenderingContextBase::TexImageHelperMediaVid +@@ -6364,7 +6364,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 2d061233f1b7..ab853bca0a55 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,11 +1,11 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/modules/webgpu/gpu_queue.cc.orig 2023-10-11 18:22:24 UTC +--- 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 -@@ -746,7 +746,7 @@ bool GPUQueue::CopyFromCanvasSourceImage( +@@ -755,7 +755,7 @@ bool GPUQueue::CopyFromCanvasSourceImage( // on linux platform. // TODO(crbug.com/1424119): using a webgpu mailbox texture on the OpenGLES // backend is failing for unknown reasons. -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) bool forceReadback = true; - #elif BUILDFLAG(IS_WIN) - bool forceReadback = + #elif BUILDFLAG(IS_ANDROID) + // TODO(crbug.com/dawn/1969): Some Android devices don't fail to copy from diff --git a/www/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 ca33eca74907..c90168dbbf31 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 2023-12-12 22:08:45 UTC +--- 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 -@@ -1975,7 +1975,7 @@ jumbo_static_library("test_support") { +@@ -1979,7 +1979,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 0ebf2995f22c..19badfebb2a9 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 2023-08-17 07:33:31 UTC +--- 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 -@@ -72,7 +72,7 @@ extern const char kNotoColorEmojiCompat[] = "Noto Colo +@@ -73,7 +73,7 @@ extern const char kNotoColorEmojiCompat[] = "Noto Colo SkFontMgr* FontCache::static_font_manager_ = nullptr; @@ -9,7 +9,7 @@ float FontCache::device_scale_factor_ = 1.0; #endif -@@ -118,7 +118,7 @@ FontPlatformData* FontCache::SystemFontPlatformData( +@@ -124,7 +124,7 @@ FontPlatformData* FontCache::SystemFontPlatformData( 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 b3e27e71c678..00033931953f 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,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/font_cache.h.orig 2023-09-13 12:11:42 UTC +--- 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 -@@ -56,7 +56,7 @@ +@@ -55,7 +55,7 @@ #include "third_party/skia/include/core/SkFontMgr.h" #include "third_party/skia/include/core/SkRefCnt.h" 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 21a42c1fcb59..21f8e0da5a6b 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,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/font_description.cc.orig 2023-09-13 12:11:42 UTC +--- 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 @@ -39,7 +39,7 @@ #include "third_party/blink/renderer/platform/wtf/text/string_hash.h" @@ -9,9 +9,9 @@ #include "third_party/blink/renderer/platform/fonts/font_cache.h" #endif -@@ -274,7 +274,7 @@ FontCacheKey FontDescription::CacheKey( - static_cast(fields_.orientation_) << 1 | // bit 2-3 - static_cast(fields_.subpixel_text_position_); // bit 1 +@@ -277,7 +277,7 @@ FontCacheKey FontDescription::CacheKey( + static_cast(fields_.orientation_) << 1 | // bit 2-3 + static_cast(fields_.subpixel_text_position_); // bit 1 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__metrics.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__metrics.cc index 8f4468acf708..45eb2fd4917c 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__metrics.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__metrics.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/font_metrics.cc.orig 2022-03-25 21:59:56 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/font_metrics.cc.orig 2024-02-23 21:04:38 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/font_metrics.cc @@ -39,7 +39,7 @@ namespace blink { @@ -9,7 +9,7 @@ // This is the largest VDMX table which we'll try to load and parse. static const size_t kMaxVDMXTableSize = 1024 * 1024; // 1 MB #endif -@@ -69,7 +69,7 @@ void FontMetrics::AscentDescentWithHacks( +@@ -67,7 +67,7 @@ void FontMetrics::AscentDescentWithHacks( bool is_vdmx_valid = false; #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ @@ -18,12 +18,12 @@ // Manually digging up VDMX metrics is only applicable when bytecode hinting // using FreeType. With DirectWrite or CoreText, no bytecode hinting is ever // done. This code should be pushed into FreeType (hinted font metrics). -@@ -117,7 +117,7 @@ void FontMetrics::AscentDescentWithHacks( - if (descent < metrics.fDescent) { - visual_overflow_inflation_for_descent = 1; +@@ -111,7 +111,7 @@ void FontMetrics::AscentDescentWithHacks( + descent = SkScalarRoundToScalar(metrics.fDescent); + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ - BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - // When subpixel positioning is enabled, if the descent is rounded down, - // the descent part of the glyph may be truncated when displayed in a - // 'overflow: hidden' container. To avoid that, borrow 1 unit from the + // When subpixel positioning is enabled, if the descent is rounded down, + // the descent part of the glyph may be truncated when displayed in a + // 'overflow: hidden' container. To avoid that, borrow 1 unit from the diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__palette.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__palette.h deleted file mode 100644 index 74578b876a36..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__palette.h +++ /dev/null @@ -1,28 +0,0 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/font_palette.h.orig 2023-12-12 22:08:45 UTC -+++ src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/font_palette.h -@@ -96,7 +96,11 @@ class PLATFORM_EXPORT FontPalette : public RefCounted< - Color::ColorSpace color_interpolation_space, - absl::optional hue_interpolation_method) { - return base::AdoptRef(new FontPalette( -- start, end, NonNormalizedPercentages{start_percentage, end_percentage}, -+#if defined(__clang__) && (__clang_major__ >= 16) -+ start, end, NonNormalizedPercentages(start_percentage, end_percentage), -+#else -+ start, end, NonNormalizedPercentages(NonNormalizedPercentages{start_percentage, end_percentage}), -+#endif - normalized_percentage, alpha_multiplier, color_interpolation_space, - hue_interpolation_method)); - } -@@ -170,7 +174,11 @@ class PLATFORM_EXPORT FontPalette : public RefCounted< - double normalized_percentage) { - double end_percentage = normalized_percentage * 100.0; - double start_percentage = 100.0 - end_percentage; -- return NonNormalizedPercentages{start_percentage, end_percentage}; -+#if defined(__clang__) && (__clang_major__ >= 16) -+ return NonNormalizedPercentages(start_percentage, end_percentage); -+#else -+ return NonNormalizedPercentages(NonNormalizedPercentages{start_percentage, end_percentage}); -+#endif - } - - double GetAlphaMultiplier() const { diff --git a/www/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 f4fe74bacd65..ae7e6e01ad34 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,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/font_platform_data.cc.orig 2023-12-12 22:08:45 UTC +--- 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 @@ -51,7 +51,7 @@ namespace { namespace blink { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_palette__interpolation.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_palette__interpolation.cc deleted file mode 100644 index 65e93bb77bc0..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_palette__interpolation.cc +++ /dev/null @@ -1,16 +0,0 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/palette_interpolation.cc.orig 2023-12-12 22:08:45 UTC -+++ src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/palette_interpolation.cc -@@ -31,7 +31,12 @@ Vector PaletteInterp - color_interpolation_space, hue_interpolation_method, start_color, - end_color, percentage, alpha_multiplier); - -- FontPalette::FontPaletteOverride result_color_record{(int)i, result_color}; -+#if defined(__clang__) && (__clang_major__ >= 16) -+ FontPalette::FontPaletteOverride result_color_record(i, result_color); -+#else -+ FontPalette::FontPaletteOverride fpo = { static_cast(i), result_color }; -+ FontPalette::FontPaletteOverride result_color_record(fpo); -+#endif - result_color_records.push_back(result_color_record); - } - return result_color_records; diff --git a/www/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 4041c0ad526e..d8364a87248d 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,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc.orig 2023-04-28 17:01:32 UTC +--- 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 -@@ -64,7 +64,7 @@ AtomicString ToAtomicString(const SkString& str) { +@@ -65,7 +65,7 @@ AtomicString ToAtomicString(const SkString& str) { return AtomicString::FromUTF8(str.c_str(), str.size()); } @@ -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. -@@ -246,7 +246,7 @@ std::unique_ptr FontCache::CreateFon +@@ -247,7 +247,7 @@ std::unique_ptr FontCache::CreateFon std::string name; sk_sp typeface; 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 dc308173b771..82ab220ece5f 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,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/video_frame_submitter.cc.orig 2023-08-17 07:33:31 UTC +--- 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 -@@ -356,7 +356,7 @@ void VideoFrameSubmitter::OnBeginFrame( +@@ -365,7 +365,7 @@ void VideoFrameSubmitter::OnBeginFrame( continue; auto& feedback = timing_details.find(frame_token)->value.presentation_feedback; 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 cfc8e3fbf7eb..320ec404d2aa 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 2023-10-11 18:22:24 UTC +--- 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 -@@ -198,12 +198,12 @@ SupportedFormats GetSupportedFormatsInternal( +@@ -202,12 +202,12 @@ SupportedFormats GetSupportedFormatsInternal( supported_formats.scalability_modes.push_back(profile.scalability_modes); supported_formats.sdp_formats.push_back(std::move(*format)); diff --git a/www/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 f729bbaa5d14..8bdefd8bfec9 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,33 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/platform/runtime_enabled_features.json5.orig 2023-10-11 18:22:24 UTC +--- 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 -@@ -2781,7 +2781,7 @@ +@@ -1944,7 +1944,7 @@ + base_feature_status: "enabled", + copied_from_base_feature_if: "overridden", + origin_trial_feature_name: "FullscreenPopupWindows", +- origin_trial_os: ["win", "mac", "linux", "chromeos"], ++ origin_trial_os: ["win", "mac", "linux", "chromeos", "openbsd", "freebsd"], + }, + { + name: "GamepadButtonAxisEvents", +@@ -2862,7 +2862,7 @@ name: "PaymentHandlerMinimalHeaderUX", origin_trial_feature_name: "PaymentHandlerMinimalHeaderUX", origin_trial_allows_third_party: true, - origin_trial_os: ["win", "mac", "linux", "fuchsia", "chromeos"], + origin_trial_os: ["win", "mac", "linux", "fuchsia", "chromeos", "openbsd", "freebsd"], + status: "stable", }, { - name: "PaymentInstruments", -@@ -3803,7 +3803,7 @@ +@@ -3875,7 +3875,7 @@ name: "UnrestrictedSharedArrayBuffer", base_feature: "none", origin_trial_feature_name: "UnrestrictedSharedArrayBuffer", - origin_trial_os: ["win", "mac", "linux", "fuchsia", "chromeos"], + origin_trial_os: ["win", "mac", "linux", "fuchsia", "chromeos", "openbsd", "freebsd"], }, - { - name: "URLPatternCompareComponent", -@@ -4006,12 +4006,12 @@ + // Enables using policy-controlled feature "usb-unrestricted" to allow + // isolated context to access protected USB interface classes and to +@@ -4083,12 +4083,12 @@ status: "experimental", base_feature: "none", origin_trial_feature_name: "WebAppUrlHandling", 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 index ac8abe61fb37..a62ae6547718 100644 --- 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 @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/platform/video_capture/video_capture_impl.cc.orig 2023-10-11 18:22:24 UTC +--- 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 -@@ -621,7 +621,7 @@ bool VideoCaptureImpl::VideoFrameBufferPreparer::BindV +@@ -679,7 +679,7 @@ bool VideoCaptureImpl::BindVideoFrameOnMediaTaskRunner } const unsigned texture_target = diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_wtf_math__extras.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_wtf_math__extras.h deleted file mode 100644 index 0c99b83324b4..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_wtf_math__extras.h +++ /dev/null @@ -1,12 +0,0 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/math_extras.h.orig 2023-12-12 22:08:45 UTC -+++ src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/math_extras.h -@@ -135,6 +135,9 @@ inline float RoundHalfTowardsPositiveInfinity(float va - inline float RoundHalfTowardsPositiveInfinity(float value) { - return std::floor(value + 0.5f); - } -+#if defined(OS_FREEBSD) -+#pragma clang diagnostic pop -+#endif - - // ClampTo() is implemented by templated helper classes (to allow for partial - // template specialization) as well as several helper functions. 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 index 3efd7510b554..b8b4146a607a 100644 --- 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 @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/boringssl/src/util/generate_build_files.py.orig 2023-10-11 18:22:24 UTC +--- 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 -@@ -766,10 +766,10 @@ def main(platforms): +@@ -794,10 +794,10 @@ def main(platforms): ] # Generate err_data.c @@ -15,7 +15,7 @@ crypto_c_files.append('err_data.c') crypto_c_files.sort() -@@ -780,11 +780,11 @@ def main(platforms): +@@ -808,11 +808,11 @@ def main(platforms): crypto_test_files = [] if EMBED_TEST_DATA: # Generate crypto_test_data.cc 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 022e44d4763e..f6fbd225c921 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 2022-02-28 16:54:41 UTC +--- 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 -@@ -101,7 +101,7 @@ bool UUID::InitializeWithNew() { +@@ -102,7 +102,7 @@ bool UUID::InitializeWithNew() { InitializeFromBytes(uuid); return true; #elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_util_posix_close__multiple.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_util_posix_close__multiple.cc index 051d9df2784d..a3d67c4e05e2 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_util_posix_close__multiple.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_util_posix_close__multiple.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/crashpad/crashpad/util/posix/close_multiple.cc.orig 2022-02-28 16:54:41 UTC +--- src/3rdparty/chromium/third_party/crashpad/crashpad/util/posix/close_multiple.cc.orig 2023-12-10 06:10:27 UTC +++ src/3rdparty/chromium/third_party/crashpad/crashpad/util/posix/close_multiple.cc -@@ -72,7 +72,7 @@ void CloseNowOrOnExec(int fd, bool ebadf_ok) { +@@ -73,7 +73,7 @@ void CloseNowOrOnExec(int fd, bool ebadf_ok) { // This is an advantage over looping over all possible file descriptors, because // no attempt needs to be made to close file descriptors that are not open. bool CloseMultipleNowOrOnExecUsingFDDir(int min_fd, int preserve_fd) { diff --git a/www/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 bb7e4435422f..57a1ad80655b 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,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/dawn/include/dawn/native/VulkanBackend.h.orig 2023-08-17 07:33:31 UTC +--- 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 -@@ -80,7 +80,7 @@ struct ExternalImageExportInfoVk : ExternalImageExport +@@ -83,7 +83,7 @@ struct ExternalImageExportInfoVk : ExternalImageExport }; // Can't use DAWN_PLATFORM_IS(LINUX) since header included in both Dawn and Chrome diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_dawn_src_dawn_common_Platform.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_dawn_src_dawn_common_Platform.h index e0342ffbbd1b..333d2950e036 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_dawn_src_dawn_common_Platform.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_dawn_src_dawn_common_Platform.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/dawn/src/dawn/common/Platform.h.orig 2023-04-05 11:05:06 UTC +--- src/3rdparty/chromium/third_party/dawn/src/dawn/common/Platform.h.orig 2023-12-10 06:10:27 UTC +++ src/3rdparty/chromium/third_party/dawn/src/dawn/common/Platform.h -@@ -46,6 +46,11 @@ +@@ -59,6 +59,11 @@ #error "Unsupported Windows platform." #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_dawn_src_dawn_native_vulkan_BackendVk.cpp b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_dawn_src_dawn_native_vulkan_BackendVk.cpp index 257094dbc4d8..bc38db908f9a 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_dawn_src_dawn_native_vulkan_BackendVk.cpp +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_dawn_src_dawn_native_vulkan_BackendVk.cpp @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/dawn/src/dawn/native/vulkan/BackendVk.cpp.orig 2022-07-22 17:30:31 UTC +--- src/3rdparty/chromium/third_party/dawn/src/dawn/native/vulkan/BackendVk.cpp.orig 2024-02-23 21:04:38 UTC +++ src/3rdparty/chromium/third_party/dawn/src/dawn/native/vulkan/BackendVk.cpp -@@ -42,7 +42,7 @@ constexpr char kSwiftshaderLibName[] = "libvk_swiftsha +@@ -56,7 +56,7 @@ constexpr char kSwiftshaderLibName[] = "libvk_swiftsha #endif #if DAWN_PLATFORM_IS(LINUX) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_distributed__point__functions_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_distributed__point__functions_BUILD.gn deleted file mode 100644 index eece499a99dd..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_distributed__point__functions_BUILD.gn +++ /dev/null @@ -1,12 +0,0 @@ ---- src/3rdparty/chromium/third_party/distributed_point_functions/BUILD.gn.orig 2023-02-08 09:03:45 UTC -+++ src/3rdparty/chromium/third_party/distributed_point_functions/BUILD.gn -@@ -61,6 +61,9 @@ source_set("distributed_point_functions") { - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - -+ # XXX clang13 crashes with optimizations -+ configs += [ "//build/config/compiler:no_optimize" ] -+ - public_configs = [ ":distributed_point_functions_includes" ] - } - diff --git a/www/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 4917ac78d8ac..43030400be1b 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,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/ffmpeg/BUILD.gn.orig 2023-12-12 22:08:45 UTC +--- src/3rdparty/chromium/third_party/ffmpeg/BUILD.gn.orig 2024-07-03 01:14:49 UTC +++ src/3rdparty/chromium/third_party/ffmpeg/BUILD.gn @@ -357,7 +357,6 @@ target(link_target_type, "ffmpeg_internal") { libs += [ 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 index 7399348201c9..db7b34d682a1 100644 --- 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 @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/build_ffmpeg.py.orig 2023-09-13 12:11:42 UTC +--- 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' @@ -74,7 +74,7 @@ parser.print_help() return 1 -@@ -744,7 +752,7 @@ def ConfigureAndBuild(target_arch, target_os, host_os, +@@ -742,7 +750,7 @@ def ConfigureAndBuild(target_arch, target_os, host_os, '--enable-parser=vp3,vp8', ]) @@ -83,7 +83,7 @@ if target_arch == 'x64': if target_os == 'android': configure_flags['Common'].extend([ -@@ -754,7 +762,7 @@ def ConfigureAndBuild(target_arch, target_os, host_os, +@@ -752,7 +760,7 @@ def ConfigureAndBuild(target_arch, target_os, host_os, configure_flags['Common'].extend([ '--enable-lto', '--arch=x86_64', @@ -92,7 +92,7 @@ ]) if host_arch != 'x64': -@@ -845,7 +853,7 @@ def ConfigureAndBuild(target_arch, target_os, host_os, +@@ -843,7 +851,7 @@ def ConfigureAndBuild(target_arch, target_os, host_os, '--extra-cflags=-mfpu=vfpv3-d16', ]) elif target_arch == 'arm64': @@ -101,7 +101,7 @@ if host_arch != 'arm64': configure_flags['Common'].extend([ '--enable-cross-compile', -@@ -910,7 +918,7 @@ def ConfigureAndBuild(target_arch, target_os, host_os, +@@ -908,7 +916,7 @@ def ConfigureAndBuild(target_arch, target_os, host_os, '--disable-mips64r2', '--enable-msa', ]) @@ -110,7 +110,7 @@ configure_flags['Common'].extend([ '--enable-cross-compile', '--target-os=linux', -@@ -1061,7 +1069,7 @@ def ConfigureAndBuild(target_arch, target_os, host_os, +@@ -1059,7 +1067,7 @@ def ConfigureAndBuild(target_arch, target_os, host_os, 'Chrome', configure_flags['Common'] + configure_flags['ChromeAndroid'] + configure_args) 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 7978d8f99f43..d512f4d4ad58 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,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/ffmpeg/configure.orig 2023-10-12 11:37:12 UTC +--- src/3rdparty/chromium/third_party/ffmpeg/configure.orig 2024-01-30 07:53:34 UTC +++ src/3rdparty/chromium/third_party/ffmpeg/configure -@@ -5613,6 +5613,7 @@ case $target_os in +@@ -5615,6 +5615,7 @@ case $target_os in disable symver ;; freebsd) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_ffmpeg_libavcodec_x86_fft.asm b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_ffmpeg_libavcodec_x86_fft.asm deleted file mode 100644 index 54e1caaeae4e..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_ffmpeg_libavcodec_x86_fft.asm +++ /dev/null @@ -1,108 +0,0 @@ ---- src/3rdparty/chromium/third_party/ffmpeg/libavcodec/x86/fft.asm.orig 2023-07-16 15:47:57 UTC -+++ src/3rdparty/chromium/third_party/ffmpeg/libavcodec/x86/fft.asm -@@ -296,6 +296,7 @@ INIT_YMM avx - %if HAVE_AVX_EXTERNAL - align 16 - fft8_avx: -+ _CET_ENDBR - mova m0, Z(0) - mova m1, Z(1) - T8_AVX m0, m1, m2, m3, m4 -@@ -306,6 +307,7 @@ fft8_avx: - - align 16 - fft16_avx: -+ _CET_ENDBR - mova m2, Z(2) - mova m3, Z(3) - T4_SSE m2, m3, m7 -@@ -343,6 +345,7 @@ fft16_avx: - - align 16 - fft32_avx: -+ _CET_ENDBR - call fft16_avx - - mova m0, Z(4) -@@ -367,6 +370,7 @@ fft32_avx: - ret - - fft32_interleave_avx: -+ _CET_ENDBR - call fft32_avx - mov r2d, 32 - .deint_loop: -@@ -390,6 +394,7 @@ INIT_XMM sse - align 16 - fft4_avx: - fft4_sse: -+ _CET_ENDBR - mova m0, Z(0) - mova m1, Z(1) - T4_SSE m0, m1, m2 -@@ -399,6 +404,7 @@ fft4_sse: - - align 16 - fft8_sse: -+ _CET_ENDBR - mova m0, Z(0) - mova m1, Z(1) - T4_SSE m0, m1, m2 -@@ -413,6 +419,7 @@ fft8_sse: - - align 16 - fft16_sse: -+ _CET_ENDBR - mova m0, Z(0) - mova m1, Z(1) - T4_SSE m0, m1, m2 -@@ -441,6 +448,7 @@ fft16_sse: - %macro DECL_PASS 2+ ; name, payload - align 16 - %1: -+ _CET_ENDBR - DEFINE_ARGS zc, w, n, o1, o3 - lea o3q, [nq*3] - lea o1q, [nq*8] -@@ -457,10 +465,6 @@ DEFINE_ARGS zc, w, n, o1, o3 - %macro FFT_DISPATCH 2; clobbers 5 GPRs, 8 XMMs - lea r2, [dispatch_tab%1] - mov r2, [r2 + (%2q-2)*gprsize] --%ifdef PIC -- lea r3, [$$] -- add r2, r3 --%endif - call r2 - %endmacro ; FFT_DISPATCH - -@@ -585,11 +589,7 @@ cglobal imdct_calc, 3,5,3 - jl .loop - RET - --%ifdef PIC --%define SECTION_REL - $$ --%else - %define SECTION_REL --%endif - - %macro DECL_FFT 1-2 ; nbits, suffix - %ifidn %0, 1 -@@ -613,6 +613,7 @@ cglobal imdct_calc, 3,5,3 - - align 16 - fft %+ n %+ fullsuffix: -+ _CET_ENDBR - call fft %+ n2 %+ SUFFIX - add r0, n*4 - (n&(-2<<%1)) - call fft %+ n4 %+ SUFFIX -@@ -627,8 +628,10 @@ fft %+ n %+ fullsuffix: - %endrep - %undef n - -+[SECTION .data.rel.ro write] - align 8 - dispatch_tab %+ fullsuffix: pointer list_of_fft -+__?SECT?__ - %endmacro ; DECL_FFT - - %if HAVE_AVX_EXTERNAL diff --git a/www/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 b7c6baa11d8b..d15cf6434e81 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,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/ffmpeg/libavutil/x86/x86inc.asm.orig 2023-07-16 15:47:57 UTC +--- 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 @@ -53,6 +53,12 @@ %endif @@ -13,7 +13,7 @@ %define WIN64 0 %define UNIX64 0 %if ARCH_X86_64 -@@ -768,6 +774,7 @@ BRANCH_INSTR jz, je, jnz, jne, jl, jle, jnl, jnle, jg, +@@ -778,6 +784,7 @@ BRANCH_INSTR jz, je, jnz, jne, jl, jle, jnl, jnle, jg, %endif align function_align %2: diff --git a/www/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 d3327af989cd..7352e9bf3c12 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 2023-09-13 12:11:42 UTC +--- 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 -@@ -320,7 +320,8 @@ ChromiumWritableFile::ChromiumWritableFile(const std:: +@@ -326,7 +326,8 @@ ChromiumWritableFile::ChromiumWritableFile(const std:: Status ChromiumWritableFile::SyncParent() { TRACE_EVENT0("leveldb", "SyncParent"); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_libxml_linux_config.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_libxml_linux_config.h deleted file mode 100644 index 34e828185f7b..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_libxml_linux_config.h +++ /dev/null @@ -1,12 +0,0 @@ ---- src/3rdparty/chromium/third_party/libxml/linux/config.h.orig 2023-09-13 12:11:42 UTC -+++ src/3rdparty/chromium/third_party/libxml/linux/config.h -@@ -69,6 +69,9 @@ - /* Define to 1 if you have the header file. */ - #define HAVE_PTHREAD_H /**/ - -+/* Define to 1 if you have the `arc4random' function. */ -+#define HAVE_ARC4RANDOM 1 -+ - /* Define to 1 if you have the `rand_r' function. */ - - diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_libxml_src_dict.c b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_libxml_src_dict.c deleted file mode 100644 index ce42ad8fb0f6..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_libxml_src_dict.c +++ /dev/null @@ -1,41 +0,0 @@ ---- src/3rdparty/chromium/third_party/libxml/src/dict.c.orig 2023-03-09 06:31:50 UTC -+++ src/3rdparty/chromium/third_party/libxml/src/dict.c -@@ -133,7 +133,7 @@ struct _xmlDict { - static xmlMutex xmlDictMutex; - - #ifdef DICT_RANDOMIZATION --#ifdef HAVE_RAND_R -+#if defined(HAVE_RAND_R) && !defined(HAVE_ARC4RANDOM) - /* - * Internal data for random function, protected by xmlDictMutex - */ -@@ -160,7 +160,7 @@ int xmlInitializeDict(void) { - int __xmlInitializeDict(void) { - xmlInitMutex(&xmlDictMutex); - --#ifdef DICT_RANDOMIZATION -+#if defined(DICT_RANDOMIZATION) && !defined(HAVE_ARC4RANDOM) - #ifdef HAVE_RAND_R - rand_seed = time(NULL); - rand_r(& rand_seed); -@@ -175,13 +175,17 @@ int __xmlInitializeDict(void) { - int __xmlRandom(void) { - int ret; - -+#ifdef HAVE_ARC4RANDOM -+ ret = arc4random(); -+#else - xmlMutexLock(&xmlDictMutex); --#ifdef HAVE_RAND_R -+# ifdef HAVE_RAND_R - ret = rand_r(& rand_seed); --#else -+# else - ret = rand(); --#endif -+# endif - xmlMutexUnlock(&xmlDictMutex); -+#endif - return(ret); - } - #endif diff --git a/www/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 index 012d63151999..cf51fcf251b3 100644 --- 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 @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/maldoca/src/maldoca/base/get_runfiles_dir.cc.orig 2022-02-07 13:39:41 UTC +--- 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 -@@ -24,11 +24,6 @@ +@@ -25,11 +25,6 @@ #error "__APPLE__ not supported." #endif @@ -12,7 +12,7 @@ #if defined(_WIN32) #include #define PATH_MAX MAX_PATH -@@ -50,8 +45,6 @@ std::string GetExecutablePath() { +@@ -51,8 +46,6 @@ std::string GetExecutablePath() { char exe_path[PATH_MAX] = {0}; #ifdef __APPLE__ #error "__APPLE__ not supported."; @@ -21,7 +21,7 @@ #elif defined(_WIN32) HMODULE hModule = GetModuleHandleW(NULL); WCHAR wc_file_path[MAX_PATH] = {0}; -@@ -97,8 +90,6 @@ std::string GetExecutablePath() { +@@ -98,8 +91,6 @@ std::string GetExecutablePath() { absl::Status IsDirectory(const std::string& name) { #ifdef __APPLE__ #error "__APPLE__ not supported."; diff --git a/www/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 5756f922f7d5..ff116724d0f5 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 2023-12-12 22:08:45 UTC +--- 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 @@ -14,6 +14,8 @@ * limitations under the License. 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 8252cc43cf87..f02e5a76cbc0 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,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/node/node.py.orig 2023-12-12 22:08:45 UTC +--- src/3rdparty/chromium/third_party/node/node.py.orig 2024-07-03 01:14:49 UTC +++ src/3rdparty/chromium/third_party/node/node.py @@ -35,6 +35,8 @@ def GetBinaryPath(): return os_path.join(os_path.dirname(__file__), *{ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_pdfium_pdfium.gni b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_pdfium_pdfium.gni index 838db5141373..a5f7bb2cfc7c 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_pdfium_pdfium.gni +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_pdfium_pdfium.gni @@ -1,11 +1,11 @@ ---- src/3rdparty/chromium/third_party/pdfium/pdfium.gni.orig 2023-10-11 18:22:24 UTC +--- src/3rdparty/chromium/third_party/pdfium/pdfium.gni.orig 2024-02-23 21:04:38 UTC +++ src/3rdparty/chromium/third_party/pdfium/pdfium.gni -@@ -46,7 +46,7 @@ declare_args() { +@@ -42,7 +42,7 @@ declare_args() { # PDFium will use PartitionAlloc partitions to separate strings, scalars, # etc. from other allocations. However, the use of PartitionAlloc for new or # malloc is controlled by args in build_overrides/partition_alloc.gni. - pdf_use_partition_alloc = pdf_use_partition_alloc_override + pdf_use_partition_alloc = pdf_use_partition_alloc_override && use_partition_alloc_as_malloc - # Temporary config allowing chromium to switch its location of the - # partition_alloc library. https://crbug.com/1467773 + # Build PDFium to use Skia (experimental) for all PDFium graphics. + # If enabled, coexists in build with AGG graphics and the default diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_pdfium_third__party_base_compiler__specific.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_pdfium_third__party_base_compiler__specific.h deleted file mode 100644 index 0479b60ec02a..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_pdfium_third__party_base_compiler__specific.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/third_party/pdfium/third_party/base/compiler_specific.h.orig 2023-05-31 08:12:17 UTC -+++ src/3rdparty/chromium/third_party/pdfium/third_party/base/compiler_specific.h -@@ -17,7 +17,7 @@ - // Annotate a function indicating it should not be inlined. - // Use like: - // NOINLINE void DoStuff() { ... } --#if defined(__clang__) && HAS_ATTRIBUTE(noinline) -+#if defined(__clang__) && (__clang_major__ >= 15) && HAS_ATTRIBUTE(noinline) - #define NOINLINE [[clang::noinline]] - #elif defined(COMPILER_GCC) && HAS_ATTRIBUTE(noinline) - #define NOINLINE __attribute__((noinline)) diff --git a/www/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 3f893c193d95..d6e5ae140f08 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 2023-03-09 06:31:50 UTC +--- 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 -@@ -157,6 +157,9 @@ inline TimeNanos GetTimeInternalNs(clockid_t clk_id) { +@@ -193,6 +193,9 @@ inline TimeNanos GetTimeInternalNs(clockid_t clk_id) { // Return ns from boot. Conversely to GetWallTimeNs, this clock counts also time // during suspend (when supported). inline TimeNanos GetBootTimeNs() { @@ -10,7 +10,7 @@ // Determine if CLOCK_BOOTTIME is available on the first call. static const clockid_t kBootTimeClockSource = [] { struct timespec ts = {}; -@@ -164,6 +167,7 @@ inline TimeNanos GetBootTimeNs() { +@@ -200,6 +203,7 @@ inline TimeNanos GetBootTimeNs() { return res == 0 ? CLOCK_BOOTTIME : kWallTimeClockSource; }(); return GetTimeInternalNs(kBootTimeClockSource); @@ -18,7 +18,7 @@ } inline TimeNanos GetWallTimeNs() { -@@ -171,7 +175,13 @@ inline TimeNanos GetWallTimeNs() { +@@ -207,7 +211,13 @@ inline TimeNanos GetWallTimeNs() { } inline TimeNanos GetWallTimeRawNs() { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_include_perfetto_ext_base_thread__utils.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_include_perfetto_ext_base_thread__utils.h index eddde87c9b04..e72af56acee2 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_include_perfetto_ext_base_thread__utils.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_include_perfetto_ext_base_thread__utils.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/thread_utils.h.orig 2022-02-07 13:39:41 UTC +--- src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/thread_utils.h.orig 2023-12-10 06:10:27 UTC +++ src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/thread_utils.h -@@ -40,9 +40,10 @@ +@@ -41,9 +41,10 @@ namespace perfetto { namespace base { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_src_base_string__utils.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_src_base_string__utils.cc index eb6b37260fff..0acfbe7ac72a 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_src_base_string__utils.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_src_base_string__utils.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/perfetto/src/base/string_utils.cc.orig 2022-02-07 13:39:41 UTC +--- src/3rdparty/chromium/third_party/perfetto/src/base/string_utils.cc.orig 2023-12-10 06:10:27 UTC +++ src/3rdparty/chromium/third_party/perfetto/src/base/string_utils.cc -@@ -36,9 +36,10 @@ namespace base { +@@ -38,9 +38,10 @@ namespace base { // Locale-independant as possible version of strtod. double StrToD(const char* nptr, char** endptr) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_src_trace__processor_db_storage_numeric__storage.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_src_trace__processor_db_storage_numeric__storage.cc deleted file mode 100644 index 565f390bca05..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_src_trace__processor_db_storage_numeric__storage.cc +++ /dev/null @@ -1,16 +0,0 @@ ---- src/3rdparty/chromium/third_party/perfetto/src/trace_processor/db/storage/numeric_storage.cc.orig 2023-10-14 11:56:57 UTC -+++ src/3rdparty/chromium/third_party/perfetto/src/trace_processor/db/storage/numeric_storage.cc -@@ -245,8 +245,13 @@ BitVector NumericStorage::LinearSearch(FilterOp op, - } else if (const auto* i32 = std::get_if(&*val)) { - auto* start = static_cast(data_) + range.start; - TypedLinearSearch(*i32, start, op, builder); -+#if (defined(__OpenBSD__) || defined(__FreeBSD__)) && defined(__i386__) -+ } else if (const auto* db = std::get_if(&*val)) { -+ auto* start = static_cast(data_) + range.start; -+#else - } else if (const auto* db = std::get_if(&*val)) { - auto* start = static_cast(data_) + range.start; -+#endif - TypedLinearSearch(*db, start, op, builder); - } else { - PERFETTO_DFATAL("Invalid"); 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_tracing__service__impl.cc index 6efdf1fe26fe..91855e16868b 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_tracing__service__impl.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/perfetto/src/tracing/core/tracing_service_impl.cc.orig 2023-10-11 18:22:24 UTC +--- 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 -@@ -3213,7 +3213,8 @@ bool TracingServiceImpl::SnapshotClocks( +@@ -3244,7 +3244,8 @@ bool TracingServiceImpl::SnapshotClocks( #if !PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE) && \ !PERFETTO_BUILDFLAG(PERFETTO_OS_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 new file mode 100644 index 000000000000..bf60f642c6b5 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_speech-dispatcher_libspeechd__version.h @@ -0,0 +1,32 @@ +--- 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 +@@ -0,0 +1,29 @@ ++/* ++ * libspeechd_version.h - Shared library for easy access to Speech Dispatcher functions (header) ++ * ++ * Copyright (C) 2001, 2002, 2003, 2004 Brailcom, o.p.s. ++ * ++ * This is free software; you can redistribute it and/or modify it ++ * under the terms of the GNU Lesser General Public License as published by ++ * the Free Software Foundation; either version 2.1, or (at your option) ++ * any later version. ++ * ++ * This software is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public License ++ * along with this program. If not, see . ++ * ++ * $Id: libspeechd.h,v 1.29 2008-07-30 09:47:00 hanke Exp $ ++ */ ++ ++#ifndef _LIBSPEECHD_VERSION_H ++#define _LIBSPEECHD_VERSION_H ++ ++#define LIBSPEECHD_MAJOR_VERSION 0 ++#define LIBSPEECHD_MINOR_VERSION 11 ++#define LIBSPEECHD_MICRO_VERSION 5 ++ ++#endif /* ifndef _LIBSPEECHD_VERSION_H */ diff --git a/www/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 751b46f30d9d..3f16d6e1eb52 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,15 @@ ---- src/3rdparty/chromium/third_party/sqlite/src/amalgamation/sqlite3.c.orig 2023-08-17 07:33:31 UTC +--- 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 -@@ -43843,7 +43843,12 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB +@@ -14049,7 +14049,7 @@ struct fts5_api { + ** But _XOPEN_SOURCE define causes problems for Mac OS X, so omit + ** it. + */ +-#if !defined(_XOPEN_SOURCE) && !defined(__DARWIN__) && !defined(__APPLE__) ++#if !defined(_XOPEN_SOURCE) && !defined(__DARWIN__) && !defined(__APPLE__) && !defined(__FreeBSD__) + # define _XOPEN_SOURCE 600 + #endif + +@@ -44505,7 +44505,12 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB memset(zBuf, 0, nBuf); randomnessPid = osGetpid(0); #if !defined(SQLITE_TEST) && !defined(SQLITE_OMIT_RANDOMNESS) @@ -13,7 +22,7 @@ int fd, got; fd = robust_open("/dev/urandom", O_RDONLY, 0); if( fd<0 ){ -@@ -43858,6 +43863,7 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB +@@ -44520,6 +44525,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_tflite_features.gni b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_tflite_features.gni index f47ca892d84a..01a0aae1f45c 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,11 +1,14 @@ ---- src/3rdparty/chromium/third_party/tflite/features.gni.orig 2022-11-30 08:12:58 UTC +--- src/3rdparty/chromium/third_party/tflite/features.gni.orig 2023-12-10 06:10:27 UTC +++ src/3rdparty/chromium/third_party/tflite/features.gni -@@ -7,7 +7,7 @@ import("//build/config/chrome_build.gni") - declare_args() { +@@ -8,9 +8,9 @@ declare_args() { # This enables building TFLite with XNNPACK. Currently only available for - # Linux or Windows on x64. -- build_tflite_with_xnnpack = (is_win || is_linux) && current_cpu == "x64" -+ build_tflite_with_xnnpack = ((is_win || is_linux) && current_cpu == "x64") && !is_bsd + # Linux or macOS arm64/x64 and Windows x64 targets. + build_tflite_with_xnnpack = +- ((is_linux || is_mac) && ++ (((is_linux || is_mac) && + (current_cpu == "arm64" || current_cpu == "x64")) || +- (is_win && current_cpu == "x64") ++ (is_win && current_cpu == "x64")) && !is_bsd # Turns on TFLITE_WITH_RUY, using ruy as the gemm backend instead of gemmlowp. build_tflite_with_ruy = true diff --git a/www/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-deps_vulkan-loader_src_BUILD.gn index bf385233e1f8..46c8cd31b8fc 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-deps_vulkan-loader_src_BUILD.gn @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/vulkan-deps/vulkan-loader/src/BUILD.gn.orig 2023-07-16 15:47:57 UTC +--- 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") { defines += [ @@ -8,4 +8,4 @@ + "FALLBACK_DATA_DIRS=\"/usr/X11R6/share:/usr/local/share:/usr/share\"", ] } - if (!vulkan_loader_shared) { + if (is_apple && !vulkan_loader_shared) { diff --git a/www/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-deps_vulkan-loader_src_loader_vk__loader__platform.h index 78722a23698c..646c371497af 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-deps_vulkan-loader_src_loader_vk__loader__platform.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/vulkan-deps/vulkan-loader/src/loader/vk_loader_platform.h.orig 2023-10-11 18:22:24 UTC +--- 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 -@@ -304,7 +304,15 @@ static inline char *loader_platform_executable_path(ch +@@ -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__memory__allocator_include_vk__mem__alloc.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_vulkan__memory__allocator_include_vk__mem__alloc.h index 79fb83e67a78..b9bf4a40e9f8 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_vulkan__memory__allocator_include_vk__mem__alloc.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_vulkan__memory__allocator_include_vk__mem__alloc.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h.orig 2023-12-12 22:08:45 UTC +--- src/3rdparty/chromium/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h.orig 2023-12-10 07:19:51 UTC +++ src/3rdparty/chromium/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h -@@ -2507,7 +2507,7 @@ void *vma_aligned_alloc(size_t alignment, size_t size) +@@ -2760,7 +2760,7 @@ void* vma_aligned_alloc(size_t alignment, size_t size) return memalign(alignment, size); } 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 ab2fc3d5a55d..1648b6afef4a 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-09-13 12:11:42 UTC +--- src/3rdparty/chromium/third_party/webrtc/BUILD.gn.orig 2023-11-03 10:09:45 UTC +++ src/3rdparty/chromium/third_party/webrtc/BUILD.gn -@@ -216,6 +216,9 @@ config("common_inherited_config") { +@@ -217,6 +217,9 @@ config("common_inherited_config") { if (is_linux || is_chromeos) { defines += [ "WEBRTC_LINUX" ] } diff --git a/www/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 bbb9e9aecb9a..45deaee82683 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 2023-09-13 12:11:42 UTC +--- 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 -@@ -349,7 +349,7 @@ rtc_library("audio_device_impl") { +@@ -350,7 +350,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_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 b3621f020698..1700f7c7a37b 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-04-28 17:01:32 UTC +--- 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 -@@ -56,7 +56,7 @@ +@@ -53,7 +53,7 @@ #include "rtc_base/time_utils.h" #include "system_wrappers/include/field_trial.h" @@ -9,7 +9,7 @@ #include #endif -@@ -75,7 +75,7 @@ typedef void* SockOptArg; +@@ -73,7 +73,7 @@ typedef void* SockOptArg; #endif // WEBRTC_POSIX @@ -18,7 +18,7 @@ int64_t GetSocketRecvTimestamp(int socket) { struct timeval tv_ioctl; -@@ -310,7 +310,7 @@ int PhysicalSocket::GetOption(Option opt, int* value) +@@ -307,7 +307,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) { -@@ -328,7 +328,7 @@ int PhysicalSocket::SetOption(Option opt, int value) { +@@ -325,7 +325,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) { -@@ -356,7 +356,7 @@ int PhysicalSocket::SetOption(Option opt, int value) { +@@ -353,7 +353,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 -@@ -385,7 +385,7 @@ int PhysicalSocket::SendTo(const void* buffer, +@@ -382,7 +382,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 -@@ -643,7 +643,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* s +@@ -641,7 +641,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* s *slevel = IPPROTO_IP; *sopt = IP_DONTFRAGMENT; break; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_physical__socket__server.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_physical__socket__server.h index 2ad61cfbad04..63d8db15c784 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_physical__socket__server.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_physical__socket__server.h @@ -1,11 +1,11 @@ ---- src/3rdparty/chromium/third_party/webrtc/rtc_base/physical_socket_server.h.orig 2023-04-28 17:01:32 UTC +--- src/3rdparty/chromium/third_party/webrtc/rtc_base/physical_socket_server.h.orig 2023-12-10 06:10:27 UTC +++ src/3rdparty/chromium/third_party/webrtc/rtc_base/physical_socket_server.h -@@ -14,7 +14,7 @@ - #include "api/units/time_delta.h" +@@ -18,7 +18,7 @@ + #include "rtc_base/third_party/sigslot/sigslot.h" #if defined(WEBRTC_POSIX) -#if defined(WEBRTC_LINUX) +#if defined(WEBRTC_LINUX) && !defined(WEBRTC_BSD) // On Linux, use epoll. #include - #define WEBRTC_USE_EPOLL 1 + diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_widevine_cdm_widevine.gni b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_widevine_cdm_widevine.gni index e47da639e240..06e11cf6885b 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_widevine_cdm_widevine.gni +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_widevine_cdm_widevine.gni @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/widevine/cdm/widevine.gni.orig 2023-10-11 18:22:24 UTC +--- src/3rdparty/chromium/third_party/widevine/cdm/widevine.gni.orig 2023-12-10 06:10:27 UTC +++ src/3rdparty/chromium/third_party/widevine/cdm/widevine.gni -@@ -27,6 +27,8 @@ library_widevine_cdm_available = +@@ -28,6 +28,8 @@ library_widevine_cdm_available = (is_chromeos && (target_cpu == "x64" || target_cpu == "arm" || target_cpu == "arm64")) || (target_os == "linux" && target_cpu == "x64") || 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 d64f15ad9b82..41955e083550 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,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/zlib/BUILD.gn.orig 2023-12-12 22:08:45 UTC +--- src/3rdparty/chromium/third_party/zlib/BUILD.gn.orig 2024-07-03 01:14:49 UTC +++ src/3rdparty/chromium/third_party/zlib/BUILD.gn -@@ -139,7 +139,7 @@ if (use_arm_neon_optimizations) { +@@ -140,7 +140,7 @@ if (use_arm_neon_optimizations) { defines = [ "CRC32_ARMV8_CRC32" ] if (is_android) { defines += [ "ARMV8_OS_ANDROID" ] @@ -9,7 +9,7 @@ defines += [ "ARMV8_OS_LINUX" ] } else if (is_mac) { defines += [ "ARMV8_OS_MACOS" ] -@@ -149,6 +149,10 @@ if (use_arm_neon_optimizations) { +@@ -150,6 +150,10 @@ if (use_arm_neon_optimizations) { defines += [ "ARMV8_OS_FUCHSIA" ] } else if (is_win) { defines += [ "ARMV8_OS_WINDOWS" ] @@ -20,7 +20,7 @@ } else { assert(false, "Unsupported ARM OS") } -@@ -462,7 +466,7 @@ static_library("bundled_minizip") { +@@ -461,7 +465,7 @@ static_library("bundled_minizip") { ] } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_grit_grit_node_base.py b/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_grit_grit_node_base.py new file mode 100644 index 000000000000..c0a8e0215811 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_grit_grit_node_base.py @@ -0,0 +1,12 @@ +--- src/3rdparty/chromium/tools/grit/grit/node/base.py.orig 2024-02-23 21:04:38 UTC ++++ src/3rdparty/chromium/tools/grit/grit/node/base.py +@@ -498,7 +498,8 @@ class Node: + value = defs + + elif name == 'is_linux': +- value = target_platform == 'linux' ++ value = (target_platform == 'linux' ++ or 'bsd' in target_platform) + elif name == 'is_chromeos': + value = target_platform == 'chromeos' + elif name == 'is_macosx': diff --git a/www/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 7b114a5793ba..be848ce8a25c 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 2023-05-31 08:12:17 UTC +--- 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 -@@ -272,6 +272,8 @@ FEATURE_GRAMMAR = ({ +@@ -276,6 +276,8 @@ FEATURE_GRAMMAR = ({ 'linux': 'Feature::LINUX_PLATFORM', 'mac': 'Feature::MACOSX_PLATFORM', 'win': 'Feature::WIN_PLATFORM', diff --git a/www/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 eece09516469..40c86a180de7 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 2023-12-12 22:08:45 UTC +--- src/3rdparty/chromium/tools/licenses/licenses.py.orig 2024-07-03 01:14:49 UTC +++ src/3rdparty/chromium/tools/licenses/licenses.py -@@ -751,6 +751,8 @@ def _GnBinary(): +@@ -816,6 +816,8 @@ def _GnBinary(): exe = 'gn' if sys.platform.startswith('linux'): subdir = 'linux64' diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_memory_partition__allocator_inspect__utils.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_memory_partition__allocator_inspect__utils.h index 30d5beb2271a..f9d75420020b 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_memory_partition__allocator_inspect__utils.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_memory_partition__allocator_inspect__utils.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/tools/memory/partition_allocator/inspect_utils.h.orig 2022-06-17 14:20:10 UTC +--- src/3rdparty/chromium/tools/memory/partition_allocator/inspect_utils.h.orig 2024-02-23 21:04:38 UTC +++ src/3rdparty/chromium/tools/memory/partition_allocator/inspect_utils.h -@@ -60,7 +60,7 @@ class RemoteProcessMemoryReader { +@@ -61,7 +61,7 @@ class RemoteProcessMemoryReader { const pid_t pid_; bool is_valid_; diff --git a/www/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 a6355ce7ed8d..7c9e33b9cd26 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 2023-05-31 08:12:17 UTC +--- 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 @@ -47,7 +47,7 @@ group("telemetry_chrome_test") { data_deps += [ "//chrome:reorder_imports" ] @@ -9,7 +9,7 @@ data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] # CrOS currently has issues with the locally compiled version of -@@ -172,7 +172,7 @@ group("telemetry_chrome_test_without_chrome") { +@@ -178,7 +178,7 @@ group("telemetry_chrome_test_without_chrome") { ] # Cr-Fuchsia doesn't support breakpad. diff --git a/www/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 46d788a1632c..f66a6917a4aa 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-02-08 09:03:45 UTC +--- src/3rdparty/chromium/ui/aura/screen_ozone.cc.orig 2023-11-03 10:09:45 UTC +++ src/3rdparty/chromium/ui/aura/screen_ozone.cc -@@ -110,7 +110,7 @@ display::Display ScreenOzone::GetPrimaryDisplay() cons +@@ -106,7 +106,7 @@ display::Display ScreenOzone::GetPrimaryDisplay() cons return platform_screen_->GetPrimaryDisplay(); } diff --git a/www/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 192c365305a8..5e097f1f16ef 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-02-08 09:03:45 UTC +--- src/3rdparty/chromium/ui/aura/screen_ozone.h.orig 2023-11-03 10:09:45 UTC +++ src/3rdparty/chromium/ui/aura/screen_ozone.h -@@ -46,7 +46,7 @@ class AURA_EXPORT ScreenOzone : public display::Screen +@@ -44,7 +44,7 @@ class AURA_EXPORT ScreenOzone : public display::Screen display::Display GetDisplayMatching( const gfx::Rect& match_rect) const override; display::Display GetPrimaryDisplay() const override; @@ -9,7 +9,7 @@ std::unique_ptr SuspendScreenSaver() override; #endif // BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) -@@ -73,7 +73,7 @@ class AURA_EXPORT ScreenOzone : public display::Screen +@@ -71,7 +71,7 @@ class AURA_EXPORT ScreenOzone : public display::Screen ui::PlatformScreen* platform_screen() { return platform_screen_.get(); } private: diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_clipboard_clipboard__constants.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_clipboard_clipboard__constants.cc index 4b933345240f..562feaeac6dd 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_clipboard_clipboard__constants.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_clipboard_clipboard__constants.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/base/clipboard/clipboard_constants.cc.orig 2022-03-25 21:59:56 UTC +--- src/3rdparty/chromium/ui/base/clipboard/clipboard_constants.cc.orig 2023-12-10 06:10:27 UTC +++ src/3rdparty/chromium/ui/base/clipboard/clipboard_constants.cc -@@ -24,7 +24,7 @@ const char kMimeTypeOctetStream[] = "application/octet +@@ -25,7 +25,7 @@ const char kMimeTypeOctetStream[] = "application/octet // Used for window dragging on some platforms. const char kMimeTypeWindowDrag[] = "chromium/x-window-drag"; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_clipboard_clipboard__constants.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_clipboard_clipboard__constants.h index d028631ecb43..63295e3ea98e 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_clipboard_clipboard__constants.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_clipboard_clipboard__constants.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/base/clipboard/clipboard_constants.h.orig 2023-02-08 09:03:45 UTC +--- src/3rdparty/chromium/ui/base/clipboard/clipboard_constants.h.orig 2023-12-10 06:10:27 UTC +++ src/3rdparty/chromium/ui/base/clipboard/clipboard_constants.h -@@ -47,7 +47,7 @@ extern const char kMimeTypeDataTransferEndpoint[]; +@@ -48,7 +48,7 @@ extern const char kMimeTypeDataTransferEndpoint[]; // ----- LINUX & CHROMEOS & FUCHSIA MIME TYPES ----- diff --git a/www/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 new file mode 100644 index 000000000000..25287459f212 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_clipboard_clipboard__non__backed.cc @@ -0,0 +1,11 @@ +--- 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 +@@ -460,7 +460,7 @@ ClipboardNonBacked::ClipboardNonBacked() { + // so create internal clipboards for platform supported clipboard buffers. + constexpr ClipboardBuffer kClipboardBuffers[] = { + ClipboardBuffer::kCopyPaste, +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + ClipboardBuffer::kSelection, + #endif + #if BUILDFLAG(IS_MAC) diff --git a/www/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 5edfe0015072..76a7c0d40c15 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 2023-12-12 22:08:45 UTC +--- 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 @@ -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 f28d7e0eccb1..f68957e592b9 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,6 +1,6 @@ ---- src/3rdparty/chromium/ui/base/dragdrop/os_exchange_data_provider_non_backed.cc.orig 2022-02-28 16:54:41 UTC +--- 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 -@@ -94,7 +94,7 @@ void OSExchangeDataProviderNonBacked::SetPickledData( +@@ -96,7 +96,7 @@ void OSExchangeDataProviderNonBacked::SetPickledData( } bool OSExchangeDataProviderNonBacked::GetString(std::u16string* data) const { 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 new file mode 100644 index 000000000000..42824be4b3ae --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_init_input__method__initializer.cc @@ -0,0 +1,29 @@ +--- 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 +@@ -10,7 +10,7 @@ + #include "build/chromeos_buildflags.h" + + #if !BUILDFLAG(IS_CHROMEOS_ASH) && defined(USE_AURA) && \ +- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) ++ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) + #include "ui/base/ime/linux/fake_input_method_context.h" + #include "ui/base/ime/linux/linux_input_method_context_factory.h" + #elif BUILDFLAG(IS_WIN) +@@ -33,7 +33,7 @@ void ShutdownInputMethod() { + } + + void InitializeInputMethodForTesting() { +-#if defined(USE_AURA) && BUILDFLAG(IS_LINUX) ++#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) + GetInputMethodContextFactoryForTest() = + base::BindRepeating([](LinuxInputMethodContextDelegate* delegate) + -> std::unique_ptr { +@@ -46,7 +46,7 @@ void InitializeInputMethodForTesting() { + + void ShutdownInputMethodForTesting() { + #if !BUILDFLAG(IS_CHROMEOS_ASH) && defined(USE_AURA) && \ +- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) ++ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) + // The function owns the factory (as a static variable that's returned by + // reference), so setting this to an empty factory will free the old one. + GetInputMethodContextFactoryForTest() = LinuxInputMethodContextFactory(); diff --git a/www/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 06c7bc0d03bd..787c2f3e0406 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,4 +1,4 @@ ---- src/3rdparty/chromium/ui/base/resource/resource_bundle.cc.orig 2023-09-13 12:11:42 UTC +--- 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 @@ -926,7 +926,7 @@ void ResourceBundle::ReloadFonts() { } 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 fe398bc13563..93466cb53673 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,38 +1,20 @@ ---- src/3rdparty/chromium/ui/base/ui_base_features.cc.orig 2023-12-12 22:08:45 UTC +--- 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 -@@ -135,7 +135,7 @@ bool AreF11AndF12ShortcutsEnabled() { - } - #endif // BUILDFLAG(IS_CHROMEOS_ASH) +@@ -217,7 +217,7 @@ BASE_FEATURE(kUiCompositorScrollWithLayers, --#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - BASE_FEATURE(kRedundantImeCompositionClearing, - "RedundantImeCompositionClearing", - base::FEATURE_ENABLED_BY_DEFAULT); -@@ -234,7 +234,7 @@ CONSTINIT const base::Feature kExperimentalFlingAnimat - "ExperimentalFlingAnimation", - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. + // Enables the use of a touch fling curve that is based on the behavior of + // native apps on Windows. -#if BUILDFLAG(IS_WIN) || \ +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) || \ (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_ASH) && \ !BUILDFLAG(IS_CHROMEOS_LACROS)) - base::FEATURE_ENABLED_BY_DEFAULT -@@ -346,7 +346,7 @@ CONSTINIT const base::Feature kEyeDropper( + BASE_FEATURE(kExperimentalFlingAnimation, +@@ -321,7 +321,7 @@ bool IsForcedColorsEnabled() { + // and Linux. This feature will be released for other platforms in later // milestones. - CONSTINIT const base::Feature kEyeDropper( - "EyeDropper", --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - base::FEATURE_ENABLED_BY_DEFAULT + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + BASE_FEATURE(kEyeDropper, "EyeDropper", base::FEATURE_ENABLED_BY_DEFAULT); #else - base::FEATURE_DISABLED_BY_DEFAULT -@@ -565,7 +565,7 @@ ChromeRefresh2023Level GetChromeRefresh2023Level() { - return level; - } - --#if !BUILDFLAG(IS_LINUX) -+#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) - BASE_FEATURE(kWebUiSystemFont, - "WebUiSystemFont", - base::FEATURE_ENABLED_BY_DEFAULT); + BASE_FEATURE(kEyeDropper, "EyeDropper", base::FEATURE_DISABLED_BY_DEFAULT); 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 deleted file mode 100644 index b987c796364c..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ui__base__features.h +++ /dev/null @@ -1,20 +0,0 @@ ---- src/3rdparty/chromium/ui/base/ui_base_features.h.orig 2023-10-11 18:22:24 UTC -+++ src/3rdparty/chromium/ui/base/ui_base_features.h -@@ -138,7 +138,7 @@ BASE_DECLARE_FEATURE(kSupportF11AndF12KeyShortcuts); - COMPONENT_EXPORT(UI_BASE_FEATURES) bool AreF11AndF12ShortcutsEnabled(); - #endif // BUILDFLAG(IS_CHROMEOS_ASH) - --#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - COMPONENT_EXPORT(UI_BASE_FEATURES) - BASE_DECLARE_FEATURE(kRedundantImeCompositionClearing); - #endif // BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) -@@ -273,7 +273,7 @@ enum class ChromeRefresh2023Level { - COMPONENT_EXPORT(UI_BASE_FEATURES) - ChromeRefresh2023Level GetChromeRefresh2023Level(); - --#if !BUILDFLAG(IS_LINUX) -+#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) - COMPONENT_EXPORT(UI_BASE_FEATURES) BASE_DECLARE_FEATURE(kWebUiSystemFont); - #endif - diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ui__base__types.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ui__base__types.h deleted file mode 100644 index dc5e797a884a..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ui__base__types.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/ui/base/ui_base_types.h.orig 2022-11-30 08:12:58 UTC -+++ src/3rdparty/chromium/ui/base/ui_base_types.h -@@ -32,7 +32,7 @@ enum WindowShowState { - SHOW_STATE_END = 6 // The end of show state enum. - }; - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) - // Specifies which edges of the window are tiled. - // - // Wayland can notify the application if certain edge of the window is diff --git a/www/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 b5511aa3402b..f7849af69cf1 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,15 +1,15 @@ ---- src/3rdparty/chromium/ui/base/webui/web_ui_util.cc.orig 2023-12-12 22:08:45 UTC +--- 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 @@ -41,7 +41,7 @@ std::string GetFontFamilyMd() { constexpr float kMaxScaleFactor = 1000.0f; std::string GetFontFamilyMd() { --#if !BUILDFLAG(IS_LINUX) -+#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) - if (base::FeatureList::IsEnabled(features::kWebUiSystemFont)) { - return GetFontFamily(); - } -@@ -221,7 +221,7 @@ std::string GetFontFamily() { +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + return "Roboto, " + GetFontFamily(); + #else + return GetFontFamily(); +@@ -219,7 +219,7 @@ std::string GetFontFamily() { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_x_x11__cursor__factory.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_x_x11__cursor__factory.cc index 0553168d37d7..e47ac1a3f5e7 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_x_x11__cursor__factory.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_x_x11__cursor__factory.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ui/base/x/x11_cursor_factory.cc.orig 2023-08-17 07:33:31 UTC +--- src/3rdparty/chromium/ui/base/x/x11_cursor_factory.cc.orig 2023-11-03 10:09:45 UTC +++ src/3rdparty/chromium/ui/base/x/x11_cursor_factory.cc @@ -13,7 +13,7 @@ #include "ui/gfx/geometry/point.h" @@ -9,7 +9,7 @@ #include "ui/linux/linux_ui.h" #endif -@@ -62,7 +62,7 @@ scoped_refptr X11CursorFactory::Create +@@ -70,7 +70,7 @@ scoped_refptr X11CursorFactory::Create } void X11CursorFactory::ObserveThemeChanges() { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_x_x11__cursor__factory.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_x_x11__cursor__factory.h index 650ac821a0cb..f813cd21a24c 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_x_x11__cursor__factory.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_x_x11__cursor__factory.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ui/base/x/x11_cursor_factory.h.orig 2023-08-17 07:33:31 UTC +--- src/3rdparty/chromium/ui/base/x/x11_cursor_factory.h.orig 2023-11-03 10:09:45 UTC +++ src/3rdparty/chromium/ui/base/x/x11_cursor_factory.h @@ -20,7 +20,7 @@ namespace ui { class X11Cursor; @@ -9,9 +9,9 @@ class LinuxUi; #endif -@@ -60,7 +60,7 @@ class COMPONENT_EXPORT(UI_BASE_X) X11CursorFactory - - std::map> default_cursors_; +@@ -62,7 +62,7 @@ class COMPONENT_EXPORT(UI_BASE_X) X11CursorFactory + // initializing `cursor_loader_` will modify `default_cursors_`. + std::unique_ptr cursor_loader_; -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || 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 d525415d88bc..4f1eb7994537 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,15 +1,15 @@ ---- src/3rdparty/chromium/ui/base/x/x11_cursor_loader.cc.orig 2023-09-13 12:11:42 UTC +--- 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 -@@ -32,7 +32,7 @@ +@@ -31,7 +31,7 @@ + #include "ui/gfx/x/connection.h" #include "ui/gfx/x/xproto.h" - #include "ui/gfx/x/xproto_util.h" -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "ui/linux/linux_ui.h" #endif -@@ -138,7 +138,11 @@ std::string CursorPathFromLibXcursor() { +@@ -137,7 +137,11 @@ std::string CursorPathFromLibXcursor() { void operator()(void* ptr) const { dlclose(ptr); } }; @@ -21,7 +21,7 @@ if (!lib) return ""; -@@ -249,7 +253,7 @@ scoped_refptr ReadCursorFile( +@@ -248,7 +252,7 @@ scoped_refptr ReadCursorFile( const std::string& rm_xcursor_theme) { constexpr const char kDefaultTheme[] = "default"; std::string themes[] = { @@ -30,9 +30,9 @@ // The toolkit theme has the highest priority. LinuxUi::instance() ? LinuxUi::instance()->GetCursorThemeName() : std::string(), -@@ -443,7 +447,7 @@ uint32_t XCursorLoader::GetPreferredCursorSize() const - if (base::StringToInt(GetEnv(kXcursorSizeEnv), &size) && size > 0) +@@ -440,7 +444,7 @@ uint32_t XCursorLoader::GetPreferredCursorSize() const return size; + } -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) diff --git a/www/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 new file mode 100644 index 000000000000..0b034320ddc4 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_x_x11__display__manager.cc @@ -0,0 +1,20 @@ +--- 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 +@@ -15,7 +15,7 @@ + #include "ui/gfx/x/randr.h" + #include "ui/gfx/x/xproto.h" + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "ui/linux/linux_ui.h" + #endif + +@@ -91,7 +91,7 @@ void XDisplayManager::FetchDisplayList() { + ? display::Display::GetForcedDeviceScaleFactor() + : 1.0f}; + const auto* display_config = &empty_display_config; +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (const auto* linux_ui = ui::LinuxUi::instance()) { + display_config = &linux_ui->display_config(); + } diff --git a/www/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 new file mode 100644 index 000000000000..a0fc5fcd453e --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_x_x11__display__util.cc @@ -0,0 +1,364 @@ +--- 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__util.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_x_x11__util.cc new file mode 100644 index 000000000000..0c640bc94f8b --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_x_x11__util.cc @@ -0,0 +1,23 @@ +--- 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 new file mode 100644 index 000000000000..97ed1e50acc4 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_x_x11__util.h @@ -0,0 +1,13 @@ +--- 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 6abcc24d15b8..e8c59f2ace28 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,6 +1,6 @@ ---- src/3rdparty/chromium/ui/color/color_id.h.orig 2023-10-11 18:22:24 UTC +--- src/3rdparty/chromium/ui/color/color_id.h.orig 2024-01-30 07:53:34 UTC +++ src/3rdparty/chromium/ui/color/color_id.h -@@ -567,7 +567,7 @@ +@@ -610,7 +610,7 @@ E_CPONLY(kColorNativeColor6) \ E_CPONLY(kColorNativeBaseColor) \ E_CPONLY(kColorNativeSecondaryColor) 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 bead88027297..fb973da7740d 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-01-11 09:17:16 UTC +--- 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 -@@ -103,7 +103,7 @@ base::StringPiece SystemThemeName(ui::SystemTheme syst +@@ -187,7 +187,7 @@ base::StringPiece SystemThemeName(ui::SystemTheme syst 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 f5f4dcb524d1..8f1c7922259d 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,11 +1,11 @@ ---- src/3rdparty/chromium/ui/compositor/compositor.cc.orig 2023-09-13 12:11:42 UTC +--- src/3rdparty/chromium/ui/compositor/compositor.cc.orig 2024-02-23 21:04:38 UTC +++ src/3rdparty/chromium/ui/compositor/compositor.cc -@@ -896,7 +896,7 @@ void Compositor::OnResume() { +@@ -894,7 +894,7 @@ void Compositor::OnResume() { + obs.ResetIfActive(); + } - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(IS_OZONE_X11) void Compositor::OnCompleteSwapWithNewSize(const gfx::Size& size) { for (auto& observer : observer_list_) observer.OnCompositingCompleteSwapWithNewSize(this, size); diff --git a/www/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 73b1e1444a7c..aadafe45bd4c 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,11 +1,11 @@ ---- src/3rdparty/chromium/ui/compositor/compositor.h.orig 2023-05-31 08:12:17 UTC +--- src/3rdparty/chromium/ui/compositor/compositor.h.orig 2024-02-23 21:04:38 UTC +++ src/3rdparty/chromium/ui/compositor/compositor.h -@@ -458,7 +458,7 @@ class COMPOSITOR_EXPORT Compositor : public base::Powe +@@ -461,7 +461,7 @@ class COMPOSITOR_EXPORT Compositor : public base::Powe + // base::PowerSuspendObserver: + void OnResume() override; - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(IS_OZONE_X11) void OnCompleteSwapWithNewSize(const gfx::Size& size); - #endif + #endif // BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11) diff --git a/www/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 1afcddf462c7..1a26e88d0926 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,11 +1,11 @@ ---- src/3rdparty/chromium/ui/compositor/compositor_observer.h.orig 2022-02-28 16:54:41 UTC +--- src/3rdparty/chromium/ui/compositor/compositor_observer.h.orig 2024-02-23 21:04:38 UTC +++ src/3rdparty/chromium/ui/compositor/compositor_observer.h -@@ -48,7 +48,7 @@ class COMPOSITOR_EXPORT CompositorObserver { +@@ -46,7 +46,7 @@ class COMPOSITOR_EXPORT CompositorObserver { + // Called when a child of the compositor is resizing. + virtual void OnCompositingChildResizing(Compositor* compositor) {} - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(IS_OZONE_X11) // Called when a swap with new size is completed. virtual void OnCompositingCompleteSwapWithNewSize(ui::Compositor* compositor, const gfx::Size& size) {} diff --git a/www/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 8a779268bd08..3f62297573c9 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,4 +1,4 @@ ---- src/3rdparty/chromium/ui/display/screen.h.orig 2023-02-08 09:03:45 UTC +--- src/3rdparty/chromium/ui/display/screen.h.orig 2024-01-30 07:53:34 UTC +++ src/3rdparty/chromium/ui/display/screen.h @@ -131,7 +131,7 @@ class DISPLAY_EXPORT Screen { // (both of which may or may not be `nearest_id`). @@ -9,7 +9,7 @@ // Object which suspends the platform-specific screensaver for the duration of // its existence. class ScreenSaverSuspender { -@@ -232,7 +232,7 @@ class DISPLAY_EXPORT Screen { +@@ -231,7 +231,7 @@ class DISPLAY_EXPORT Screen { int64_t display_id_for_new_windows_; int64_t scoped_display_id_for_new_windows_ = display::kInvalidDisplayId; diff --git a/www/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 a3c44d8dc29d..72248055ffe8 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 2023-07-16 15:47:57 UTC +--- 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 -@@ -876,6 +876,7 @@ void DeviceDataManagerX11::SetDisabledKeyboardAllowedK +@@ -844,6 +844,7 @@ void DeviceDataManagerX11::SetDisabledKeyboardAllowedK } void DeviceDataManagerX11::DisableDevice(x11::Input::DeviceId deviceid) { diff --git a/www/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 a25d4a145c88..e866b2c80f83 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 2023-09-13 12:11:42 UTC +--- src/3rdparty/chromium/ui/events/event.cc.orig 2024-02-23 21:04:38 UTC +++ src/3rdparty/chromium/ui/events/event.cc -@@ -427,7 +427,7 @@ std::string LocatedEvent::ToString() const { +@@ -438,7 +438,7 @@ std::string LocatedEvent::ToString() const { MouseEvent::MouseEvent(const PlatformEvent& native_event) : LocatedEvent(native_event), changed_button_flags_(GetChangedMouseButtonFlagsFromNative(native_event)), @@ -9,7 +9,7 @@ movement_(GetMouseMovementFromNative(native_event)), #endif pointer_details_(GetMousePointerDetailsFromNative(native_event)) { -@@ -676,7 +676,7 @@ std::unique_ptr MouseWheelEvent::Clone() const +@@ -689,7 +689,7 @@ std::unique_ptr MouseWheelEvent::Clone() const return std::make_unique(*this); } @@ -18,9 +18,9 @@ // This value matches Windows, Fuchsia WHEEL_DELTA, and (roughly) Firefox on // Linux. // static -@@ -936,7 +936,7 @@ void KeyEvent::InitializeNative() { +@@ -949,7 +949,7 @@ void KeyEvent::InitializeNative() { if (synthesize_key_repeat_enabled_ && IsRepeated(GetLastKeyEvent())) - set_flags(flags() | EF_IS_REPEAT); + SetFlags(flags() | EF_IS_REPEAT); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_events_gesture__detection_motion__event__generic.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_events_gesture__detection_motion__event__generic.h deleted file mode 100644 index a67968ebae51..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_events_gesture__detection_motion__event__generic.h +++ /dev/null @@ -1,10 +0,0 @@ ---- src/3rdparty/chromium/ui/events/gesture_detection/motion_event_generic.h.orig 2023-09-13 12:11:42 UTC -+++ src/3rdparty/chromium/ui/events/gesture_detection/motion_event_generic.h -@@ -7,6 +7,7 @@ - - #include - #include -+#include - - #include "base/time/time.h" - #include "third_party/abseil-cpp/absl/container/inlined_vector.h" 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 aa6e784f908f..c12cdf17a173 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,4 +1,4 @@ ---- src/3rdparty/chromium/ui/events/keycodes/dom/keycode_converter.cc.orig 2022-07-22 17:30:31 UTC +--- 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 @@ -11,7 +11,7 @@ #include "ui/events/keycodes/dom/dom_code.h" @@ -18,16 +18,16 @@ #define DOM_CODE(usb, evdev, xkb, win, mac, code, id) \ { usb, xkb, code } #elif BUILDFLAG(IS_APPLE) -@@ -58,7 +58,7 @@ struct DomKeyMapEntry { - #undef DOM_KEY_MAP +@@ -63,7 +63,7 @@ struct DomKeyMapEntry { #undef DOM_KEY_UNI + #undef DOM_KEY_MAP_DECLARATION_END -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FREEBSD) // The offset between XKB Keycode and evdev code. constexpr int kXkbKeycodeOffset = 8; -@@ -139,7 +139,7 @@ int KeycodeConverter::DomCodeToNativeKeycode(DomCode c +@@ -184,7 +184,7 @@ int KeycodeConverter::DomCodeToNativeKeycode(DomCode c return UsbKeycodeToNativeKeycode(static_cast(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 fcebcd07565e..a1ff40b6b263 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 2022-07-22 17:30:31 UTC +--- 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 -@@ -64,7 +64,7 @@ class KeycodeConverter { +@@ -63,7 +63,7 @@ class KeycodeConverter { // Convert a DomCode into a native keycode. static int DomCodeToNativeKeycode(DomCode code); diff --git a/www/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 8bea55754926..f2d5da99c984 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 2023-10-03 19:49:54 UTC +--- 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 -@@ -637,7 +637,7 @@ void LoadKeymap(const std::string& layout_name, +@@ -640,7 +640,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)); -@@ -671,7 +671,7 @@ XkbKeyboardLayoutEngine::XkbKeyboardLayoutEngine( +@@ -674,7 +674,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 5dfb92dcf6f8..af2e4357efc3 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,6 +1,6 @@ ---- src/3rdparty/chromium/ui/gfx/BUILD.gn.orig 2023-12-12 22:08:45 UTC +--- src/3rdparty/chromium/ui/gfx/BUILD.gn.orig 2024-07-03 01:14:49 UTC +++ src/3rdparty/chromium/ui/gfx/BUILD.gn -@@ -646,7 +646,7 @@ jumbo_source_set("memory_buffer_sources") { +@@ -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_canvas__skia.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_canvas__skia.cc index e8d0097a48fd..3b9dfac78f70 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_canvas__skia.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_canvas__skia.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/gfx/canvas_skia.cc.orig 2023-09-13 12:11:42 UTC +--- src/3rdparty/chromium/ui/gfx/canvas_skia.cc.orig 2024-02-23 21:04:38 UTC +++ src/3rdparty/chromium/ui/gfx/canvas_skia.cc -@@ -212,7 +212,7 @@ void Canvas::DrawStringRectWithFlags(const std::u16str +@@ -213,7 +213,7 @@ void Canvas::DrawStringRectWithFlags(const std::u16str Range range = StripAcceleratorChars(flags, &adjusted_text); bool elide_text = ((flags & NO_ELLIPSIS) == 0); diff --git a/www/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 c74dc4f2b93f..a7d05f81be20 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 2022-08-31 12:19:35 UTC +--- 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 -@@ -26,6 +26,8 @@ +@@ -27,6 +27,8 @@ #include "ui/gfx/linux/fontconfig_util.h" #include "ui/gfx/platform_font.h" diff --git a/www/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 9ba81f5ebb84..2ec66c6f2d34 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,15 +1,15 @@ ---- src/3rdparty/chromium/ui/gfx/font_render_params.h.orig 2022-02-28 16:54:41 UTC +--- 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 -@@ -109,7 +109,7 @@ GFX_EXPORT FontRenderParams GetFontRenderParams( +@@ -118,7 +118,7 @@ GFX_EXPORT FontRenderParams GetFontRenderParams( const FontRenderParamsQuery& query, std::string* family_out); --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) // Clears GetFontRenderParams()'s cache. Intended to be called by tests that are // changing Fontconfig's configuration. GFX_EXPORT void ClearFontRenderParamsCacheForTest(); -@@ -119,7 +119,7 @@ GFX_EXPORT void ClearFontRenderParamsCacheForTest(); +@@ -128,7 +128,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_linux_dmabuf__uapi.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_linux_dmabuf__uapi.h index 2746d1e87073..fd0486031629 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 2023-12-12 22:08:45 UTC +--- 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 @@ -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 new file mode 100644 index 000000000000..36ce1b245443 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_linux_gbm__wrapper.cc @@ -0,0 +1,11 @@ +--- 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 +@@ -317,7 +317,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 = +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + gfx::Size(1, 1); + #else + requested_size; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_native__pixmap__handle.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_native__pixmap__handle.cc index d244dfdc7cfe..9f5ac1fa73c8 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_native__pixmap__handle.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_native__pixmap__handle.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ui/gfx/native_pixmap_handle.cc.orig 2023-12-12 22:08:45 UTC +--- src/3rdparty/chromium/ui/gfx/native_pixmap_handle.cc.orig 2024-07-03 01:14:49 UTC +++ src/3rdparty/chromium/ui/gfx/native_pixmap_handle.cc @@ -11,7 +11,7 @@ #include "ui/gfx/buffer_format_util.h" diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_native__widget__types.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_native__widget__types.h index de4ba874bf44..6b965a54cb63 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_native__widget__types.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_native__widget__types.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/gfx/native_widget_types.h.orig 2023-09-13 12:11:42 UTC +--- src/3rdparty/chromium/ui/gfx/native_widget_types.h.orig 2024-02-23 21:04:38 UTC +++ src/3rdparty/chromium/ui/gfx/native_widget_types.h -@@ -103,7 +103,7 @@ class SkBitmap; +@@ -104,7 +104,7 @@ class SkBitmap; // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ extern "C" { struct _AtkObject; using AtkObject = struct _AtkObject; -@@ -221,7 +221,7 @@ using NativeViewAccessible = struct objc_object*; +@@ -220,7 +220,7 @@ using NativeViewAccessible = struct objc_object*; #endif // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_platform__font__skia.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_platform__font__skia.cc index dedacaee87cd..6ef6fe46a893 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_platform__font__skia.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_platform__font__skia.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/gfx/platform_font_skia.cc.orig 2022-08-31 12:19:35 UTC +--- src/3rdparty/chromium/ui/gfx/platform_font_skia.cc.orig 2024-01-30 07:53:34 UTC +++ src/3rdparty/chromium/ui/gfx/platform_font_skia.cc -@@ -28,7 +28,7 @@ +@@ -30,7 +30,7 @@ #include "ui/gfx/system_fonts_win.h" #endif @@ -9,7 +9,7 @@ #include "ui/linux/linux_ui.h" #endif -@@ -166,7 +166,7 @@ void PlatformFontSkia::EnsuresDefaultFontIsInitialized +@@ -168,7 +168,7 @@ void PlatformFontSkia::EnsuresDefaultFontIsInitialized weight = system_font.GetWeight(); #endif // BUILDFLAG(IS_WIN) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_x_generated__protos_dri3.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_x_generated__protos_dri3.cc index 94c8e4bbf7eb..0a988054f331 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_x_generated__protos_dri3.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_x_generated__protos_dri3.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/gfx/x/generated_protos/dri3.cc.orig 2022-02-28 16:54:41 UTC +--- src/3rdparty/chromium/ui/gfx/x/generated_protos/dri3.cc.orig 2024-01-30 07:53:34 UTC +++ src/3rdparty/chromium/ui/gfx/x/generated_protos/dri3.cc -@@ -44,6 +44,8 @@ +@@ -27,6 +27,8 @@ #include #include @@ -8,4 +8,4 @@ + #include "base/logging.h" #include "base/posix/eintr_wrapper.h" - #include "ui/gfx/x/xproto_internal.h" + #include "ui/gfx/x/connection.h" diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_x_generated__protos_shm.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_x_generated__protos_shm.cc index 03a91ea800cb..122bde829528 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_x_generated__protos_shm.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_x_generated__protos_shm.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/gfx/x/generated_protos/shm.cc.orig 2022-02-28 16:54:41 UTC +--- src/3rdparty/chromium/ui/gfx/x/generated_protos/shm.cc.orig 2024-01-30 07:53:34 UTC +++ src/3rdparty/chromium/ui/gfx/x/generated_protos/shm.cc -@@ -44,6 +44,8 @@ +@@ -27,6 +27,8 @@ #include #include @@ -8,4 +8,4 @@ + #include "base/logging.h" #include "base/posix/eintr_wrapper.h" - #include "ui/gfx/x/xproto_internal.h" + #include "ui/gfx/x/connection.h" diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_x_xlib__support.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_x_xlib__support.cc index 25f1781933fa..fee22ea4e28b 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_x_xlib__support.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_x_xlib__support.cc @@ -1,8 +1,8 @@ ---- src/3rdparty/chromium/ui/gfx/x/xlib_support.cc.orig 2023-12-12 22:08:45 UTC +--- src/3rdparty/chromium/ui/gfx/x/xlib_support.cc.orig 2024-07-03 01:14:49 UTC +++ src/3rdparty/chromium/ui/gfx/x/xlib_support.cc -@@ -42,10 +42,18 @@ void InitXlib() { - if (xlib_loader->loaded()) +@@ -43,10 +43,18 @@ void InitXlib() { return; + } +#if BUILDFLAG(IS_BSD) + CHECK(xlib_loader->Load("libX11.so")); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_BUILD.gn index 4173ed9ea7cf..8e6d0566c809 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_BUILD.gn @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/gl/BUILD.gn.orig 2023-12-12 22:08:45 UTC +--- src/3rdparty/chromium/ui/gl/BUILD.gn.orig 2024-07-03 01:14:49 UTC +++ src/3rdparty/chromium/ui/gl/BUILD.gn -@@ -165,8 +165,6 @@ jumbo_component("gl") { +@@ -167,8 +167,6 @@ jumbo_component("gl") { defines += [ "GPU_ENABLE_SERVICE_LOGGING" ] } @@ -9,7 +9,7 @@ all_dependent_configs = [ ":gl_config" ] public_configs = [ "//third_party/khronos:khronos_headers" ] -@@ -183,7 +181,6 @@ jumbo_component("gl") { +@@ -186,7 +184,6 @@ jumbo_component("gl") { ] public_deps = [ "//base", @@ -17,7 +17,7 @@ "//ui/events/platform", "//ui/gfx", "//ui/gfx/geometry", -@@ -433,7 +430,6 @@ jumbo_component("gl") { +@@ -428,7 +425,6 @@ jumbo_component("gl") { data_deps += [ "//third_party/angle:libEGL", "//third_party/angle:libGLESv2", @@ -25,7 +25,7 @@ ] if (enable_swiftshader) { data_deps += [ -@@ -648,7 +644,6 @@ test("gl_unittests") { +@@ -646,7 +642,6 @@ test("gl_unittests") { data_deps = [ "//testing/buildbot/filters:gl_unittests_filters", diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__context.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__context.cc index 100b11319b17..69991ca63e65 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__context.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__context.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/gl/gl_context.cc.orig 2023-12-12 22:08:45 UTC +--- src/3rdparty/chromium/ui/gl/gl_context.cc.orig 2024-07-03 01:14:49 UTC +++ src/3rdparty/chromium/ui/gl/gl_context.cc -@@ -445,7 +445,7 @@ bool GLContext::MakeVirtuallyCurrent( +@@ -474,7 +474,7 @@ bool GLContext::MakeVirtuallyCurrent( DCHECK(virtual_context->IsCurrent(surface)); if (switched_real_contexts || virtual_context != current_virtual_context_) { 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 bae39201ddc7..cdb28850c76d 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,6 +1,6 @@ ---- src/3rdparty/chromium/ui/gl/gl_implementation.cc.orig 2023-12-12 22:08:45 UTC +--- src/3rdparty/chromium/ui/gl/gl_implementation.cc.orig 2024-07-03 01:14:49 UTC +++ src/3rdparty/chromium/ui/gl/gl_implementation.cc -@@ -291,7 +291,7 @@ GetRequestedGLImplementationFromCommandLine( +@@ -286,7 +286,7 @@ GetRequestedGLImplementationFromCommandLine( *fallback_to_software_gl = false; bool overrideUseSoftwareGL = command_line->HasSwitch(switches::kOverrideUseSoftwareGLForTests); 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 71aa3de0060b..0b74d955e859 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,20 +1,29 @@ ---- src/3rdparty/chromium/ui/gl/gl_switches.cc.orig 2023-12-12 22:08:45 UTC +--- src/3rdparty/chromium/ui/gl/gl_switches.cc.orig 2024-07-03 01:14:49 UTC +++ src/3rdparty/chromium/ui/gl/gl_switches.cc @@ -12,7 +12,7 @@ #include "base/android/build_info.h" #endif --#if BUILDFLAG(IS_LINUX) && BUILDFLAG(ENABLE_VULKAN) -+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(ENABLE_VULKAN) +-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && BUILDFLAG(ENABLE_VULKAN) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && BUILDFLAG(ENABLE_VULKAN) #include #include "third_party/angle/src/gpu_info_util/SystemInfo.h" // nogncheck #endif -@@ -297,7 +297,7 @@ bool IsDefaultANGLEVulkan() { +@@ -301,7 +301,7 @@ bool IsDefaultANGLEVulkan() { base::android::SDK_VERSION_Q) return false; #endif // BUILDFLAG(IS_ANDROID) --#if BUILDFLAG(IS_LINUX) && BUILDFLAG(ENABLE_VULKAN) -+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(ENABLE_VULKAN) +-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && BUILDFLAG(ENABLE_VULKAN) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && BUILDFLAG(ENABLE_VULKAN) angle::SystemInfo system_info; if (!angle::GetSystemInfoVulkan(&system_info)) return false; +@@ -313,7 +313,7 @@ bool IsDefaultANGLEVulkan() { + + const auto& active_gpu = system_info.gpus[system_info.activeGPUIndex]; + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Vulkan 1.1 is required. + if (active_gpu.driverApiVersion < VK_VERSION_1_1) + return false; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gtk_gtk__ui.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gtk_gtk__ui.cc deleted file mode 100644 index 777ee2dbd431..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gtk_gtk__ui.cc +++ /dev/null @@ -1,22 +0,0 @@ ---- src/3rdparty/chromium/ui/gtk/gtk_ui.cc.orig 2023-09-13 12:11:42 UTC -+++ src/3rdparty/chromium/ui/gtk/gtk_ui.cc -@@ -955,11 +955,19 @@ ui::DisplayConfig GtkUi::GetDisplayConfig() const { - GdkRectangle geometry; - gdk_monitor_get_geometry(monitor, &geometry); - int monitor_scale = std::max(1, gdk_monitor_get_scale_factor(monitor)); -+#if defined(__clang__) && (__clang_major__ >= 16) - config.display_geometries.emplace_back( - gfx::Rect(monitor_scale * geometry.x, monitor_scale * geometry.y, - monitor_scale * geometry.width, - monitor_scale * geometry.height), - monitor_scale * font_scale); -+#else -+ config.display_geometries.emplace_back() = { -+ gfx::Rect(monitor_scale * geometry.x, monitor_scale * geometry.y, -+ monitor_scale * geometry.width, -+ monitor_scale * geometry.height), -+ static_cast(monitor_scale * font_scale)}; -+#endif - } - return config; - } 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 2d08cd914c58..aa311ec79a5a 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,6 +1,6 @@ ---- src/3rdparty/chromium/ui/gtk/printing/print_dialog_gtk.cc.orig 2023-10-11 18:22:24 UTC +--- 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 -@@ -440,7 +440,7 @@ void PrintDialogGtk::ShowDialog( +@@ -433,7 +433,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 | 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 0a3f4489658f..ef2affefba38 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,6 +1,6 @@ ---- src/3rdparty/chromium/ui/message_center/views/message_popup_view.cc.orig 2022-10-24 13:33:33 UTC +--- 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 -@@ -118,7 +118,7 @@ void MessagePopupView::Show() { +@@ -135,7 +135,7 @@ void MessagePopupView::Show() { params.z_order = ui::ZOrderLevel::kFloatingWindow; // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/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 07bb9392d23e..e6ee0753078f 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,6 +1,6 @@ ---- src/3rdparty/chromium/ui/native_theme/native_theme_base.cc.orig 2023-10-11 18:22:24 UTC +--- 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 -@@ -275,7 +275,7 @@ void NativeThemeBase::Paint(cc::PaintCanvas* canvas, +@@ -235,7 +235,7 @@ void NativeThemeBase::Paint(cc::PaintCanvas* canvas, break; // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_native__theme_native__theme__features.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_native__theme_native__theme__features.cc new file mode 100644 index 000000000000..3ca42e4e1e40 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_native__theme_native__theme__features.cc @@ -0,0 +1,20 @@ +--- src/3rdparty/chromium/ui/native_theme/native_theme_features.cc.orig 2024-01-30 07:53:34 UTC ++++ src/3rdparty/chromium/ui/native_theme/native_theme_features.cc +@@ -54,7 +54,7 @@ bool IsOverlayScrollbarEnabled() { + + bool IsFluentScrollbarEnabled() { + // Fluent scrollbars are only used for some OSes due to UI design guidelines. +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + return base::FeatureList::IsEnabled(features::kFluentScrollbar) || + IsFluentOverlayScrollbarEnabled(); + #else +@@ -63,7 +63,7 @@ bool IsFluentScrollbarEnabled() { + } + bool IsFluentOverlayScrollbarEnabled() { + // Fluent scrollbars are only used for some OSes due to UI design guidelines. +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + return base::FeatureList::IsEnabled(features::kFluentOverlayScrollbar); + #else + return false; diff --git a/www/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 new file mode 100644 index 000000000000..c11324e691ba --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_common_wayland__util.cc @@ -0,0 +1,11 @@ +--- 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 +@@ -335,7 +335,7 @@ void TransformToWlArray( + } + + base::TimeTicks EventMillisecondsToTimeTicks(uint32_t milliseconds) { +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // TODO(crbug.com/1499638): `milliseconds` comes from Weston that + // uses timestamp from libinput, which is different from TimeTicks. + // Use EventTimeForNow(), for now. diff --git a/www/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 new file mode 100644 index 000000000000..7904a961265a --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_emulate_wayland__input__emulate.cc @@ -0,0 +1,11 @@ +--- 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 +@@ -230,7 +230,7 @@ void WaylandInputEmulate::EmulateTouch(int action, + wayland_proxy->FlushForTesting(); + } + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + void WaylandInputEmulate::ForceUseScreenCoordinatesOnce() { + force_use_screen_coordinates_once_ = true; + } 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 new file mode 100644 index 000000000000..05378af3f1e1 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_emulate_wayland__input__emulate.h @@ -0,0 +1,11 @@ +--- 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 +@@ -61,7 +61,7 @@ class WaylandInputEmulate : public wl::WaylandProxy::D + int touch_id, + uint32_t request_id); + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + void ForceUseScreenCoordinatesOnce(); + #endif + 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 028006979cbc..5b6b572ba6c8 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,11 +1,11 @@ ---- src/3rdparty/chromium/ui/ozone/platform/wayland/host/wayland_toplevel_window.cc.orig 2023-10-11 18:22:24 UTC +--- 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 -@@ -539,7 +539,7 @@ void WaylandToplevelWindow::HandleAuraToplevelConfigur +@@ -611,7 +611,7 @@ void WaylandToplevelWindow::HandleAuraToplevelConfigur const bool did_active_change = is_active_ != window_states.is_activated; is_active_ = window_states.is_activated; --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // The tiled state affects the window geometry, so apply it here. if (window_states.tiled_edges != tiled_state_) { // This configure changes the decoration insets. We should adjust the diff --git a/www/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 f3e424c41695..e3c1e123064d 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,11 +1,11 @@ ---- src/3rdparty/chromium/ui/ozone/platform/wayland/host/wayland_toplevel_window.h.orig 2023-10-11 18:22:24 UTC +--- 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 -@@ -244,7 +244,7 @@ class WaylandToplevelWindow : public WaylandWindow, - // Contains the previous state of the window. - PlatformWindowState previous_state_ = PlatformWindowState::kUnknown; +@@ -260,7 +260,7 @@ class WaylandToplevelWindow : public WaylandWindow, + // The display ID to switch to in case the state is `kFullscreen`. + int64_t fullscreen_display_id_ = display::kInvalidDisplayId; --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Contains the current state of the tiled edges. WindowTiledEdges tiled_state_; #endif diff --git a/www/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 c53ee9f8d1ce..a136d99cb372 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,6 +1,6 @@ ---- src/3rdparty/chromium/ui/ozone/platform/wayland/host/wayland_window.cc.orig 2023-10-11 18:22:24 UTC +--- 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 -@@ -233,7 +233,7 @@ void WaylandWindow::OnPointerFocusChanged(bool focused +@@ -235,7 +235,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. @@ -9,7 +9,7 @@ if (focused && async_cursor_) { async_cursor_->AddCursorLoadedCallback( base::BindOnce(&WaylandWindow::OnCursorLoaded, -@@ -490,7 +490,7 @@ bool WaylandWindow::ShouldUseNativeFrame() const { +@@ -496,7 +496,7 @@ bool WaylandWindow::ShouldUseNativeFrame() const { void WaylandWindow::SetCursor(scoped_refptr platform_cursor) { DCHECK(platform_cursor); @@ -18,16 +18,16 @@ auto async_cursor = WaylandAsyncCursor::FromPlatformCursor(platform_cursor); if (async_cursor_ == async_cursor) { -@@ -661,7 +661,7 @@ std::string WaylandWindow::WindowStates::ToString() co +@@ -676,7 +676,7 @@ std::string WaylandWindow::WindowStates::ToString() co } else { base::TrimString(states, " ", &states); } --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) states += "; tiled_edges: "; std::string tiled = ""; if (tiled_edges.left) { -@@ -1111,12 +1111,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 eb31e1e1535d..f1dd7e10ba00 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,4 +1,4 @@ ---- src/3rdparty/chromium/ui/ozone/platform/wayland/host/wayland_window.h.orig 2023-10-11 18:22:24 UTC +--- 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 @@ -39,7 +39,7 @@ #include "ui/platform_window/platform_window_init_properties.h" @@ -9,16 +9,16 @@ #include "ui/ozone/platform/wayland/host/wayland_async_cursor.h" #endif -@@ -241,7 +241,7 @@ class WaylandWindow : public PlatformWindow, +@@ -246,7 +246,7 @@ class WaylandWindow : public PlatformWindow, bool is_snapped_primary = false; bool is_snapped_secondary = false; bool is_floated = false; --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) WindowTiledEdges tiled_edges; #endif -@@ -492,7 +492,7 @@ class WaylandWindow : public PlatformWindow, +@@ -500,7 +500,7 @@ class WaylandWindow : public PlatformWindow, void UpdateCursorShape(scoped_refptr cursor); @@ -27,7 +27,7 @@ void OnCursorLoaded(scoped_refptr cursor, scoped_refptr bitmap_cursor); #endif -@@ -551,7 +551,7 @@ class WaylandWindow : public PlatformWindow, +@@ -559,7 +559,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 3c2a96a74fe6..506aac291997 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,11 +1,11 @@ ---- src/3rdparty/chromium/ui/ozone/platform/wayland/host/xdg_toplevel_wrapper_impl.cc.orig 2023-10-11 18:22:24 UTC +--- 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 -@@ -308,7 +308,7 @@ void XDGToplevelWrapperImpl::OnToplevelConfigure(void* - CheckIfWlArrayHasValue(states, XDG_TOPLEVEL_STATE_ACTIVATED), - }; +@@ -315,7 +315,7 @@ void XDGToplevelWrapperImpl::OnToplevelConfigure(void* + window_states.is_activated = + CheckIfWlArrayHasValue(states, XDG_TOPLEVEL_STATE_ACTIVATED); --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) if (xdg_toplevel_get_version(toplevel) >= XDG_TOPLEVEL_STATE_TILED_LEFT_SINCE_VERSION) { // All four tiled states have the same since version, so it is enough to diff --git a/www/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 5f5cdc1f1626..8c52b061b82e 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,4 +1,4 @@ ---- src/3rdparty/chromium/ui/ozone/platform/wayland/host/zwp_text_input_wrapper_v1.cc.orig 2023-10-11 18:22:24 UTC +--- 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 @@ -226,6 +226,10 @@ void ZWPTextInputWrapperV1::SetSurroundingText( // so if it exceeds 16 bits, it may be broken. 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 07714b9614c1..e3a7becbb65b 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 2023-10-11 18:22:24 UTC +--- 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 @@ -66,13 +66,13 @@ #include "ui/events/ozone/layout/stub/stub_keyboard_layout_engine.h" @@ -16,7 +16,7 @@ #include "ui/ozone/platform/wayland/host/linux_ui_delegate_wayland.h" #endif -@@ -262,7 +262,7 @@ class OzonePlatformWayland : public OzonePlatform, +@@ -267,7 +267,7 @@ class OzonePlatformWayland : public OzonePlatform, buffer_manager_connector_ = std::make_unique( connection_->buffer_manager_host()); @@ -25,7 +25,7 @@ cursor_factory_ = std::make_unique(connection_.get()); #else cursor_factory_ = std::make_unique(); -@@ -272,7 +272,7 @@ class OzonePlatformWayland : public OzonePlatform, +@@ -277,7 +277,7 @@ class OzonePlatformWayland : public OzonePlatform, supported_buffer_formats_ = connection_->buffer_manager_host()->GetSupportedBufferFormats(); @@ -34,7 +34,7 @@ linux_ui_delegate_ = std::make_unique(connection_.get()); #endif -@@ -510,7 +510,7 @@ class OzonePlatformWayland : public OzonePlatform, +@@ -514,7 +514,7 @@ class OzonePlatformWayland : public OzonePlatform, DrmRenderNodePathFinder path_finder_; #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_x11_ozone__platform__x11.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_x11_ozone__platform__x11.cc deleted file mode 100644 index 69946fcd81ce..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_x11_ozone__platform__x11.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/ui/ozone/platform/x11/ozone_platform_x11.cc.orig 2023-10-11 18:22:24 UTC -+++ src/3rdparty/chromium/ui/ozone/platform/x11/ozone_platform_x11.cc -@@ -196,7 +196,7 @@ class OzonePlatformX11 : public OzonePlatform, - properties->supports_global_application_menus = true; - properties->app_modal_dialogs_use_event_blocker = true; - properties->fetch_buffer_formats_for_gmb_on_gpu = true; --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - properties->supports_vaapi = true; - #endif - diff --git a/www/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 b28474d43445..729f91ce5fe3 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,11 +1,20 @@ ---- src/3rdparty/chromium/ui/ozone/platform/x11/x11_screen_ozone.cc.orig 2023-09-13 12:11:42 UTC +--- 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 -@@ -235,7 +235,7 @@ base::Value::List X11ScreenOzone::GetGpuExtraInfo( - return result; - } +@@ -22,7 +22,7 @@ + #include "ui/ozone/platform/x11/x11_window.h" + #include "ui/ozone/platform/x11/x11_window_manager.h" -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - void X11ScreenOzone::SetDisplayConfig(const DisplayConfig& display_config) { - display_config_ = &display_config; - // See DesktopScreenLinux, which sets the |device_scale_factor| before |this| + #include "ui/linux/linux_ui.h" + #endif + +@@ -77,7 +77,7 @@ X11ScreenOzone::X11ScreenOzone() + window_manager_(X11WindowManager::GetInstance()), + x11_display_manager_(std::make_unique(this)) { + DCHECK(window_manager_); +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (auto* linux_ui = ui::LinuxUi::instance()) { + display_scale_factor_observer_.Observe(linux_ui); + } 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 052a328150d7..b7bcdaa5f21e 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,11 +1,11 @@ ---- src/3rdparty/chromium/ui/ozone/platform/x11/x11_screen_ozone.h.orig 2023-09-13 12:11:42 UTC +--- 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 -@@ -61,7 +61,7 @@ class X11ScreenOzone : public PlatformScreen, - std::string GetCurrentWorkspace() override; - base::Value::List GetGpuExtraInfo( - const gfx::GpuExtraInfo& gpu_extra_info) override; +@@ -102,7 +102,7 @@ class X11ScreenOzone : public PlatformScreen, + // Indicates that |this| is initialized. + bool initialized_ = false; + -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - void SetDisplayConfig(const DisplayConfig& display_config) override; + base::ScopedObservation + display_scale_factor_observer_{this}; #endif - 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 new file mode 100644 index 000000000000..5a2dd3af0f2d --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_x11_x11__window.cc @@ -0,0 +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 +@@ -1499,7 +1499,7 @@ void X11Window::OnXWindowStateChanged() { + WindowTiledEdges tiled_state = GetTiledState(); + if (tiled_state != tiled_state_) { + tiled_state_ = tiled_state; +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + platform_window_delegate_->OnWindowTiledStateChanged(tiled_state); + #endif + } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_public_ozone__platform.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_public_ozone__platform.h deleted file mode 100644 index a51739fee085..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_public_ozone__platform.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/ui/ozone/public/ozone_platform.h.orig 2023-09-13 12:11:42 UTC -+++ src/3rdparty/chromium/ui/ozone/public/ozone_platform.h -@@ -143,7 +143,7 @@ class COMPONENT_EXPORT(OZONE) OzonePlatform { - // back via gpu extra info. - bool fetch_buffer_formats_for_gmb_on_gpu = false; - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // TODO(crbug.com/1116701): add vaapi support for other Ozone platforms on - // Linux. At the moment, VA-API Linux implementation supports only X11 - // backend. This implementation must be refactored to support Ozone diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_public_platform__screen.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_public_platform__screen.cc deleted file mode 100644 index a81db05108b1..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_public_platform__screen.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/ui/ozone/public/platform_screen.cc.orig 2023-09-13 12:11:42 UTC -+++ src/3rdparty/chromium/ui/ozone/public/platform_screen.cc -@@ -61,7 +61,7 @@ display::TabletState PlatformScreen::GetTabletState() - } - #endif - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - void PlatformScreen::SetDisplayConfig(const DisplayConfig& display_config) {} - #endif - diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_public_platform__screen.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_public_platform__screen.h deleted file mode 100644 index 0527962d31c0..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_public_platform__screen.h +++ /dev/null @@ -1,20 +0,0 @@ ---- src/3rdparty/chromium/ui/ozone/public/platform_screen.h.orig 2023-09-13 12:11:42 UTC -+++ src/3rdparty/chromium/ui/ozone/public/platform_screen.h -@@ -15,7 +15,7 @@ - #include "ui/gfx/gpu_extra_info.h" - #include "ui/gfx/native_widget_types.h" - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - #include "ui/linux/linux_ui.h" - #endif - -@@ -136,7 +136,7 @@ class COMPONENT_EXPORT(OZONE_BASE) PlatformScreen { - virtual base::Value::List GetGpuExtraInfo( - const gfx::GpuExtraInfo& gpu_extra_info); - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // Sets device scale factor received from external sources such as toolkits. - virtual void SetDisplayConfig(const DisplayConfig& display_config); - #endif diff --git a/www/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 eb6a843cf90f..1d4437f395e7 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,11 +1,11 @@ ---- src/3rdparty/chromium/ui/ozone/test/mock_platform_window_delegate.h.orig 2022-11-30 08:12:58 UTC +--- 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 @@ -32,7 +32,7 @@ class MockPlatformWindowDelegate : public PlatformWind MOCK_METHOD2(OnWindowStateChanged, void(PlatformWindowState old_state, PlatformWindowState new_state)); --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) MOCK_METHOD1(OnWindowTiledStateChanged, void(WindowTiledEdges new_tiled_edges)); #endif diff --git a/www/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 a234f6b09567..e4908db67ef5 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,11 +1,11 @@ ---- src/3rdparty/chromium/ui/platform_window/platform_window_delegate.cc.orig 2023-05-31 08:12:17 UTC +--- 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 -@@ -36,7 +36,7 @@ PlatformWindowDelegate::PlatformWindowDelegate() = def +@@ -42,7 +42,7 @@ PlatformWindowDelegate::PlatformWindowDelegate() = def PlatformWindowDelegate::~PlatformWindowDelegate() = default; --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) void PlatformWindowDelegate::OnWindowTiledStateChanged( WindowTiledEdges new_tiled_edges) {} #endif diff --git a/www/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 8078b0e1a956..ec58934f7b1f 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,11 +1,11 @@ ---- src/3rdparty/chromium/ui/platform_window/platform_window_delegate.h.orig 2023-05-31 08:12:17 UTC +--- 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 -@@ -134,7 +134,7 @@ class COMPONENT_EXPORT(PLATFORM_WINDOW) PlatformWindow +@@ -157,7 +157,7 @@ class COMPONENT_EXPORT(PLATFORM_WINDOW) PlatformWindow virtual void OnWindowStateChanged(PlatformWindowState old_state, PlatformWindowState new_state) = 0; --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Notifies the delegate that the tiled state of the window edges has changed. virtual void OnWindowTiledStateChanged(WindowTiledEdges new_tiled_edges); #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_qt_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_qt_BUILD.gn new file mode 100644 index 000000000000..7fbca955903d --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_qt_BUILD.gn @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/ui/qt/BUILD.gn.orig 2024-01-30 07:53:34 UTC ++++ src/3rdparty/chromium/ui/qt/BUILD.gn +@@ -20,7 +20,7 @@ config("qt_internal_config") { + + # It's OK to depend on the system libstdc++ since it's a dependency of QT, so + # it will get loaded into the process anyway. +- libs = [ "stdc++" ] ++ # libs = [ "stdc++" ] + + configs = [ + "//build/config/linux:runtime_library", diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_strings_app__locale__settings.grd b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_strings_app__locale__settings.grd deleted file mode 100644 index 0a0f3587a067..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_strings_app__locale__settings.grd +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/ui/strings/app_locale_settings.grd.orig 2022-07-22 17:30:31 UTC -+++ src/3rdparty/chromium/ui/strings/app_locale_settings.grd -@@ -218,7 +218,7 @@ - 75% - - -- -+ - - 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 b7f5e5968daf..b3cd0826cf5c 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,15 +1,15 @@ ---- src/3rdparty/chromium/ui/views/controls/textfield/textfield.cc.orig 2023-10-11 18:22:24 UTC +--- 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 -@@ -79,7 +79,7 @@ +@@ -84,7 +84,7 @@ #include "base/win/win_util.h" #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "ui/base/ime/linux/text_edit_command_auralinux.h" + #include "ui/base/ime/text_input_flags.h" #include "ui/linux/linux_ui.h" - #endif -@@ -173,7 +173,7 @@ bool IsControlKeyModifier(int flags) { +@@ -183,7 +183,7 @@ bool IsControlKeyModifier(int flags) { // Control-modified key combination, but we cannot extend it to other platforms // as Control has different meanings and behaviors. // https://crrev.com/2580483002/#msg46 @@ -18,7 +18,7 @@ return flags & ui::EF_CONTROL_DOWN; #else return false; -@@ -742,7 +742,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event +@@ -744,7 +744,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 && -@@ -924,7 +924,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo +@@ -927,7 +927,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo } bool Textfield::SkipDefaultKeyEventProcessing(const ui::KeyEvent& event) { @@ -36,7 +36,7 @@ // Skip any accelerator handling that conflicts with custom keybindings. auto* linux_ui = ui::LinuxUi::instance(); std::vector commands; -@@ -1929,7 +1929,7 @@ bool Textfield::ShouldDoLearning() { +@@ -1969,7 +1969,7 @@ bool Textfield::ShouldDoLearning() { return false; } @@ -45,7 +45,7 @@ // TODO(https://crbug.com/952355): Implement this method to support Korean IME // reconversion feature on native text fields (e.g. find bar). bool Textfield::SetCompositionFromExistingText( -@@ -2442,14 +2442,14 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent( +@@ -2465,14 +2465,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 f57e7d05b71f..fbdcedef5b59 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,6 +1,6 @@ ---- src/3rdparty/chromium/ui/views/controls/textfield/textfield.h.orig 2023-10-11 18:22:24 UTC +--- 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 -@@ -44,7 +44,7 @@ +@@ -46,7 +46,7 @@ #include "ui/views/view.h" #include "ui/views/word_lookup_client.h" @@ -9,7 +9,7 @@ #include #endif -@@ -452,7 +452,7 @@ class VIEWS_EXPORT Textfield : public View, +@@ -454,7 +454,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_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 new file mode 100644 index 000000000000..d55588edbd7b --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_test_ui__controls__factory__desktop__aura__ozone.cc @@ -0,0 +1,11 @@ +--- 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 +@@ -284,7 +284,7 @@ bool SendTouchEventsNotifyWhenDone(int action, + } + #endif + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // static + void ForceUseScreenCoordinatesOnce() { + g_ozone_ui_controls_test_helper->ForceUseScreenCoordinatesOnce(); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_views__delegate.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_views__delegate.cc index 90dc74c82797..19409aa63270 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_views__delegate.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_views__delegate.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ui/views/views_delegate.cc.orig 2022-02-28 16:54:41 UTC +--- src/3rdparty/chromium/ui/views/views_delegate.cc.orig 2024-02-23 21:04:38 UTC +++ src/3rdparty/chromium/ui/views/views_delegate.cc @@ -95,7 +95,7 @@ bool ViewsDelegate::IsWindowInMetro(gfx::NativeWindow return false; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_views__delegate.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_views__delegate.h index ee58ed921e7d..726a5c51347a 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_views__delegate.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_views__delegate.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/views/views_delegate.h.orig 2022-02-28 16:54:41 UTC +--- src/3rdparty/chromium/ui/views/views_delegate.h.orig 2024-02-23 21:04:38 UTC +++ src/3rdparty/chromium/ui/views/views_delegate.h -@@ -139,7 +139,7 @@ class VIEWS_EXPORT ViewsDelegate { +@@ -146,7 +146,7 @@ class VIEWS_EXPORT ViewsDelegate { // environment. virtual bool IsWindowInMetro(gfx::NativeWindow window) const; #elif BUILDFLAG(ENABLE_DESKTOP_AURA) && \ diff --git a/www/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 07d81668aa10..9537077cb07f 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,6 +1,6 @@ ---- src/3rdparty/chromium/ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.cc.orig 2023-08-17 07:33:31 UTC +--- 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 -@@ -194,7 +194,7 @@ DragOperation DesktopDragDropClientOzone::StartDragAnd +@@ -195,7 +195,7 @@ DragOperation DesktopDragDropClientOzone::StartDragAnd return drag_operation_; } 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 b37181bdfb26..77b5965e2c12 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 2023-01-11 09:17:16 UTC +--- 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 -@@ -66,7 +66,7 @@ class VIEWS_EXPORT DesktopDragDropClientOzone +@@ -65,7 +65,7 @@ class VIEWS_EXPORT DesktopDragDropClientOzone // The offset of |drag_widget_| relative to the mouse position. gfx::Vector2d offset; @@ -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() -@@ -87,7 +87,7 @@ class VIEWS_EXPORT DesktopDragDropClientOzone +@@ -86,7 +86,7 @@ class VIEWS_EXPORT DesktopDragDropClientOzone const gfx::Point& root_location, int allowed_operations, ui::mojom::DragEventSource source) override; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_desktop__aura_desktop__screen__ozone.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_desktop__aura_desktop__screen__ozone.cc deleted file mode 100644 index 7abf08fef0eb..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_desktop__aura_desktop__screen__ozone.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/ui/views/widget/desktop_aura/desktop_screen_ozone.cc.orig 2022-06-17 14:20:10 UTC -+++ src/3rdparty/chromium/ui/views/widget/desktop_aura/desktop_screen_ozone.cc -@@ -25,7 +25,7 @@ gfx::NativeWindow DesktopScreenOzone::GetNativeWindowF - widget); - } - --#if !BUILDFLAG(IS_LINUX) -+#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) - std::unique_ptr CreateDesktopScreen() { - auto screen = std::make_unique(); - screen->Initialize(); 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 bf67f7ad257b..79af15186120 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 2023-10-11 18:22:24 UTC +--- 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 -@@ -44,7 +44,7 @@ +@@ -45,7 +45,7 @@ #include "ui/wm/core/window_util.h" #include "ui/wm/public/window_move_client.h" @@ -9,7 +9,7 @@ #include "ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone_linux.h" #endif -@@ -265,7 +265,7 @@ void DesktopWindowTreeHostPlatform::Init(const Widget: +@@ -266,7 +266,7 @@ void DesktopWindowTreeHostPlatform::Init(const Widget: if (params.type == Widget::InitParams::TYPE_WINDOW) GetContentWindow()->SetProperty(aura::client::kAnimationsDisabledKey, true); @@ -18,7 +18,7 @@ const bool requires_accelerated_widget = params.requires_accelerated_widget; #else const bool requires_accelerated_widget = false; -@@ -346,7 +346,7 @@ std::unique_ptr +@@ -350,7 +350,7 @@ std::unique_ptr DesktopWindowTreeHostPlatform::CreateDragDropClient() { ui::WmDragHandler* drag_handler = ui::GetWmDragHandler(*(platform_window())); std::unique_ptr drag_drop_client = @@ -27,7 +27,7 @@ std::make_unique(window(), drag_handler); #else std::make_unique(window(), drag_handler); -@@ -1081,7 +1081,7 @@ bool DesktopWindowTreeHostPlatform::RotateFocusForWidg +@@ -1092,7 +1092,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 73ca48fa28fb..c52dad67327f 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 2023-03-09 06:31:50 UTC +--- 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 -@@ -21,7 +21,7 @@ +@@ -22,7 +22,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 new file mode 100644 index 000000000000..f2042772c2e9 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_root__view.cc @@ -0,0 +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 +@@ -127,7 +127,7 @@ class AnnounceTextView : public View { + #if BUILDFLAG(IS_CHROMEOS) + // On ChromeOS, kAlert role can invoke an unnecessary event on reparenting. + node_data->role = ax::mojom::Role::kStaticText; +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // TODO(crbug.com/1024898): Use live regions (do not use alerts). + // May require setting kLiveStatus, kContainerLiveStatus to "polite". + node_data->role = ax::mojom::Role::kAlert; diff --git a/www/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 819ebb710d6d..665be7e9b3c5 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,4 +1,4 @@ ---- src/3rdparty/chromium/ui/views/widget/widget.cc.orig 2023-10-11 18:22:24 UTC +--- src/3rdparty/chromium/ui/views/widget/widget.cc.orig 2024-02-23 21:04:38 UTC +++ src/3rdparty/chromium/ui/views/widget/widget.cc @@ -54,7 +54,7 @@ #include "ui/views/window/custom_frame_view.h" @@ -9,7 +9,7 @@ #include "ui/linux/linux_ui.h" #endif -@@ -2041,7 +2041,7 @@ const ui::NativeTheme* Widget::GetNativeTheme() const +@@ -2093,7 +2093,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 index 53a8abcb720d..77b19d61d4ed 100644 --- 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 @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/views/widget/widget.h.orig 2023-04-28 17:01:32 UTC +--- src/3rdparty/chromium/ui/views/widget/widget.h.orig 2024-02-23 21:04:38 UTC +++ src/3rdparty/chromium/ui/views/widget/widget.h -@@ -410,7 +410,7 @@ class VIEWS_EXPORT Widget : public internal::NativeWid +@@ -422,7 +422,7 @@ class VIEWS_EXPORT Widget : public internal::NativeWid // If set, the widget was created in headless mode. bool headless_mode = false; diff --git a/www/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 f4d7dfbe9cb1..32a1a5ad2b7a 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-10-11 18:22:24 UTC +--- 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 -@@ -78,7 +78,7 @@ Widget* DialogDelegate::CreateDialogWidget( +@@ -79,7 +79,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 13e4649ae0be..8639956a10c7 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,6 +1,6 @@ ---- src/3rdparty/chromium/v8/BUILD.gn.orig 2023-12-12 22:08:45 UTC +--- src/3rdparty/chromium/v8/BUILD.gn.orig 2024-07-03 01:14:49 UTC +++ src/3rdparty/chromium/v8/BUILD.gn -@@ -1418,6 +1418,14 @@ config("toolchain") { +@@ -1448,6 +1448,14 @@ config("toolchain") { } else if (target_os == "chromeos") { defines += [ "V8_HAVE_TARGET_OS" ] defines += [ "V8_TARGET_OS_CHROMEOS" ] @@ -15,7 +15,7 @@ } # TODO(infra): Support v8_enable_prof on Windows. -@@ -2381,6 +2389,12 @@ template("run_mksnapshot") { +@@ -2414,6 +2422,12 @@ template("run_mksnapshot") { if (!v8_enable_builtins_profiling && v8_enable_builtins_reordering) { args += [ "--reorder-builtins" ] } @@ -28,7 +28,7 @@ } # This is needed to distinguish between generating code for the simulator -@@ -6173,7 +6187,7 @@ v8_component("v8_libbase") { +@@ -6423,7 +6437,7 @@ v8_component("v8_libbase") { } } @@ -37,7 +37,7 @@ sources += [ "src/base/debug/stack_trace_posix.cc", "src/base/platform/platform-linux.cc", -@@ -6184,6 +6198,18 @@ v8_component("v8_libbase") { +@@ -6434,6 +6448,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 0c56f6f4652e..be06e6c22d56 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,11 +1,11 @@ ---- src/3rdparty/chromium/v8/include/v8-internal.h.orig 2023-08-17 07:33:31 UTC +--- src/3rdparty/chromium/v8/include/v8-internal.h.orig 2024-02-23 21:04:38 UTC +++ src/3rdparty/chromium/v8/include/v8-internal.h -@@ -172,7 +172,7 @@ using SandboxedPointer_t = Address; +@@ -175,7 +175,7 @@ using SandboxedPointer_t = Address; #ifdef V8_ENABLE_SANDBOX // Size of the sandbox, excluding the guard regions surrounding it. --#ifdef V8_TARGET_OS_ANDROID -+#if defined(V8_TARGET_OS_ANDROID) || defined(V8_TARGET_OS_OPENBSD) +-#if defined(V8_TARGET_OS_ANDROID) ++#if (defined(V8_TARGET_OS_ANDROID) || defined(V8_TARGET_OS_OPENBSD)) // On Android, most 64-bit devices seem to be configured with only 39 bits of // virtual address space for userspace. As such, limit the sandbox to 128GB (a // quarter of the total available address space). diff --git a/www/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 c7ec1607455b..33059ab89a57 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 2023-04-05 11:05:06 UTC +--- src/3rdparty/chromium/v8/include/v8config.h.orig 2024-02-23 21:04:38 UTC +++ src/3rdparty/chromium/v8/include/v8config.h -@@ -184,6 +184,8 @@ path. Add it with -I to the command line +@@ -185,6 +185,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) -@@ -196,6 +198,8 @@ path. Add it with -I to the command line +@@ -197,6 +199,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,7 +18,7 @@ || defined(V8_TARGET_OS_MACOS) \ || defined(V8_TARGET_OS_WIN) \ || defined(V8_TARGET_OS_CHROMEOS) -@@ -217,6 +221,16 @@ path. Add it with -I to the command line +@@ -218,6 +222,16 @@ path. Add it with -I to the command line #ifdef V8_OS_LINUX # define V8_TARGET_OS_LINUX 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 9f96f37381e7..0f19a6086682 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,4 +1,4 @@ ---- src/3rdparty/chromium/v8/src/api/api.cc.orig 2023-10-11 18:22:24 UTC +--- src/3rdparty/chromium/v8/src/api/api.cc.orig 2024-02-23 21:04:38 UTC +++ src/3rdparty/chromium/v8/src/api/api.cc @@ -141,7 +141,7 @@ #include "src/wasm/wasm-serialization.h" @@ -9,7 +9,7 @@ #include #include -@@ -6352,7 +6352,7 @@ bool v8::V8::Initialize(const int build_config) { +@@ -6393,7 +6393,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_platform-posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_base_platform_platform-posix.cc index b08c34559dd2..9492b6c0aec1 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,6 +1,6 @@ ---- src/3rdparty/chromium/v8/src/base/platform/platform-posix.cc.orig 2023-09-13 12:11:42 UTC +--- 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 -@@ -55,7 +55,7 @@ +@@ -54,7 +54,7 @@ #if V8_OS_DARWIN #include #include @@ -9,7 +9,7 @@ #include #endif -@@ -73,7 +73,7 @@ +@@ -72,7 +72,7 @@ #include #endif @@ -18,7 +18,7 @@ #define MAP_ANONYMOUS MAP_ANON #endif -@@ -305,8 +305,15 @@ void OS::SetRandomMmapSeed(int64_t seed) { +@@ -303,8 +303,15 @@ void OS::SetRandomMmapSeed(int64_t seed) { } } @@ -34,7 +34,7 @@ uintptr_t raw_addr; { MutexGuard guard(rng_mutex.Pointer()); -@@ -401,6 +408,7 @@ void* OS::GetRandomMmapAddr() { +@@ -399,6 +406,7 @@ void* OS::GetRandomMmapAddr() { #endif return reinterpret_cast(raw_addr); } @@ -42,7 +42,7 @@ // TODO(bbudge) Move Cygwin and Fuchsia stuff into platform-specific files. #if !V8_OS_CYGWIN && !V8_OS_FUCHSIA -@@ -674,7 +682,7 @@ void OS::DestroySharedMemoryHandle(PlatformSharedMemor +@@ -672,7 +680,7 @@ void OS::DestroySharedMemoryHandle(PlatformSharedMemor // static bool OS::HasLazyCommits() { @@ -51,7 +51,7 @@ return true; #else // TODO(bbudge) Return true for all POSIX platforms. -@@ -1281,7 +1289,7 @@ void Thread::SetThreadLocal(LocalStorageKey key, void* +@@ -1303,7 +1311,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_baseline_x64_baseline-assembler-x64-inl.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_baseline_x64_baseline-assembler-x64-inl.h deleted file mode 100644 index a21a55072cd9..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_baseline_x64_baseline-assembler-x64-inl.h +++ /dev/null @@ -1,13 +0,0 @@ ---- src/3rdparty/chromium/v8/src/baseline/x64/baseline-assembler-x64-inl.h.orig 2023-07-16 15:47:57 UTC -+++ src/3rdparty/chromium/v8/src/baseline/x64/baseline-assembler-x64-inl.h -@@ -73,9 +73,7 @@ MemOperand BaselineAssembler::FeedbackVectorOperand() - - void BaselineAssembler::Bind(Label* label) { __ bind(label); } - --void BaselineAssembler::JumpTarget() { -- // NOP on x64. --} -+void BaselineAssembler::JumpTarget() { __ endbr64(); } - - void BaselineAssembler::Jump(Label* target, Label::Distance distance) { - __ jmp(target, distance); diff --git a/www/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 deleted file mode 100644 index 8aa573e775b6..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_builtins_x64_builtins-x64.cc +++ /dev/null @@ -1,46 +0,0 @@ ---- src/3rdparty/chromium/v8/src/builtins/x64/builtins-x64.cc.orig 2023-10-11 18:22:24 UTC -+++ src/3rdparty/chromium/v8/src/builtins/x64/builtins-x64.cc -@@ -44,6 +44,8 @@ namespace internal { - #define __ ACCESS_MASM(masm) - - void Builtins::Generate_Adaptor(MacroAssembler* masm, Address address) { -+ __ CodeEntry(); -+ - __ LoadAddress(kJavaScriptCallExtraArg1Register, - ExternalReference::Create(address)); - __ Jump(BUILTIN_CODE(masm->isolate(), AdaptorWithBuiltinExitFrame), -@@ -430,7 +432,7 @@ void Generate_JSEntryVariant(MacroAssembler* masm, Sta - // Jump to a faked try block that does the invoke, with a faked catch - // block that sets the pending exception. - __ jmp(&invoke); -- __ bind(&handler_entry); -+ __ BindExceptionHandler(&handler_entry); - - // Store the current pc as the handler offset. It's used later to create the - // handler table. -@@ -3327,6 +3329,9 @@ void SwitchBackAndReturnPromise(MacroAssembler* masm, - void GenerateExceptionHandlingLandingPad(MacroAssembler* masm, - Label* return_promise) { - int catch_handler = __ pc_offset(); -+ -+ __ endbr64(); -+ - // Restore rsp to free the reserved stack slots for the sections. - __ leaq(rsp, MemOperand(rbp, StackSwitchFrameConstants::kLastSpillOffset)); - -@@ -3658,6 +3663,7 @@ void Builtins::Generate_WasmSuspend(MacroAssembler* ma - LoadJumpBuffer(masm, jmpbuf, true); - __ Trap(); - __ bind(&resume); -+ __ endbr64(); - __ LeaveFrame(StackFrame::STACK_SWITCH); - __ ret(0); - } -@@ -3790,6 +3796,7 @@ void Generate_WasmResumeHelper(MacroAssembler* masm, w - } - __ Trap(); - __ bind(&suspend); -+ __ endbr64(); - __ LeaveFrame(StackFrame::STACK_SWITCH); - // Pop receiver + parameter. - __ ret(2 * kSystemPointerSize); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_codegen_x64_assembler-x64.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_codegen_x64_assembler-x64.cc deleted file mode 100644 index 294357791729..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_codegen_x64_assembler-x64.cc +++ /dev/null @@ -1,42 +0,0 @@ ---- src/3rdparty/chromium/v8/src/codegen/x64/assembler-x64.cc.orig 2023-09-13 12:11:42 UTC -+++ src/3rdparty/chromium/v8/src/codegen/x64/assembler-x64.cc -@@ -1316,6 +1316,14 @@ void Assembler::hlt() { - emit(0xF4); - } - -+void Assembler::endbr64() { -+ EnsureSpace ensure_space(this); -+ emit(0xF3); -+ emit(0x0f); -+ emit(0x1e); -+ emit(0xfa); -+} -+ - void Assembler::emit_idiv(Register src, int size) { - EnsureSpace ensure_space(this); - emit_rex(src, size); -@@ -1583,16 +1591,22 @@ void Assembler::jmp(Handle target, RelocInfo::Mo - emitl(code_target_index); - } - --void Assembler::jmp(Register target) { -+void Assembler::jmp(Register target, bool notrack) { - EnsureSpace ensure_space(this); -+ if (notrack) { -+ emit(0x3e); -+ } - // Opcode FF/4 r64. - emit_optional_rex_32(target); - emit(0xFF); - emit_modrm(0x4, target); - } - --void Assembler::jmp(Operand src) { -+void Assembler::jmp(Operand src, bool notrack) { - EnsureSpace ensure_space(this); -+ if (notrack) { -+ emit(0x3e); -+ } - // Opcode FF/4 m64. - emit_optional_rex_32(src); - emit(0xFF); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_codegen_x64_assembler-x64.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_codegen_x64_assembler-x64.h deleted file mode 100644 index f455280dc92b..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_codegen_x64_assembler-x64.h +++ /dev/null @@ -1,21 +0,0 @@ ---- src/3rdparty/chromium/v8/src/codegen/x64/assembler-x64.h.orig 2023-09-13 12:11:42 UTC -+++ src/3rdparty/chromium/v8/src/codegen/x64/assembler-x64.h -@@ -860,6 +860,7 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBa - void ret(int imm16); - void ud2(); - void setcc(Condition cc, Register reg); -+ void endbr64(); - - void pblendw(XMMRegister dst, Operand src, uint8_t mask); - void pblendw(XMMRegister dst, XMMRegister src, uint8_t mask); -@@ -917,8 +918,8 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBa - void jmp(Handle target, RelocInfo::Mode rmode); - - // Jump near absolute indirect (r64) -- void jmp(Register adr); -- void jmp(Operand src); -+ void jmp(Register adr, bool notrack = false); -+ void jmp(Operand src, bool notrack = false); - - // Unconditional jump relative to the current address. Low-level routine, - // use with caution! diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_codegen_x64_macro-assembler-x64.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_codegen_x64_macro-assembler-x64.cc deleted file mode 100644 index 26cc3ba91684..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_codegen_x64_macro-assembler-x64.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- src/3rdparty/chromium/v8/src/codegen/x64/macro-assembler-x64.cc.orig 2023-09-13 12:11:42 UTC -+++ src/3rdparty/chromium/v8/src/codegen/x64/macro-assembler-x64.cc -@@ -51,6 +51,8 @@ Operand StackArgumentsAccessor::GetArgumentOperand(int - return Operand(rsp, kPCOnStackSize + index * kSystemPointerSize); - } - -+void MacroAssembler::CodeEntry() { endbr64(); } -+ - void MacroAssembler::Load(Register destination, ExternalReference source) { - if (root_array_available_ && options().enable_root_relative_access) { - intptr_t delta = RootRegisterOffsetForExternalReference(isolate(), source); -@@ -2046,7 +2048,7 @@ void MacroAssembler::Switch(Register scratch, Register - cmpq(reg, Immediate(num_labels)); - j(above_equal, &fallthrough); - leaq(table, MemOperand(&jump_table)); -- jmp(MemOperand(table, reg, times_8, 0)); -+ jmp(MemOperand(table, reg, times_8, 0), /*notrack=*/true); - // Emit the jump table inline, under the assumption that it's not too big. - Align(kSystemPointerSize); - bind(&jump_table); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_codegen_x64_macro-assembler-x64.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_codegen_x64_macro-assembler-x64.h deleted file mode 100644 index e230f6225052..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_codegen_x64_macro-assembler-x64.h +++ /dev/null @@ -1,20 +0,0 @@ ---- src/3rdparty/chromium/v8/src/codegen/x64/macro-assembler-x64.h.orig 2023-10-11 18:22:24 UTC -+++ src/3rdparty/chromium/v8/src/codegen/x64/macro-assembler-x64.h -@@ -646,11 +646,14 @@ class V8_EXPORT_PRIVATE MacroAssembler - - // Define a function entrypoint. This doesn't emit any code for this - // architecture, as control-flow integrity is not supported for it. -- void CodeEntry() {} -+ void CodeEntry(); - // Define an exception handler. -- void ExceptionHandler() {} -+ void ExceptionHandler() { CodeEntry(); } - // Define an exception handler and bind a label. -- void BindExceptionHandler(Label* label) { bind(label); } -+ void BindExceptionHandler(Label* label) { -+ bind(label); -+ CodeEntry(); -+ } - - // --------------------------------------------------------------------------- - // Pointer compression support diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_compiler_backend_x64_code-generator-x64.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_compiler_backend_x64_code-generator-x64.cc deleted file mode 100644 index 92ad4b47ce7f..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_compiler_backend_x64_code-generator-x64.cc +++ /dev/null @@ -1,16 +0,0 @@ ---- src/3rdparty/chromium/v8/src/compiler/backend/x64/code-generator-x64.cc.orig 2023-10-11 18:22:24 UTC -+++ src/3rdparty/chromium/v8/src/compiler/backend/x64/code-generator-x64.cc -@@ -6828,11 +6828,11 @@ void CodeGenerator::AssembleArchTableSwitch(Instructio - // target = table + (target - table) - __ addq(input, kScratchRegister); - // Jump to the target. -- __ jmp(input); -+ __ jmp(input, /*notrack=*/true); - } else { - // For non builtins, the value in the table is 'target_address' (8 bytes) - // jmp [table + index*8] -- __ jmp(Operand(kScratchRegister, input, times_8, 0)); -+ __ jmp(Operand(kScratchRegister, input, times_8, 0), /*notrack=*/true); - } - } - diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_deoptimizer_x64_deoptimizer-x64.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_deoptimizer_x64_deoptimizer-x64.cc deleted file mode 100644 index 0fcb108f05d5..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_deoptimizer_x64_deoptimizer-x64.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/v8/src/deoptimizer/x64/deoptimizer-x64.cc.orig 2023-07-16 15:47:57 UTC -+++ src/3rdparty/chromium/v8/src/deoptimizer/x64/deoptimizer-x64.cc -@@ -21,7 +21,7 @@ ASSERT_OFFSET(Builtin::kDeoptimizationEntry_Lazy); - #undef ASSERT_OFFSET - - const int Deoptimizer::kEagerDeoptExitSize = 4; --const int Deoptimizer::kLazyDeoptExitSize = 4; -+const int Deoptimizer::kLazyDeoptExitSize = 8; - - Float32 RegisterValues::GetFloatRegister(unsigned n) const { - return Float32::FromBits( diff --git a/www/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 b10e18c34b65..f05da0a0f14f 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 2023-10-11 18:22:24 UTC +--- src/3rdparty/chromium/v8/src/execution/isolate.cc.orig 2024-10-02 15:40:01 UTC +++ src/3rdparty/chromium/v8/src/execution/isolate.cc -@@ -147,6 +147,10 @@ +@@ -148,6 +148,10 @@ #include "src/execution/simulator-base.h" #endif @@ -11,7 +11,7 @@ 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_[]; -@@ -4034,6 +4038,11 @@ void Isolate::InitializeDefaultEmbeddedBlob() { +@@ -4226,6 +4230,11 @@ void Isolate::InitializeDefaultEmbeddedBlob() { uint32_t code_size = DefaultEmbeddedBlobCodeSize(); const uint8_t* data = DefaultEmbeddedBlobData(); uint32_t data_size = DefaultEmbeddedBlobDataSize(); 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 a704bb280780..dc6f0177ed9c 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,7 +1,7 @@ ---- src/3rdparty/chromium/v8/src/flags/flags.cc.orig 2023-09-13 12:11:42 UTC +--- src/3rdparty/chromium/v8/src/flags/flags.cc.orig 2024-01-30 07:53:34 UTC +++ src/3rdparty/chromium/v8/src/flags/flags.cc -@@ -12,6 +12,10 @@ - #include +@@ -13,6 +13,10 @@ + #include #include +#if V8_OS_OPENBSD @@ -11,7 +11,7 @@ #include "src/base/functional.h" #include "src/base/logging.h" #include "src/base/platform/platform.h" -@@ -31,7 +35,11 @@ +@@ -32,7 +36,11 @@ namespace v8::internal { // Define {v8_flags}, declared in flags.h. @@ -23,7 +23,7 @@ // {v8_flags} needs to be aligned to a memory page, and the size needs to be a // multiple of a page size. This is required for memory-protection of the memory -@@ -824,6 +832,10 @@ void FlagList::FreezeFlags() { +@@ -912,6 +920,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_maglev_x64_maglev-assembler-x64-inl.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_maglev_x64_maglev-assembler-x64-inl.h deleted file mode 100644 index a38884e12313..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_maglev_x64_maglev-assembler-x64-inl.h +++ /dev/null @@ -1,14 +0,0 @@ ---- src/3rdparty/chromium/v8/src/maglev/x64/maglev-assembler-x64-inl.h.orig 2023-09-13 12:11:42 UTC -+++ src/3rdparty/chromium/v8/src/maglev/x64/maglev-assembler-x64-inl.h -@@ -229,7 +229,10 @@ void MaglevAssembler::PushReverse(T... vals) { - detail::PushAllHelper::PushReverse(this, vals...); - } - --inline void MaglevAssembler::BindJumpTarget(Label* label) { bind(label); } -+inline void MaglevAssembler::BindJumpTarget(Label* label) { -+ bind(label); -+ endbr64(); -+} - - inline void MaglevAssembler::BindBlock(BasicBlock* block) { - bind(block->label()); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_maglev_x64_maglev-assembler-x64.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_maglev_x64_maglev-assembler-x64.cc deleted file mode 100644 index 20252707ee65..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_maglev_x64_maglev-assembler-x64.cc +++ /dev/null @@ -1,16 +0,0 @@ ---- src/3rdparty/chromium/v8/src/maglev/x64/maglev-assembler-x64.cc.orig 2023-09-13 12:11:42 UTC -+++ src/3rdparty/chromium/v8/src/maglev/x64/maglev-assembler-x64.cc -@@ -433,10 +433,12 @@ void MaglevAssembler::OSRPrologue(Graph* graph) { - void MaglevAssembler::Prologue(Graph* graph) { - DCHECK(!graph->is_osr()); - -+ CodeEntry(); -+ - BailoutIfDeoptimized(rbx); - - if (graph->has_recursive_calls()) { -- bind(code_gen_state()->entry_label()); -+ BindJumpTarget(code_gen_state()->entry_label()); - } - - // Tiering support. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_regexp_x64_regexp-macro-assembler-x64.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_regexp_x64_regexp-macro-assembler-x64.cc deleted file mode 100644 index 8c27106d5ad1..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_regexp_x64_regexp-macro-assembler-x64.cc +++ /dev/null @@ -1,22 +0,0 @@ ---- src/3rdparty/chromium/v8/src/regexp/x64/regexp-macro-assembler-x64.cc.orig 2023-07-16 15:47:57 UTC -+++ src/3rdparty/chromium/v8/src/regexp/x64/regexp-macro-assembler-x64.cc -@@ -110,6 +110,7 @@ RegExpMacroAssemblerX64::RegExpMacroAssemblerX64(Isola - backtrack_label_(), - exit_label_() { - DCHECK_EQ(0, registers_to_save % 2); -+ __ CodeEntry(); - __ jmp(&entry_label_); // We'll write the entry code when we know more. - __ bind(&start_label_); // And then continue from here. - } -@@ -714,6 +715,11 @@ bool RegExpMacroAssemblerX64::CheckSpecialClassRanges( - // Match any character. - return true; - } -+} -+ -+void RegExpMacroAssemblerX64::BindJumpTarget(Label* label) { -+ Bind(label); -+ __ CodeEntry(); - } - - void RegExpMacroAssemblerX64::Fail() { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_regexp_x64_regexp-macro-assembler-x64.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_regexp_x64_regexp-macro-assembler-x64.h deleted file mode 100644 index 43fbe6a20691..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_regexp_x64_regexp-macro-assembler-x64.h +++ /dev/null @@ -1,12 +0,0 @@ ---- src/3rdparty/chromium/v8/src/regexp/x64/regexp-macro-assembler-x64.h.orig 2023-07-16 15:47:57 UTC -+++ src/3rdparty/chromium/v8/src/regexp/x64/regexp-macro-assembler-x64.h -@@ -59,6 +59,9 @@ class V8_EXPORT_PRIVATE RegExpMacroAssemblerX64 - void CheckPosition(int cp_offset, Label* on_outside_input) override; - bool CheckSpecialClassRanges(StandardCharacterSet type, - Label* on_no_match) override; -+ -+ void BindJumpTarget(Label* label) override; -+ - void Fail() override; - Handle GetCode(Handle source) override; - void GoTo(Label* label) override; 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 bb21569c146b..9c9ccda5cb30 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,6 +1,6 @@ ---- src/3rdparty/chromium/v8/src/snapshot/embedded/platform-embedded-file-writer-base.cc.orig 2023-02-08 09:03:45 UTC +--- 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 -@@ -142,6 +142,8 @@ EmbeddedTargetOs ToEmbeddedTargetOs(const char* s) { +@@ -143,6 +143,8 @@ EmbeddedTargetOs ToEmbeddedTargetOs(const char* s) { return EmbeddedTargetOs::kWin; } else if (string == "starboard") { return EmbeddedTargetOs::kStarboard; diff --git a/www/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 7ec4e44c855f..610fcff41a46 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,6 +1,6 @@ ---- src/3rdparty/chromium/v8/src/trap-handler/handler-inside-posix.cc.orig 2023-05-31 08:12:17 UTC +--- 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 -@@ -59,6 +59,8 @@ namespace trap_handler { +@@ -61,6 +61,8 @@ namespace trap_handler { #define CONTEXT_REG(reg, REG) &uc->uc_mcontext->__ss.__##reg #elif V8_OS_FREEBSD #define CONTEXT_REG(reg, REG) &uc->uc_mcontext.mc_##reg @@ -9,7 +9,7 @@ #else #error "Unsupported platform." #endif -@@ -68,8 +70,12 @@ bool IsKernelGeneratedSignal(siginfo_t* info) { +@@ -78,8 +80,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.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_wasm_baseline_ia32_liftoff-assembler-ia32.h deleted file mode 100644 index 3dc87904205c..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_wasm_baseline_ia32_liftoff-assembler-ia32.h +++ /dev/null @@ -1,128 +0,0 @@ ---- src/3rdparty/chromium/v8/src/wasm/baseline/ia32/liftoff-assembler-ia32.h.orig 2023-09-13 12:11:42 UTC -+++ src/3rdparty/chromium/v8/src/wasm/baseline/ia32/liftoff-assembler-ia32.h -@@ -491,7 +491,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) { -@@ -571,7 +571,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 */) { -@@ -651,7 +651,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) { -@@ -671,7 +671,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_NE(offset_reg, no_reg); -@@ -741,7 +741,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); -@@ -808,7 +808,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); -@@ -920,7 +920,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 -@@ -1012,7 +1012,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) { -@@ -1026,7 +1026,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) { -@@ -1039,7 +1039,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) { -@@ -1053,7 +1053,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) { -@@ -1067,7 +1067,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) { -@@ -1081,7 +1081,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 */) { -@@ -1096,7 +1096,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_src_wasm_jump-table-assembler.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_wasm_jump-table-assembler.cc deleted file mode 100644 index 57c26827fc25..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_wasm_jump-table-assembler.cc +++ /dev/null @@ -1,51 +0,0 @@ ---- src/3rdparty/chromium/v8/src/wasm/jump-table-assembler.cc.orig 2023-07-16 15:47:57 UTC -+++ src/3rdparty/chromium/v8/src/wasm/jump-table-assembler.cc -@@ -52,15 +52,21 @@ void JumpTableAssembler::InitializeJumpsToLazyCompileT - #if V8_TARGET_ARCH_X64 - void JumpTableAssembler::EmitLazyCompileJumpSlot(uint32_t func_index, - Address lazy_compile_target) { -+ intptr_t displacement = -+ static_cast(reinterpret_cast(lazy_compile_target) - -+ (pc_ + 9) - kNearJmpInstrSize); -+ if (!is_int32(displacement)) return; -+ CodeEntry(); // 4 bytes - // Use a push, because mov to an extended register takes 6 bytes. -- pushq_imm32(func_index); // 5 bytes -- EmitJumpSlot(lazy_compile_target); // 5 bytes -+ pushq_imm32(func_index); // 5 bytes -+ near_jmp(displacement, RelocInfo::NO_INFO); // 5 bytes - } - - bool JumpTableAssembler::EmitJumpSlot(Address target) { - intptr_t displacement = static_cast( -- reinterpret_cast(target) - pc_ - kNearJmpInstrSize); -+ reinterpret_cast(target) - (pc_ + 4) - kNearJmpInstrSize); - if (!is_int32(displacement)) return false; -+ CodeEntry(); // 4 bytes - near_jmp(displacement, RelocInfo::NO_INFO); // 5 bytes - return true; - } -@@ -68,11 +74,12 @@ bool JumpTableAssembler::EmitJumpSlot(Address target) - void JumpTableAssembler::EmitFarJumpSlot(Address target) { - Label data; - int start_offset = pc_offset(); -+ CodeEntry(); // 4 bytes - jmp(Operand(&data)); // 6 bytes -- Nop(2); // 2 bytes -+ Nop(6); // 6 bytes - // The data must be properly aligned, so it can be patched atomically (see - // {PatchFarJumpSlot}). -- DCHECK_EQ(start_offset + kSystemPointerSize, pc_offset()); -+ DCHECK_EQ(start_offset + kFarJumpTableSlotOffset, pc_offset()); - USE(start_offset); - bind(&data); - dq(target); // 8 bytes -@@ -83,7 +90,7 @@ void JumpTableAssembler::PatchFarJumpSlot(Address slot - // The slot needs to be pointer-size aligned so we can atomically update it. - DCHECK(IsAligned(slot, kSystemPointerSize)); - // Offset of the target is at 8 bytes, see {EmitFarJumpSlot}. -- reinterpret_cast*>(slot + kSystemPointerSize) -+ reinterpret_cast*>(slot + kFarJumpTableSlotOffset) - ->store(target, std::memory_order_relaxed); - // The update is atomic because the address is properly aligned. - // Because of cache coherence, the data update will eventually be seen by all diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_wasm_jump-table-assembler.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_wasm_jump-table-assembler.h deleted file mode 100644 index b1f3d1d5539f..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_wasm_jump-table-assembler.h +++ /dev/null @@ -1,16 +0,0 @@ ---- src/3rdparty/chromium/v8/src/wasm/jump-table-assembler.h.orig 2023-07-16 15:47:57 UTC -+++ src/3rdparty/chromium/v8/src/wasm/jump-table-assembler.h -@@ -185,9 +185,10 @@ class V8_EXPORT_PRIVATE JumpTableAssembler : public Ma - // boundaries. The jump table line size has been chosen to satisfy this. - #if V8_TARGET_ARCH_X64 - static constexpr int kJumpTableLineSize = 64; -- static constexpr int kJumpTableSlotSize = 5; -- static constexpr int kFarJumpTableSlotSize = 16; -- static constexpr int kLazyCompileTableSlotSize = 10; -+ static constexpr int kJumpTableSlotSize = 5 + 4; -+ static constexpr int kFarJumpTableSlotOffset = 2 * kSystemPointerSize; -+ static constexpr int kFarJumpTableSlotSize = 16 + 8; -+ static constexpr int kLazyCompileTableSlotSize = 10 + 4; - #elif V8_TARGET_ARCH_IA32 - static constexpr int kJumpTableLineSize = 64; - static constexpr int kJumpTableSlotSize = 5; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_weblayer_browser_browser__main__parts__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_weblayer_browser_browser__main__parts__impl.cc deleted file mode 100644 index bc76caba35f0..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_weblayer_browser_browser__main__parts__impl.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- src/3rdparty/chromium/weblayer/browser/browser_main_parts_impl.cc.orig 2023-09-13 12:11:42 UTC -+++ src/3rdparty/chromium/weblayer/browser/browser_main_parts_impl.cc -@@ -82,7 +82,7 @@ - - // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is - // complete. --#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) - #include "ui/base/ime/init/input_method_initializer.h" - #endif - -@@ -201,7 +201,7 @@ int BrowserMainPartsImpl::PreEarlyInitialization() { - - // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is - // complete. --#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) - ui::InitializeInputMethodForTesting(); - #endif - #if BUILDFLAG(IS_ANDROID) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_weblayer_browser_content__browser__client__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_weblayer_browser_content__browser__client__impl.cc deleted file mode 100644 index e30491b9f28a..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_weblayer_browser_content__browser__client__impl.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- src/3rdparty/chromium/weblayer/browser/content_browser_client_impl.cc.orig 2023-09-13 12:11:42 UTC -+++ src/3rdparty/chromium/weblayer/browser/content_browser_client_impl.cc -@@ -154,7 +154,7 @@ - // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is - // complete. - #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \ -- BUILDFLAG(IS_ANDROID) -+ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) - #include "content/public/common/content_descriptors.h" - #endif - -@@ -1025,7 +1025,7 @@ SafeBrowsingService* ContentBrowserClientImpl::GetSafe - // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is - // complete. - #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \ -- BUILDFLAG(IS_ANDROID) -+ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) - void ContentBrowserClientImpl::GetAdditionalMappedFilesForChildProcess( - const base::CommandLine& command_line, - int child_process_id, diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_weblayer_browser_content__browser__client__impl.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_weblayer_browser_content__browser__client__impl.h deleted file mode 100644 index bcf8fe116242..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_weblayer_browser_content__browser__client__impl.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/weblayer/browser/content_browser_client_impl.h.orig 2023-09-13 12:11:42 UTC -+++ src/3rdparty/chromium/weblayer/browser/content_browser_client_impl.h -@@ -184,7 +184,7 @@ class ContentBrowserClientImpl : public content::Conte - // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is - // complete. - #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \ -- BUILDFLAG(IS_ANDROID) -+ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) - void GetAdditionalMappedFilesForChildProcess( - const base::CommandLine& command_line, - int child_process_id, diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_weblayer_browser_system__network__context__manager.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_weblayer_browser_system__network__context__manager.cc deleted file mode 100644 index 9b1ea960f8ef..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_weblayer_browser_system__network__context__manager.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/weblayer/browser/system_network_context_manager.cc.orig 2022-03-25 21:59:56 UTC -+++ src/3rdparty/chromium/weblayer/browser/system_network_context_manager.cc -@@ -69,7 +69,7 @@ void SystemNetworkContextManager::ConfigureDefaultNetw - network_context_params->user_agent = user_agent; - // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is - // complete. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - // We're not configuring the cookie encryption on these platforms yet. - network_context_params->enable_encrypted_cookies = false; - #endif // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_weblayer_common_weblayer__paths.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_weblayer_common_weblayer__paths.cc deleted file mode 100644 index 80c3836c307c..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_weblayer_common_weblayer__paths.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- src/3rdparty/chromium/weblayer/common/weblayer_paths.cc.orig 2022-03-25 21:59:56 UTC -+++ src/3rdparty/chromium/weblayer/common/weblayer_paths.cc -@@ -18,7 +18,7 @@ - - #if BUILDFLAG(IS_WIN) - #include "base/base_paths_win.h" --#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) - #include "base/nix/xdg_util.h" - #endif - -@@ -36,7 +36,7 @@ bool GetDefaultUserDataDirectory(base::FilePath* resul - return false; - *result = result->AppendASCII("weblayer"); - return true; --#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) - std::unique_ptr env(base::Environment::Create()); - base::FilePath config_dir(base::nix::GetXDGDirectory( - env.get(), base::nix::kXdgConfigHomeEnvVar, base::nix::kDotConfigDir)); 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 bbed1c867e6f..01ef4e3b469f 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,6 +1,6 @@ ---- src/3rdparty/gn/build/gen.py.orig 2023-08-16 19:50:41 UTC +--- src/3rdparty/gn/build/gen.py.orig 2024-10-02 15:40:01 UTC +++ src/3rdparty/gn/build/gen.py -@@ -92,6 +92,12 @@ class Platform(object): +@@ -94,6 +94,12 @@ class Platform(object): def is_solaris(self): return self._platform == 'solaris' @@ -11,9 +11,9 @@ + return self._platform == 'freebsd' + def is_posix(self): - return self._platform in ['linux', 'freebsd', 'darwin', 'aix', 'openbsd', 'haiku', 'solaris', 'msys', 'netbsd'] + return self._platform in ['linux', 'freebsd', 'darwin', 'aix', 'openbsd', 'haiku', 'solaris', 'msys', 'netbsd', 'serenity'] -@@ -294,7 +300,7 @@ def WriteGenericNinja(path, static_libraries, executab +@@ -327,7 +333,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', -@@ -531,6 +537,9 @@ def WriteGNNinja(path, platform, host, options, args_l +@@ -589,6 +595,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_core_CMakeLists.txt b/www/qt6-webengine/files/patch-src_core_CMakeLists.txt index ce8adebaa3df..9170ddd23ed3 100644 --- a/www/qt6-webengine/files/patch-src_core_CMakeLists.txt +++ b/www/qt6-webengine/files/patch-src_core_CMakeLists.txt @@ -1,6 +1,6 @@ ---- src/core/CMakeLists.txt.orig 2023-12-12 22:08:45 UTC +--- src/core/CMakeLists.txt.orig 2024-10-02 15:40:01 UTC +++ src/core/CMakeLists.txt -@@ -20,7 +20,7 @@ add_subdirectory(tools/qwebengine_convert_dict) +@@ -21,7 +21,7 @@ add_subdirectory(tools/qwebengine_convert_dict) # TOOLCHAIN SETUP ## @@ -9,16 +9,34 @@ setup_toolchains() endif() -@@ -409,7 +409,7 @@ foreach(arch ${archs}) - CONDITION QT_FEATURE_webengine_embedded_build +@@ -200,7 +200,7 @@ foreach(arch ${archs}) + 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}) + CONDITION QT_FEATURE_webenginedriver ) - if(LINUX) + if(LINUX OR FREEBSD) list(APPEND gnArgArg + angle_enable_gl=true use_gtk=false # GTK toolkit bindings - use_qt=false # Qt5 toolkit bindings -@@ -418,7 +418,7 @@ foreach(arch ${archs}) +@@ -445,7 +445,7 @@ foreach(arch ${archs}) use_bundled_fontconfig=false use_glib=false use_bluez=false @@ -27,7 +45,7 @@ is_cfi=false use_ozone=true ozone_auto_platforms=false -@@ -477,6 +477,10 @@ foreach(arch ${archs}) +@@ -504,6 +504,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 ddeccc69e5bb..8d6089b57209 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 2023-12-12 22:08:45 UTC +--- src/core/api/configure.cmake.orig 2024-10-02 15:40:01 UTC +++ src/core/api/configure.cmake @@ -10,6 +10,7 @@ if(NOT QT_CONFIGURE_RUNNING) if(PkgConfig_FOUND AND QT_FEATURE_pkg_config) @@ -8,9 +8,9 @@ pkg_check_modules(XDAMAGE xdamage) pkg_check_modules(POPPLER_CPP poppler-cpp IMPORTED_TARGET) pkg_check_modules(GBM gbm) -@@ -90,6 +91,11 @@ qt_feature("webengine-printing-and-pdf" PRIVATE - CONDITION TARGET Qt::PrintSupport AND QT_FEATURE_printer AND - (CUPS_FOUND OR WIN32) +@@ -87,6 +88,11 @@ qt_feature("webengine-printing-and-pdf" PRIVATE + AUTODETECT NOT QT_FEATURE_webengine_embedded_build + CONDITION TARGET Qt::PrintSupport AND QT_FEATURE_printer ) +qt_feature("webengine-system-sndio" PRIVATE + LABEL "Use sndio" @@ -20,16 +20,16 @@ qt_feature("webengine-pepper-plugins" PRIVATE LABEL "Pepper Plugins" PURPOSE "Enables use of Pepper plugins." -@@ -170,7 +176,7 @@ qt_feature("webengine-vaapi" PRIVATE +@@ -167,7 +173,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 - CONDITION LINUX AND NOT QT_FEATURE_webengine_system_libvpx + CONDITION UNIX AND NOT QT_FEATURE_webengine_system_libvpx ) - # internal testing feature - qt_feature("webengine-system-poppler" PRIVATE -@@ -205,15 +211,19 @@ qt_configure_add_summary_entry( + list(LENGTH CMAKE_OSX_ARCHITECTURES osx_arch_count) + qt_feature("webenginedriver" PUBLIC +@@ -211,15 +217,19 @@ qt_configure_add_summary_entry( ) qt_configure_add_summary_entry( ARGS "webengine-vaapi" @@ -51,4 +51,4 @@ + CONDITION UNIX ) qt_configure_add_summary_entry(ARGS "webengine-v8-context-snapshot") - qt_configure_end_summary_section() # end of "Qt WebEngineCore" section + qt_configure_add_summary_entry(ARGS "webenginedriver") diff --git a/www/qt6-webengine/files/patch-src_pdf_CMakeLists.txt b/www/qt6-webengine/files/patch-src_pdf_CMakeLists.txt index c5fd9473264d..77ec8be8912e 100644 --- a/www/qt6-webengine/files/patch-src_pdf_CMakeLists.txt +++ b/www/qt6-webengine/files/patch-src_pdf_CMakeLists.txt @@ -1,6 +1,6 @@ ---- src/pdf/CMakeLists.txt.orig 2023-12-12 22:08:45 UTC +--- src/pdf/CMakeLists.txt.orig 2024-10-02 15:40:01 UTC +++ src/pdf/CMakeLists.txt -@@ -71,7 +71,7 @@ add_dependencies(docs generate_pdf_attributions) +@@ -70,7 +70,7 @@ add_dependencies(prepare_docs_Pdf generate_pdf_attribu # TOOLCHAIN SETUP ## diff --git a/www/qt6-webengine/pkg-plist b/www/qt6-webengine/pkg-plist index 983f4fcbaaed..b0631d3d4fa7 100644 --- a/www/qt6-webengine/pkg-plist +++ b/www/qt6-webengine/pkg-plist @@ -9,6 +9,7 @@ %%QT_INCDIR%%/QtWebEngineCore/%%FULLVER%%/QtWebEngineCore/private/qwebenginemessagepumpscheduler_p.h %%QT_INCDIR%%/QtWebEngineCore/%%FULLVER%%/QtWebEngineCore/private/qwebenginenewwindowrequest_p.h %%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/qwebenginescriptcollection_p.h %%QT_INCDIR%%/QtWebEngineCore/%%FULLVER%%/QtWebEngineCore/private/qwebengineurlrequestinfo_p.h @@ -16,12 +17,14 @@ %%QT_INCDIR%%/QtWebEngineCore/QWebEngineCertificateError %%QT_INCDIR%%/QtWebEngineCore/QWebEngineClientCertificateSelection %%QT_INCDIR%%/QtWebEngineCore/QWebEngineClientCertificateStore +%%QT_INCDIR%%/QtWebEngineCore/QWebEngineClientHints %%QT_INCDIR%%/QtWebEngineCore/QWebEngineContextMenuRequest %%QT_INCDIR%%/QtWebEngineCore/QWebEngineCookieStore %%QT_INCDIR%%/QtWebEngineCore/QWebEngineDesktopMediaRequest %%QT_INCDIR%%/QtWebEngineCore/QWebEngineDownloadRequest %%QT_INCDIR%%/QtWebEngineCore/QWebEngineFileSystemAccessRequest %%QT_INCDIR%%/QtWebEngineCore/QWebEngineFindTextResult +%%QT_INCDIR%%/QtWebEngineCore/QWebEngineFrame %%QT_INCDIR%%/QtWebEngineCore/QWebEngineFullScreenRequest %%QT_INCDIR%%/QtWebEngineCore/QWebEngineGlobalSettings %%QT_INCDIR%%/QtWebEngineCore/QWebEngineHistory @@ -33,6 +36,7 @@ %%QT_INCDIR%%/QtWebEngineCore/QWebEngineNewWindowRequest %%QT_INCDIR%%/QtWebEngineCore/QWebEngineNotification %%QT_INCDIR%%/QtWebEngineCore/QWebEnginePage +%%QT_INCDIR%%/QtWebEngineCore/QWebEnginePermission %%QT_INCDIR%%/QtWebEngineCore/QWebEngineProfile %%QT_INCDIR%%/QtWebEngineCore/QWebEngineQuotaRequest %%QT_INCDIR%%/QtWebEngineCore/QWebEngineRegisterProtocolHandlerRequest @@ -55,12 +59,14 @@ %%QT_INCDIR%%/QtWebEngineCore/qwebenginecertificateerror.h %%QT_INCDIR%%/QtWebEngineCore/qwebengineclientcertificateselection.h %%QT_INCDIR%%/QtWebEngineCore/qwebengineclientcertificatestore.h +%%QT_INCDIR%%/QtWebEngineCore/qwebengineclienthints.h %%QT_INCDIR%%/QtWebEngineCore/qwebenginecontextmenurequest.h %%QT_INCDIR%%/QtWebEngineCore/qwebenginecookiestore.h %%QT_INCDIR%%/QtWebEngineCore/qwebenginedesktopmediarequest.h %%QT_INCDIR%%/QtWebEngineCore/qwebenginedownloadrequest.h %%QT_INCDIR%%/QtWebEngineCore/qwebenginefilesystemaccessrequest.h %%QT_INCDIR%%/QtWebEngineCore/qwebenginefindtextresult.h +%%QT_INCDIR%%/QtWebEngineCore/qwebengineframe.h %%QT_INCDIR%%/QtWebEngineCore/qwebenginefullscreenrequest.h %%QT_INCDIR%%/QtWebEngineCore/qwebengineglobalsettings.h %%QT_INCDIR%%/QtWebEngineCore/qwebenginehistory.h @@ -70,6 +76,7 @@ %%QT_INCDIR%%/QtWebEngineCore/qwebenginenewwindowrequest.h %%QT_INCDIR%%/QtWebEngineCore/qwebenginenotification.h %%QT_INCDIR%%/QtWebEngineCore/qwebenginepage.h +%%QT_INCDIR%%/QtWebEngineCore/qwebenginepermission.h %%QT_INCDIR%%/QtWebEngineCore/qwebengineprofile.h %%QT_INCDIR%%/QtWebEngineCore/qwebenginequotarequest.h %%QT_INCDIR%%/QtWebEngineCore/qwebengineregisterprotocolhandlerrequest.h @@ -87,7 +94,6 @@ %%QT_INCDIR%%/QtWebEngineQuick/%%FULLVER%%/QtWebEngineQuick/private/qquickwebengineaction_p_p.h %%QT_INCDIR%%/QtWebEngineQuick/%%FULLVER%%/QtWebEngineQuick/private/qquickwebengineclientcertificateselection_p.h %%QT_INCDIR%%/QtWebEngineQuick/%%FULLVER%%/QtWebEngineQuick/private/qquickwebenginedialogrequests_p.h -%%QT_INCDIR%%/QtWebEngineQuick/%%FULLVER%%/QtWebEngineQuick/private/qquickwebenginedownloadrequest_p.h %%QT_INCDIR%%/QtWebEngineQuick/%%FULLVER%%/QtWebEngineQuick/private/qquickwebenginefaviconprovider_p_p.h %%QT_INCDIR%%/QtWebEngineQuick/%%FULLVER%%/QtWebEngineQuick/private/qquickwebengineforeigntypes_p.h %%QT_INCDIR%%/QtWebEngineQuick/%%FULLVER%%/QtWebEngineQuick/private/qquickwebenginenewwindowrequest_p.h @@ -106,10 +112,12 @@ %%QT_INCDIR%%/QtWebEngineQuick/%%FULLVER%%/QtWebEngineQuick/private/qtwebenginequickglobal_p.h %%QT_INCDIR%%/QtWebEngineQuick/%%FULLVER%%/QtWebEngineQuick/private/render_widget_host_view_qt_delegate_quickwindow_p.h %%QT_INCDIR%%/QtWebEngineQuick/%%FULLVER%%/QtWebEngineQuick/private/ui_delegates_manager_p.h +%%QT_INCDIR%%/QtWebEngineQuick/QQuickWebEngineDownloadRequest %%QT_INCDIR%%/QtWebEngineQuick/QQuickWebEngineProfile %%QT_INCDIR%%/QtWebEngineQuick/QtWebEngineQuick %%QT_INCDIR%%/QtWebEngineQuick/QtWebEngineQuickDepends %%QT_INCDIR%%/QtWebEngineQuick/QtWebEngineQuickVersion +%%QT_INCDIR%%/QtWebEngineQuick/qquickwebenginedownloadrequest.h %%QT_INCDIR%%/QtWebEngineQuick/qquickwebengineprofile.h %%QT_INCDIR%%/QtWebEngineQuick/qtwebenginequick-config.h %%QT_INCDIR%%/QtWebEngineQuick/qtwebenginequickglobal.h @@ -161,6 +169,7 @@ lib/cmake/Qt6WebEngineCore/Qt6WebEngineCoreDeploySupport.cmake lib/cmake/Qt6WebEngineCore/Qt6WebEngineCoreMacros.cmake 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/Qt6WebEngineCoreTools/Qt6WebEngineCoreToolsAdditionalTargetInfo.cmake lib/cmake/Qt6WebEngineCoreTools/Qt6WebEngineCoreToolsConfig.cmake @@ -177,6 +186,7 @@ lib/cmake/Qt6WebEngineQuick/Qt6WebEngineQuickConfigVersionImpl.cmake lib/cmake/Qt6WebEngineQuick/Qt6WebEngineQuickDependencies.cmake lib/cmake/Qt6WebEngineQuick/Qt6WebEngineQuickTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6WebEngineQuick/Qt6WebEngineQuickTargets.cmake +lib/cmake/Qt6WebEngineQuick/Qt6WebEngineQuickVersionlessAliasTargets.cmake lib/cmake/Qt6WebEngineQuick/Qt6WebEngineQuickVersionlessTargets.cmake lib/cmake/Qt6WebEngineQuickDelegatesQml/Qt6WebEngineQuickDelegatesQmlAdditionalTargetInfo.cmake lib/cmake/Qt6WebEngineQuickDelegatesQml/Qt6WebEngineQuickDelegatesQmlConfig.cmake @@ -184,6 +194,7 @@ lib/cmake/Qt6WebEngineQuickDelegatesQml/Qt6WebEngineQuickDelegatesQmlConfigVersi lib/cmake/Qt6WebEngineQuickDelegatesQml/Qt6WebEngineQuickDelegatesQmlConfigVersionImpl.cmake lib/cmake/Qt6WebEngineQuickDelegatesQml/Qt6WebEngineQuickDelegatesQmlTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6WebEngineQuickDelegatesQml/Qt6WebEngineQuickDelegatesQmlTargets.cmake +lib/cmake/Qt6WebEngineQuickDelegatesQml/Qt6WebEngineQuickDelegatesQmlVersionlessAliasTargets.cmake lib/cmake/Qt6WebEngineQuickDelegatesQml/Qt6WebEngineQuickDelegatesQmlVersionlessTargets.cmake lib/cmake/Qt6WebEngineWidgets/Qt6WebEngineWidgetsAdditionalTargetInfo.cmake lib/cmake/Qt6WebEngineWidgets/Qt6WebEngineWidgetsConfig.cmake @@ -192,6 +203,7 @@ lib/cmake/Qt6WebEngineWidgets/Qt6WebEngineWidgetsConfigVersionImpl.cmake lib/cmake/Qt6WebEngineWidgets/Qt6WebEngineWidgetsDependencies.cmake lib/cmake/Qt6WebEngineWidgets/Qt6WebEngineWidgetsTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6WebEngineWidgets/Qt6WebEngineWidgetsTargets.cmake +lib/cmake/Qt6WebEngineWidgets/Qt6WebEngineWidgetsVersionlessAliasTargets.cmake lib/cmake/Qt6WebEngineWidgets/Qt6WebEngineWidgetsVersionlessTargets.cmake %%QT_LIBDIR%%/libQt6WebEngineCore.prl %%QT_LIBDIR%%/libQt6WebEngineCore.so @@ -242,6 +254,7 @@ lib/cmake/Qt6WebEngineWidgets/Qt6WebEngineWidgetsVersionlessTargets.cmake %%QT_QMLDIR%%/QtWebEngine/libqtwebenginequickplugin.so %%QT_QMLDIR%%/QtWebEngine/plugins.qmltypes %%QT_QMLDIR%%/QtWebEngine/qmldir +%%QT_SBOMDIR%%/qtwebengine-%%FULLVER%%.spdx libdata/pkgconfig/Qt6WebEngineCore.pc libdata/pkgconfig/Qt6WebEngineQuick.pc libdata/pkgconfig/Qt6WebEngineQuickDelegatesQml.pc diff --git a/www/qt6-websockets/distinfo b/www/qt6-websockets/distinfo index 8d6e4663a1d5..1c76bca8c8b1 100644 --- a/www/qt6-websockets/distinfo +++ b/www/qt6-websockets/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1727500697 -SHA256 (KDE/Qt/6.7.3/qtwebsockets-everywhere-src-6.7.3.tar.xz) = ba03007db7ee68a5bc3e3bd1d71e11f3e1f84e470bcb8c54cd7c01bbe1c5990e -SIZE (KDE/Qt/6.7.3/qtwebsockets-everywhere-src-6.7.3.tar.xz) = 459844 +TIMESTAMP = 1733205734 +SHA256 (KDE/Qt/6.8.1/qtwebsockets-everywhere-src-6.8.1.tar.xz) = e4cfdae8760bedd1c2b00429a6c9bf88cc11c5018dcb46bde277fb1edf341e3f +SIZE (KDE/Qt/6.8.1/qtwebsockets-everywhere-src-6.8.1.tar.xz) = 460488 diff --git a/www/qt6-websockets/pkg-plist b/www/qt6-websockets/pkg-plist index 73ff6b540790..9b732085ba99 100644 --- a/www/qt6-websockets/pkg-plist +++ b/www/qt6-websockets/pkg-plist @@ -40,6 +40,7 @@ lib/cmake/Qt6WebSockets/Qt6WebSocketsConfigVersionImpl.cmake lib/cmake/Qt6WebSockets/Qt6WebSocketsDependencies.cmake lib/cmake/Qt6WebSockets/Qt6WebSocketsTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6WebSockets/Qt6WebSocketsTargets.cmake +lib/cmake/Qt6WebSockets/Qt6WebSocketsVersionlessAliasTargets.cmake lib/cmake/Qt6WebSockets/Qt6WebSocketsVersionlessTargets.cmake %%QT_LIBDIR%%/libQt6WebSockets.prl %%QT_LIBDIR%%/libQt6WebSockets.so @@ -51,5 +52,6 @@ lib/cmake/Qt6WebSockets/Qt6WebSocketsVersionlessTargets.cmake %%QT_QMLDIR%%/QtWebSockets/libqmlwebsocketsplugin.so %%QT_QMLDIR%%/QtWebSockets/plugins.qmltypes %%QT_QMLDIR%%/QtWebSockets/qmldir +%%QT_SBOMDIR%%/qtwebsockets-%%FULLVER%%.spdx libdata/pkgconfig/Qt6WebSockets.pc %%QT_DATADIR%%/modules/WebSockets.json diff --git a/www/qt6-webview/distinfo b/www/qt6-webview/distinfo index 48d98c5b0b9f..c81e17fbaa18 100644 --- a/www/qt6-webview/distinfo +++ b/www/qt6-webview/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1727500698 -SHA256 (KDE/Qt/6.7.3/qtwebview-everywhere-src-6.7.3.tar.xz) = 708ae8fe44a243fe556384c4452d4592b8469ac66f3fd43876b18d425005b92d -SIZE (KDE/Qt/6.7.3/qtwebview-everywhere-src-6.7.3.tar.xz) = 139024 +TIMESTAMP = 1733205736 +SHA256 (KDE/Qt/6.8.1/qtwebview-everywhere-src-6.8.1.tar.xz) = f56bc09e9c84fa06f3955871ba37065556696c72be9c7620925eb0fd83569e22 +SIZE (KDE/Qt/6.8.1/qtwebview-everywhere-src-6.8.1.tar.xz) = 139068 diff --git a/www/qt6-webview/pkg-plist b/www/qt6-webview/pkg-plist index 08c1fdc94cc7..bb342e20b1ed 100644 --- a/www/qt6-webview/pkg-plist +++ b/www/qt6-webview/pkg-plist @@ -19,6 +19,7 @@ %%QT_INCDIR%%/QtWebViewQuick/QtWebViewQuick %%QT_INCDIR%%/QtWebViewQuick/QtWebViewQuickDepends %%QT_INCDIR%%/QtWebViewQuick/QtWebViewQuickVersion +%%QT_INCDIR%%/QtWebViewQuick/qtwebviewquickexports.h %%QT_INCDIR%%/QtWebViewQuick/qtwebviewquickversion.h lib/cmake/Qt6BuildInternals/StandaloneTests/QtWebViewTestsConfig.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6qtwebviewquickpluginAdditionalTargetInfo.cmake @@ -41,6 +42,7 @@ lib/cmake/Qt6WebView/Qt6WebViewDependencies.cmake lib/cmake/Qt6WebView/Qt6WebViewPlugins.cmake 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/Qt6WebViewQuick/Qt6WebViewQuickAdditionalTargetInfo.cmake lib/cmake/Qt6WebViewQuick/Qt6WebViewQuickConfig.cmake @@ -49,6 +51,7 @@ lib/cmake/Qt6WebViewQuick/Qt6WebViewQuickConfigVersionImpl.cmake lib/cmake/Qt6WebViewQuick/Qt6WebViewQuickDependencies.cmake lib/cmake/Qt6WebViewQuick/Qt6WebViewQuickTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6WebViewQuick/Qt6WebViewQuickTargets.cmake +lib/cmake/Qt6WebViewQuick/Qt6WebViewQuickVersionlessAliasTargets.cmake lib/cmake/Qt6WebViewQuick/Qt6WebViewQuickVersionlessTargets.cmake %%QT_LIBDIR%%/libQt6WebView.prl %%QT_LIBDIR%%/libQt6WebView.so @@ -68,6 +71,7 @@ lib/cmake/Qt6WebViewQuick/Qt6WebViewQuickVersionlessTargets.cmake %%QT_QMLDIR%%/QtWebView/libqtwebviewquickplugin.so %%QT_QMLDIR%%/QtWebView/plugins.qmltypes %%QT_QMLDIR%%/QtWebView/qmldir +%%QT_SBOMDIR%%/qtwebview-%%FULLVER%%.spdx libdata/pkgconfig/Qt6WebView.pc libdata/pkgconfig/Qt6WebViewQuick.pc %%QT_DATADIR%%/modules/WebView.json diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile index 36c1118995de..f1cb7a8b6964 100644 --- a/x11-toolkits/Makefile +++ b/x11-toolkits/Makefile @@ -185,6 +185,7 @@ SUBDIR += py-qt5-datavis3d SUBDIR += py-qt6-charts SUBDIR += py-qt6-datavis3d + SUBDIR += py-qt6-graphs SUBDIR += py-superqt SUBDIR += py-tkinter SUBDIR += py-tktreectrl diff --git a/x11-toolkits/py-qt6-charts/distinfo b/x11-toolkits/py-qt6-charts/distinfo index 7b736cb07cd8..6d526fe5c31c 100644 --- a/x11-toolkits/py-qt6-charts/distinfo +++ b/x11-toolkits/py-qt6-charts/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1714272017 -SHA256 (PyQt6_Charts-6.7.0.tar.gz) = c4f7cf369928f7bf032e4e33f718d3b8fe66da176d4959fe30735a970d86f35c -SIZE (PyQt6_Charts-6.7.0.tar.gz) = 41390 +TIMESTAMP = 1733628726 +SHA256 (PyQt6_Charts-6.8.0.tar.gz) = f86705b8740e3041667ce211aeaa205b750eb6baf4c908f4e3f6dc8c720d10f1 +SIZE (PyQt6_Charts-6.8.0.tar.gz) = 41558 diff --git a/x11-toolkits/py-qt6-datavis3d/Makefile b/x11-toolkits/py-qt6-datavis3d/Makefile index 28aad958c471..0644f2794906 100644 --- a/x11-toolkits/py-qt6-datavis3d/Makefile +++ b/x11-toolkits/py-qt6-datavis3d/Makefile @@ -1,6 +1,5 @@ PORTNAME= datavis3d DISTVERSION= ${PYQTDATAVIS3D_VERSION} -PORTREVISION= 1 CATEGORIES= x11-toolkits devel python MASTER_SITES= ${MASTER_SITES_PYQTDATAVIS3D} PKGNAMEPREFIX= ${PYQT_PY_RELNAME}- diff --git a/x11-toolkits/py-qt6-datavis3d/distinfo b/x11-toolkits/py-qt6-datavis3d/distinfo index deff4dcceb00..7aed52e5cebc 100644 --- a/x11-toolkits/py-qt6-datavis3d/distinfo +++ b/x11-toolkits/py-qt6-datavis3d/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1714272032 -SHA256 (PyQt6_DataVisualization-6.7.0.tar.gz) = 8cbdd50326a2cda533bc5744c85a331c84047af121bdbd64f9c00dbc06588884 -SIZE (PyQt6_DataVisualization-6.7.0.tar.gz) = 210038 +TIMESTAMP = 1733628739 +SHA256 (PyQt6_DataVisualization-6.8.0.tar.gz) = 822a94163b8177b9dd507988aff4da7c79ce26bc47fc5f9780dea6989c531171 +SIZE (PyQt6_DataVisualization-6.8.0.tar.gz) = 210142 diff --git a/x11-toolkits/py-qt6-graphs/Makefile b/x11-toolkits/py-qt6-graphs/Makefile new file mode 100644 index 000000000000..5428ac927867 --- /dev/null +++ b/x11-toolkits/py-qt6-graphs/Makefile @@ -0,0 +1,26 @@ +PORTNAME= graphs +DISTVERSION= ${PYQTGRAPHS_VERSION} +CATEGORIES= x11-toolkits devel python +MASTER_SITES= ${MASTER_SITES_PYQTGRAPHS} +PKGNAMEPREFIX= ${PYQT_PY_RELNAME}- +DISTNAME= ${PYQTGRAPHS_DISTNAME} + +MAINTAINER= kde@FreeBSD.org +COMMENT= Python bindings for the Qt6 toolkit, QtGraphs module +WWW= https://riverbankcomputing.com/software/pyqtgraphs + +LICENSE= ${PYQT6_LICENSE} + +USES= gl pyqt:6,dist python qt:6 +USE_GL= opengl +USE_PYQT= pyqt6 qtbuilder:build sip:build +USE_PYTHON= concurrent flavors +USE_QT= base graphs + +PLIST_SUB= PYQTGRAPHS_VERSION=${DISTVERSION} + +post-install: + @${FIND} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt6 \ + -name '*.so*' -exec ${STRIP_CMD} {} + + +.include diff --git a/x11-toolkits/py-qt6-graphs/distinfo b/x11-toolkits/py-qt6-graphs/distinfo new file mode 100644 index 000000000000..dcace7d89e2f --- /dev/null +++ b/x11-toolkits/py-qt6-graphs/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1733632888 +SHA256 (PyQt6_Graphs-6.8.0.tar.gz) = 9c457c1b218593ca2d7ef046426f01ef493636aa6567421941750321ed37e4ce +SIZE (PyQt6_Graphs-6.8.0.tar.gz) = 34305 diff --git a/x11-toolkits/py-qt6-graphs/pkg-descr b/x11-toolkits/py-qt6-graphs/pkg-descr new file mode 100644 index 000000000000..39fcc18e0ba0 --- /dev/null +++ b/x11-toolkits/py-qt6-graphs/pkg-descr @@ -0,0 +1,2 @@ +PyQt6 is a set of Python bindings for Qt6 application framework. +This package provides the extra QtGraphs module. diff --git a/x11-toolkits/py-qt6-graphs/pkg-plist b/x11-toolkits/py-qt6-graphs/pkg-plist new file mode 100644 index 000000000000..a9f8db172d3d --- /dev/null +++ b/x11-toolkits/py-qt6-graphs/pkg-plist @@ -0,0 +1,59 @@ +%%PYQT_APIDIR%%/PyQt6-Graphs.api +%%PYQT_SIPDIR%%/QtGraphs/QtGraphs.toml +%%PYQT_SIPDIR%%/QtGraphs/QtGraphsmod.sip +%%PYQT_SIPDIR%%/QtGraphs/q%%PYTHON_MAJOR_VER%%dscene.sip +%%PYQT_SIPDIR%%/QtGraphs/qabstract%%PYTHON_MAJOR_VER%%daxis.sip +%%PYQT_SIPDIR%%/QtGraphs/qabstract%%PYTHON_MAJOR_VER%%dseries.sip +%%PYQT_SIPDIR%%/QtGraphs/qabstractaxis.sip +%%PYQT_SIPDIR%%/QtGraphs/qabstractdataproxy.sip +%%PYQT_SIPDIR%%/QtGraphs/qabstractseries.sip +%%PYQT_SIPDIR%%/QtGraphs/qareaseries.sip +%%PYQT_SIPDIR%%/QtGraphs/qbar%%PYTHON_MAJOR_VER%%dseries.sip +%%PYQT_SIPDIR%%/QtGraphs/qbarcategoryaxis.sip +%%PYQT_SIPDIR%%/QtGraphs/qbardataitem.sip +%%PYQT_SIPDIR%%/QtGraphs/qbardataproxy.sip +%%PYQT_SIPDIR%%/QtGraphs/qbarmodelmapper.sip +%%PYQT_SIPDIR%%/QtGraphs/qbarseries.sip +%%PYQT_SIPDIR%%/QtGraphs/qbarset.sip +%%PYQT_SIPDIR%%/QtGraphs/qcategory%%PYTHON_MAJOR_VER%%daxis.sip +%%PYQT_SIPDIR%%/QtGraphs/qcustom%%PYTHON_MAJOR_VER%%ditem.sip +%%PYQT_SIPDIR%%/QtGraphs/qcustom%%PYTHON_MAJOR_VER%%dlabel.sip +%%PYQT_SIPDIR%%/QtGraphs/qcustom%%PYTHON_MAJOR_VER%%dvolume.sip +%%PYQT_SIPDIR%%/QtGraphs/qdatetimeaxis.sip +%%PYQT_SIPDIR%%/QtGraphs/qgraphs%%PYTHON_MAJOR_VER%%dnamespace.sip +%%PYQT_SIPDIR%%/QtGraphs/qgraphstheme.sip +%%PYQT_SIPDIR%%/QtGraphs/qheightmapsurfacedataproxy.sip +%%PYQT_SIPDIR%%/QtGraphs/qitemmodelbardataproxy.sip +%%PYQT_SIPDIR%%/QtGraphs/qitemmodelscatterdataproxy.sip +%%PYQT_SIPDIR%%/QtGraphs/qitemmodelsurfacedataproxy.sip +%%PYQT_SIPDIR%%/QtGraphs/qlineseries.sip +%%PYQT_SIPDIR%%/QtGraphs/qlist.sip +%%PYQT_SIPDIR%%/QtGraphs/qlogvalue%%PYTHON_MAJOR_VER%%daxisformatter.sip +%%PYQT_SIPDIR%%/QtGraphs/qpiemodelmapper.sip +%%PYQT_SIPDIR%%/QtGraphs/qpieseries.sip +%%PYQT_SIPDIR%%/QtGraphs/qpieslice.sip +%%PYQT_SIPDIR%%/QtGraphs/qscatter%%PYTHON_MAJOR_VER%%dseries.sip +%%PYQT_SIPDIR%%/QtGraphs/qscatterdataitem.sip +%%PYQT_SIPDIR%%/QtGraphs/qscatterdataproxy.sip +%%PYQT_SIPDIR%%/QtGraphs/qscatterseries.sip +%%PYQT_SIPDIR%%/QtGraphs/qsplineseries.sip +%%PYQT_SIPDIR%%/QtGraphs/qsurface%%PYTHON_MAJOR_VER%%dseries.sip +%%PYQT_SIPDIR%%/QtGraphs/qsurfacedataitem.sip +%%PYQT_SIPDIR%%/QtGraphs/qsurfacedataproxy.sip +%%PYQT_SIPDIR%%/QtGraphs/qutils.sip +%%PYQT_SIPDIR%%/QtGraphs/qvalue%%PYTHON_MAJOR_VER%%daxis.sip +%%PYQT_SIPDIR%%/QtGraphs/qvalue%%PYTHON_MAJOR_VER%%daxisformatter.sip +%%PYQT_SIPDIR%%/QtGraphs/qvalueaxis.sip +%%PYQT_SIPDIR%%/QtGraphs/qxymodelmapper.sip +%%PYQT_SIPDIR%%/QtGraphs/qxyseries.sip +%%PYQT_SIPDIR%%/QtGraphsWidgets/QtGraphsWidgets.toml +%%PYQT_SIPDIR%%/QtGraphsWidgets/QtGraphsWidgetsmod.sip +%%PYQT_SIPDIR%%/QtGraphsWidgets/q%%PYTHON_MAJOR_VER%%dbarswidgetitem.sip +%%PYQT_SIPDIR%%/QtGraphsWidgets/q%%PYTHON_MAJOR_VER%%dgraphswidgetitem.sip +%%PYQT_SIPDIR%%/QtGraphsWidgets/q%%PYTHON_MAJOR_VER%%dscatterwidgetitem.sip +%%PYQT_SIPDIR%%/QtGraphsWidgets/q%%PYTHON_MAJOR_VER%%dsurfacewidgetitem.sip +%%PYTHON_SITELIBDIR%%/PyQt6/QtGraphs.abi%%PYTHON_MAJOR_VER%%.so +%%PYTHON_SITELIBDIR%%/PyQt6/QtGraphsWidgets.abi%%PYTHON_MAJOR_VER%%.so +%%PYTHON_SITELIBDIR%%/PyQt6_Graphs-%%PYQT_PYQTVERSION%%.dist-info/INSTALLER +%%PYTHON_SITELIBDIR%%/PyQt6_Graphs-%%PYQT_PYQTVERSION%%.dist-info/METADATA +%%PYTHON_SITELIBDIR%%/PyQt6_Graphs-%%PYQT_PYQTVERSION%%.dist-info/RECORD diff --git a/x11-toolkits/qt6-charts/distinfo b/x11-toolkits/qt6-charts/distinfo index 3515871563b3..f22f46d3c7f4 100644 --- a/x11-toolkits/qt6-charts/distinfo +++ b/x11-toolkits/qt6-charts/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1727500699 -SHA256 (KDE/Qt/6.7.3/qtcharts-everywhere-src-6.7.3.tar.xz) = 07ea63a550e6bcfa4a9c38056f7aa524357305572268fe26f6063d83e4233659 -SIZE (KDE/Qt/6.7.3/qtcharts-everywhere-src-6.7.3.tar.xz) = 4661392 +TIMESTAMP = 1733205739 +SHA256 (KDE/Qt/6.8.1/qtcharts-everywhere-src-6.8.1.tar.xz) = 2edea3f16e248ef508d99332798645b7f5ab6edbbf2e3d7d78fb674156f07d29 +SIZE (KDE/Qt/6.8.1/qtcharts-everywhere-src-6.8.1.tar.xz) = 4662224 diff --git a/x11-toolkits/qt6-charts/pkg-plist b/x11-toolkits/qt6-charts/pkg-plist index 6af613e669d1..590c29e9ea9c 100644 --- a/x11-toolkits/qt6-charts/pkg-plist +++ b/x11-toolkits/qt6-charts/pkg-plist @@ -128,7 +128,6 @@ %%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/qsplineseries_p.h %%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/qstackedbarseries_p.h %%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/qtcharts-config_p.h -%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/qtchartsexports_p.h %%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/qvalueaxis_p.h %%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/qxylegendmarker_p.h %%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/qxymodelmapper_p.h @@ -281,7 +280,6 @@ %%QT_INCDIR%%/QtChartsQml/%%FULLVER%%/QtChartsQml/private/declarativesplineseries_p.h %%QT_INCDIR%%/QtChartsQml/%%FULLVER%%/QtChartsQml/private/declarativexypoint_p.h %%QT_INCDIR%%/QtChartsQml/%%FULLVER%%/QtChartsQml/private/declarativexyseries_p.h -%%QT_INCDIR%%/QtChartsQml/%%FULLVER%%/QtChartsQml/private/qtchartsqmlexports_p.h %%QT_INCDIR%%/QtChartsQml/QtChartsQml %%QT_INCDIR%%/QtChartsQml/QtChartsQmlDepends %%QT_INCDIR%%/QtChartsQml/QtChartsQmlVersion @@ -295,6 +293,7 @@ lib/cmake/Qt6Charts/Qt6ChartsConfigVersionImpl.cmake lib/cmake/Qt6Charts/Qt6ChartsDependencies.cmake 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/Qt6ChartsQml/Qt6ChartsQmlAdditionalTargetInfo.cmake lib/cmake/Qt6ChartsQml/Qt6ChartsQmlConfig.cmake @@ -303,6 +302,7 @@ lib/cmake/Qt6ChartsQml/Qt6ChartsQmlConfigVersionImpl.cmake lib/cmake/Qt6ChartsQml/Qt6ChartsQmlDependencies.cmake 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/Qt6Qml/QmlPlugins/Qt6qtchartsqml2AdditionalTargetInfo.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6qtchartsqml2Config.cmake @@ -377,6 +377,7 @@ lib/cmake/Qt6Qml/QmlPlugins/Qt6qtchartsqml2Targets.cmake %%QT_QMLDIR%%/QtCharts/libqtchartsqml2plugin.so %%QT_QMLDIR%%/QtCharts/plugins.qmltypes %%QT_QMLDIR%%/QtCharts/qmldir +%%QT_SBOMDIR%%/qtcharts-%%FULLVER%%.spdx libdata/pkgconfig/Qt6Charts.pc libdata/pkgconfig/Qt6ChartsQml.pc %%QT_DATADIR%%/modules/Charts.json diff --git a/x11-toolkits/qt6-datavis3d/distinfo b/x11-toolkits/qt6-datavis3d/distinfo index 5c0ab8fbb87c..c6166cfa6773 100644 --- a/x11-toolkits/qt6-datavis3d/distinfo +++ b/x11-toolkits/qt6-datavis3d/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1727500700 -SHA256 (KDE/Qt/6.7.3/qtdatavis3d-everywhere-src-6.7.3.tar.xz) = e1f2769519f8afc227368b0000fe9bfb686beb718c9a5eeb9584e5ed14241d81 -SIZE (KDE/Qt/6.7.3/qtdatavis3d-everywhere-src-6.7.3.tar.xz) = 3947892 +TIMESTAMP = 1733205742 +SHA256 (KDE/Qt/6.8.1/qtdatavis3d-everywhere-src-6.8.1.tar.xz) = dae68fe06db8aa3adedb3067c733352bcb29e42c8afcdc02cfda6755da504b0e +SIZE (KDE/Qt/6.8.1/qtdatavis3d-everywhere-src-6.8.1.tar.xz) = 3952600 diff --git a/x11-toolkits/qt6-datavis3d/pkg-plist b/x11-toolkits/qt6-datavis3d/pkg-plist index 325be8e914f6..4e11051f5eb2 100644 --- a/x11-toolkits/qt6-datavis3d/pkg-plist +++ b/x11-toolkits/qt6-datavis3d/pkg-plist @@ -180,6 +180,7 @@ lib/cmake/Qt6DataVisualization/Qt6DataVisualizationConfigVersionImpl.cmake lib/cmake/Qt6DataVisualization/Qt6DataVisualizationDependencies.cmake lib/cmake/Qt6DataVisualization/Qt6DataVisualizationTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6DataVisualization/Qt6DataVisualizationTargets.cmake +lib/cmake/Qt6DataVisualization/Qt6DataVisualizationVersionlessAliasTargets.cmake lib/cmake/Qt6DataVisualization/Qt6DataVisualizationVersionlessTargets.cmake lib/cmake/Qt6DataVisualizationQml/Qt6DataVisualizationQmlAdditionalTargetInfo.cmake lib/cmake/Qt6DataVisualizationQml/Qt6DataVisualizationQmlConfig.cmake @@ -188,6 +189,7 @@ lib/cmake/Qt6DataVisualizationQml/Qt6DataVisualizationQmlConfigVersionImpl.cmake lib/cmake/Qt6DataVisualizationQml/Qt6DataVisualizationQmlDependencies.cmake lib/cmake/Qt6DataVisualizationQml/Qt6DataVisualizationQmlTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6DataVisualizationQml/Qt6DataVisualizationQmlTargets.cmake +lib/cmake/Qt6DataVisualizationQml/Qt6DataVisualizationQmlVersionlessAliasTargets.cmake lib/cmake/Qt6DataVisualizationQml/Qt6DataVisualizationQmlVersionlessTargets.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6DataVisualizationQmlpluginAdditionalTargetInfo.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6DataVisualizationQmlpluginConfig.cmake @@ -225,6 +227,7 @@ lib/cmake/Qt6Qml/QmlPlugins/Qt6DataVisualizationQmlpluginTargets.cmake %%QT_QMLDIR%%/QtDataVisualization/libdatavisualizationqmlplugin.so %%QT_QMLDIR%%/QtDataVisualization/plugins.qmltypes %%QT_QMLDIR%%/QtDataVisualization/qmldir +%%QT_SBOMDIR%%/qtdatavisualization-%%FULLVER%%.spdx libdata/pkgconfig/Qt6DataVisualization.pc libdata/pkgconfig/Qt6DataVisualizationQml.pc %%QT_DATADIR%%/modules/DataVisualization.json diff --git a/x11-toolkits/qt6-declarative/Makefile b/x11-toolkits/qt6-declarative/Makefile index 4ad66f201e25..61d1ba6dd042 100644 --- a/x11-toolkits/qt6-declarative/Makefile +++ b/x11-toolkits/qt6-declarative/Makefile @@ -12,7 +12,8 @@ LIB_DEPENDS= libxkbcommon.so:x11/libxkbcommon USES= cmake compiler:c++17-lang gl pkgconfig python \ qt-dist:6 USE_GL= opengl -USE_QT= base languageserver shadertools:build svg +USE_QT= base svg \ + languageserver:build shadertools:build USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} CMAKE_ON= CMAKE_DISABLE_FIND_PACKAGE_LTTngUST diff --git a/x11-toolkits/qt6-declarative/distinfo b/x11-toolkits/qt6-declarative/distinfo index 9bffef6b2bf5..5df65a5f8ca2 100644 --- a/x11-toolkits/qt6-declarative/distinfo +++ b/x11-toolkits/qt6-declarative/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1727500701 -SHA256 (KDE/Qt/6.7.3/qtdeclarative-everywhere-src-6.7.3.tar.xz) = 937b70e441abf5bc4e50d44d26610e2714a28514acf3885cd36116cd610b9875 -SIZE (KDE/Qt/6.7.3/qtdeclarative-everywhere-src-6.7.3.tar.xz) = 35663596 +TIMESTAMP = 1733205760 +SHA256 (KDE/Qt/6.8.1/qtdeclarative-everywhere-src-6.8.1.tar.xz) = 95d15d5c1b6adcedb1df6485219ad13b8dc1bb5168b5151f2f1f7246a4c039fc +SIZE (KDE/Qt/6.8.1/qtdeclarative-everywhere-src-6.8.1.tar.xz) = 36463572 diff --git a/x11-toolkits/qt6-declarative/pkg-plist b/x11-toolkits/qt6-declarative/pkg-plist index a89a57abc80e..366c24fd9550 100644 --- a/x11-toolkits/qt6-declarative/pkg-plist +++ b/x11-toolkits/qt6-declarative/pkg-plist @@ -5,7 +5,6 @@ bin/qmlpreview6 bin/qmlscene6 %%QT_INCDIR%%/QtLabsAnimation/%%FULLVER%%/QtLabsAnimation/private/qqmlanimationglobal_p.h %%QT_INCDIR%%/QtLabsAnimation/%%FULLVER%%/QtLabsAnimation/private/qquickboundaryrule_p.h -%%QT_INCDIR%%/QtLabsAnimation/%%FULLVER%%/QtLabsAnimation/private/qtlabsanimationexports_p.h %%QT_INCDIR%%/QtLabsAnimation/QtLabsAnimation %%QT_INCDIR%%/QtLabsAnimation/QtLabsAnimationDepends %%QT_INCDIR%%/QtLabsAnimation/QtLabsAnimationVersion @@ -15,17 +14,44 @@ bin/qmlscene6 %%QT_INCDIR%%/QtLabsFolderListModel/%%FULLVER%%/QtLabsFolderListModel/private/fileproperty_p.h %%QT_INCDIR%%/QtLabsFolderListModel/%%FULLVER%%/QtLabsFolderListModel/private/qquickfolderlistmodel_p.h %%QT_INCDIR%%/QtLabsFolderListModel/%%FULLVER%%/QtLabsFolderListModel/private/qquickfolderlistmodelglobal_p.h -%%QT_INCDIR%%/QtLabsFolderListModel/%%FULLVER%%/QtLabsFolderListModel/private/qtlabsfolderlistmodelexports_p.h %%QT_INCDIR%%/QtLabsFolderListModel/QtLabsFolderListModel %%QT_INCDIR%%/QtLabsFolderListModel/QtLabsFolderListModelDepends %%QT_INCDIR%%/QtLabsFolderListModel/QtLabsFolderListModelVersion %%QT_INCDIR%%/QtLabsFolderListModel/qtlabsfolderlistmodelexports.h %%QT_INCDIR%%/QtLabsFolderListModel/qtlabsfolderlistmodelversion.h +%%QT_INCDIR%%/QtLabsPlatform/%%FULLVER%%/QtLabsPlatform/private/qquicklabsplatformcolordialog_p.h +%%QT_INCDIR%%/QtLabsPlatform/%%FULLVER%%/QtLabsPlatform/private/qquicklabsplatformdialog_p.h +%%QT_INCDIR%%/QtLabsPlatform/%%FULLVER%%/QtLabsPlatform/private/qquicklabsplatformfiledialog_p.h +%%QT_INCDIR%%/QtLabsPlatform/%%FULLVER%%/QtLabsPlatform/private/qquicklabsplatformfolderdialog_p.h +%%QT_INCDIR%%/QtLabsPlatform/%%FULLVER%%/QtLabsPlatform/private/qquicklabsplatformfontdialog_p.h +%%QT_INCDIR%%/QtLabsPlatform/%%FULLVER%%/QtLabsPlatform/private/qquicklabsplatformicon_p.h +%%QT_INCDIR%%/QtLabsPlatform/%%FULLVER%%/QtLabsPlatform/private/qquicklabsplatformiconloader_p.h +%%QT_INCDIR%%/QtLabsPlatform/%%FULLVER%%/QtLabsPlatform/private/qquicklabsplatformmenu_p.h +%%QT_INCDIR%%/QtLabsPlatform/%%FULLVER%%/QtLabsPlatform/private/qquicklabsplatformmenubar_p.h +%%QT_INCDIR%%/QtLabsPlatform/%%FULLVER%%/QtLabsPlatform/private/qquicklabsplatformmenuitem_p.h +%%QT_INCDIR%%/QtLabsPlatform/%%FULLVER%%/QtLabsPlatform/private/qquicklabsplatformmenuitemgroup_p.h +%%QT_INCDIR%%/QtLabsPlatform/%%FULLVER%%/QtLabsPlatform/private/qquicklabsplatformmenuseparator_p.h +%%QT_INCDIR%%/QtLabsPlatform/%%FULLVER%%/QtLabsPlatform/private/qquicklabsplatformmessagedialog_p.h +%%QT_INCDIR%%/QtLabsPlatform/%%FULLVER%%/QtLabsPlatform/private/qquicklabsplatformstandardpaths_p.h +%%QT_INCDIR%%/QtLabsPlatform/%%FULLVER%%/QtLabsPlatform/private/qquicklabsplatformsystemtrayicon_p.h +%%QT_INCDIR%%/QtLabsPlatform/%%FULLVER%%/QtLabsPlatform/private/qwidgetplatform_p.h +%%QT_INCDIR%%/QtLabsPlatform/%%FULLVER%%/QtLabsPlatform/private/qwidgetplatformcolordialog_p.h +%%QT_INCDIR%%/QtLabsPlatform/%%FULLVER%%/QtLabsPlatform/private/qwidgetplatformdialog_p.h +%%QT_INCDIR%%/QtLabsPlatform/%%FULLVER%%/QtLabsPlatform/private/qwidgetplatformfiledialog_p.h +%%QT_INCDIR%%/QtLabsPlatform/%%FULLVER%%/QtLabsPlatform/private/qwidgetplatformfontdialog_p.h +%%QT_INCDIR%%/QtLabsPlatform/%%FULLVER%%/QtLabsPlatform/private/qwidgetplatformmenu_p.h +%%QT_INCDIR%%/QtLabsPlatform/%%FULLVER%%/QtLabsPlatform/private/qwidgetplatformmenuitem_p.h +%%QT_INCDIR%%/QtLabsPlatform/%%FULLVER%%/QtLabsPlatform/private/qwidgetplatformmessagedialog_p.h +%%QT_INCDIR%%/QtLabsPlatform/%%FULLVER%%/QtLabsPlatform/private/qwidgetplatformsystemtrayicon_p.h +%%QT_INCDIR%%/QtLabsPlatform/QtLabsPlatform +%%QT_INCDIR%%/QtLabsPlatform/QtLabsPlatformDepends +%%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/qqmlmodelsglobal_p.h %%QT_INCDIR%%/QtLabsQmlModels/%%FULLVER%%/QtLabsQmlModels/private/qqmltablemodel_p.h %%QT_INCDIR%%/QtLabsQmlModels/%%FULLVER%%/QtLabsQmlModels/private/qqmltablemodelcolumn_p.h -%%QT_INCDIR%%/QtLabsQmlModels/%%FULLVER%%/QtLabsQmlModels/private/qtlabsqmlmodelsexports_p.h %%QT_INCDIR%%/QtLabsQmlModels/QtLabsQmlModels %%QT_INCDIR%%/QtLabsQmlModels/QtLabsQmlModelsDepends %%QT_INCDIR%%/QtLabsQmlModels/QtLabsQmlModelsVersion @@ -33,7 +59,6 @@ bin/qmlscene6 %%QT_INCDIR%%/QtLabsQmlModels/qtlabsqmlmodelsversion.h %%QT_INCDIR%%/QtLabsSettings/%%FULLVER%%/QtLabsSettings/private/qqmlsettings_p.h %%QT_INCDIR%%/QtLabsSettings/%%FULLVER%%/QtLabsSettings/private/qqmlsettingsglobal_p.h -%%QT_INCDIR%%/QtLabsSettings/%%FULLVER%%/QtLabsSettings/private/qtlabssettingsexports_p.h %%QT_INCDIR%%/QtLabsSettings/QtLabsSettings %%QT_INCDIR%%/QtLabsSettings/QtLabsSettingsDepends %%QT_INCDIR%%/QtLabsSettings/QtLabsSettingsVersion @@ -41,7 +66,6 @@ bin/qmlscene6 %%QT_INCDIR%%/QtLabsSettings/qtlabssettingsversion.h %%QT_INCDIR%%/QtLabsSharedImage/%%FULLVER%%/QtLabsSharedImage/private/qsharedimageloader_p.h %%QT_INCDIR%%/QtLabsSharedImage/%%FULLVER%%/QtLabsSharedImage/private/qsharedimageprovider_p.h -%%QT_INCDIR%%/QtLabsSharedImage/%%FULLVER%%/QtLabsSharedImage/private/qtlabssharedimageexports_p.h %%QT_INCDIR%%/QtLabsSharedImage/%%FULLVER%%/QtLabsSharedImage/private/qtlabssharedimageglobal_p.h %%QT_INCDIR%%/QtLabsSharedImage/QtLabsSharedImage %%QT_INCDIR%%/QtLabsSharedImage/QtLabsSharedImageDepends @@ -49,7 +73,6 @@ bin/qmlscene6 %%QT_INCDIR%%/QtLabsSharedImage/qtlabssharedimageexports.h %%QT_INCDIR%%/QtLabsSharedImage/qtlabssharedimageversion.h %%QT_INCDIR%%/QtLabsWavefrontMesh/%%FULLVER%%/QtLabsWavefrontMesh/private/qqmlwavefrontmeshglobal_p.h -%%QT_INCDIR%%/QtLabsWavefrontMesh/%%FULLVER%%/QtLabsWavefrontMesh/private/qtlabswavefrontmeshexports_p.h %%QT_INCDIR%%/QtLabsWavefrontMesh/%%FULLVER%%/QtLabsWavefrontMesh/private/qwavefrontmesh_p.h %%QT_INCDIR%%/QtLabsWavefrontMesh/QtLabsWavefrontMesh %%QT_INCDIR%%/QtLabsWavefrontMesh/QtLabsWavefrontMeshDepends @@ -88,15 +111,14 @@ bin/qmlscene6 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlabstractprofileradapter_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlanybinding_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlapplicationengine_p.h -%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlbind_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlbinding_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlboundsignal_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlbuiltinfunctions_p.h +%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlbuiltins_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlcomponent_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlcomponentandaliasresolver_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlcomponentattached_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlconfigurabledebugservice_p.h -%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlconnections_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlcontext_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlcontextdata_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlcppbinding_p.h @@ -149,7 +171,7 @@ bin/qmlscene6 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmllist_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmllistwrapper_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmllocale_p.h -%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlloggingcategory_p.h +%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlloggingcategorybase_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlmetaobject_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlmetatype_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlmetatypedata_p.h @@ -184,7 +206,6 @@ bin/qmlscene6 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlstringconverters_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmltcobjectcreationhelper_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlthread_p.h -%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmltimer_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmltranslation_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmltype_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmltype_p_p.h @@ -210,7 +231,6 @@ bin/qmlscene6 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qstringhash_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qtqml-config_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qtqmlcompilerglobal_p.h -%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qtqmlexports_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qtqmlglobal_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4alloca_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4argumentsobject_p.h @@ -281,6 +301,7 @@ bin/qmlscene6 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4property_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4propertykey_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4proxy_p.h +%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4qmetaobjectwrapper_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4qmlcontext_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4qobjectwrapper_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4referenceobject_p.h @@ -356,7 +377,6 @@ bin/qmlscene6 %%QT_INCDIR%%/QtQml/QQmlTypeInfo %%QT_INCDIR%%/QtQml/QQmlTypeNotAvailable %%QT_INCDIR%%/QtQml/QQmlTypesExtensionInterface -%%QT_INCDIR%%/QtQml/QmlTypeAndRevisionsRegistration %%QT_INCDIR%%/QtQml/QtQml %%QT_INCDIR%%/QtQml/QtQmlDepends %%QT_INCDIR%%/QtQml/QtQmlVersion @@ -397,13 +417,11 @@ bin/qmlscene6 %%QT_INCDIR%%/QtQml/qtqmlexports.h %%QT_INCDIR%%/QtQml/qtqmlglobal.h %%QT_INCDIR%%/QtQml/qtqmlversion.h -%%QT_INCDIR%%/QtQmlBuiltins/%%FULLVER%%/QtQmlBuiltins/private/qqmlbuiltins_p.h -%%QT_INCDIR%%/QtQmlBuiltins/%%FULLVER%%/QtQmlBuiltins/private/qtqmlbuiltins-config_p.h -%%QT_INCDIR%%/QtQmlBuiltins/QtQmlBuiltins -%%QT_INCDIR%%/QtQmlBuiltins/QtQmlBuiltinsDepends -%%QT_INCDIR%%/QtQmlBuiltins/QtQmlBuiltinsVersion -%%QT_INCDIR%%/QtQmlBuiltins/qtqmlbuiltins-config.h -%%QT_INCDIR%%/QtQmlBuiltins/qtqmlbuiltinsversion.h +%%QT_INCDIR%%/QtQmlAssetDownloader/%%FULLVER%%/QtQmlAssetDownloader/private/qqmlassetdownloader_p.h +%%QT_INCDIR%%/QtQmlAssetDownloader/QtQmlAssetDownloader +%%QT_INCDIR%%/QtQmlAssetDownloader/QtQmlAssetDownloaderDepends +%%QT_INCDIR%%/QtQmlAssetDownloader/QtQmlAssetDownloaderVersion +%%QT_INCDIR%%/QtQmlAssetDownloader/qtqmlassetdownloaderversion.h %%QT_INCDIR%%/QtQmlCompiler/%%FULLVER%%/QtQmlCompiler/private/qcoloroutput_p.h %%QT_INCDIR%%/QtQmlCompiler/%%FULLVER%%/QtQmlCompiler/private/qdeferredpointer_p.h %%QT_INCDIR%%/QtQmlCompiler/%%FULLVER%%/QtQmlCompiler/private/qqmljsannotation_p.h @@ -411,6 +429,8 @@ bin/qmlscene6 %%QT_INCDIR%%/QtQmlCompiler/%%FULLVER%%/QtQmlCompiler/private/qqmljscodegenerator_p.h %%QT_INCDIR%%/QtQmlCompiler/%%FULLVER%%/QtQmlCompiler/private/qqmljscompilepass_p.h %%QT_INCDIR%%/QtQmlCompiler/%%FULLVER%%/QtQmlCompiler/private/qqmljscompiler_p.h +%%QT_INCDIR%%/QtQmlCompiler/%%FULLVER%%/QtQmlCompiler/private/qqmljscompilerstats_p.h +%%QT_INCDIR%%/QtQmlCompiler/%%FULLVER%%/QtQmlCompiler/private/qqmljscompilerstatsreporter_p.h %%QT_INCDIR%%/QtQmlCompiler/%%FULLVER%%/QtQmlCompiler/private/qqmljscontextualtypes_p.h %%QT_INCDIR%%/QtQmlCompiler/%%FULLVER%%/QtQmlCompiler/private/qqmljsfunctioninitializer_p.h %%QT_INCDIR%%/QtQmlCompiler/%%FULLVER%%/QtQmlCompiler/private/qqmljsimporter_p.h @@ -422,6 +442,7 @@ bin/qmlscene6 %%QT_INCDIR%%/QtQmlCompiler/%%FULLVER%%/QtQmlCompiler/private/qqmljslogger_p.h %%QT_INCDIR%%/QtQmlCompiler/%%FULLVER%%/QtQmlCompiler/private/qqmljsloggingutils_p.h %%QT_INCDIR%%/QtQmlCompiler/%%FULLVER%%/QtQmlCompiler/private/qqmljsmetatypes_p.h +%%QT_INCDIR%%/QtQmlCompiler/%%FULLVER%%/QtQmlCompiler/private/qqmljsoptimizations_p.h %%QT_INCDIR%%/QtQmlCompiler/%%FULLVER%%/QtQmlCompiler/private/qqmljsregistercontent_p.h %%QT_INCDIR%%/QtQmlCompiler/%%FULLVER%%/QtQmlCompiler/private/qqmljsresourcefilemapper_p.h %%QT_INCDIR%%/QtQmlCompiler/%%FULLVER%%/QtQmlCompiler/private/qqmljsscope_p.h @@ -433,10 +454,10 @@ bin/qmlscene6 %%QT_INCDIR%%/QtQmlCompiler/%%FULLVER%%/QtQmlCompiler/private/qqmljstypereader_p.h %%QT_INCDIR%%/QtQmlCompiler/%%FULLVER%%/QtQmlCompiler/private/qqmljstyperesolver_p.h %%QT_INCDIR%%/QtQmlCompiler/%%FULLVER%%/QtQmlCompiler/private/qqmljsutils_p.h +%%QT_INCDIR%%/QtQmlCompiler/%%FULLVER%%/QtQmlCompiler/private/qqmljsvaluetypefromstringcheck_p.h %%QT_INCDIR%%/QtQmlCompiler/%%FULLVER%%/QtQmlCompiler/private/qqmlsa_p.h %%QT_INCDIR%%/QtQmlCompiler/%%FULLVER%%/QtQmlCompiler/private/qqmlsasourcelocation_p.h %%QT_INCDIR%%/QtQmlCompiler/%%FULLVER%%/QtQmlCompiler/private/qresourcerelocater_p.h -%%QT_INCDIR%%/QtQmlCompiler/%%FULLVER%%/QtQmlCompiler/private/qtqmlcompilerexports_p.h %%QT_INCDIR%%/QtQmlCompiler/QtQmlCompiler %%QT_INCDIR%%/QtQmlCompiler/QtQmlCompilerDepends %%QT_INCDIR%%/QtQmlCompiler/QtQmlCompilerVersion @@ -451,7 +472,6 @@ bin/qmlscene6 %%QT_INCDIR%%/QtQmlCore/%%FULLVER%%/QtQmlCore/private/qqmlsettings_p.h %%QT_INCDIR%%/QtQmlCore/%%FULLVER%%/QtQmlCore/private/qqmlstandardpaths_p.h %%QT_INCDIR%%/QtQmlCore/%%FULLVER%%/QtQmlCore/private/qqmlsysteminformation_p.h -%%QT_INCDIR%%/QtQmlCore/%%FULLVER%%/QtQmlCore/private/qtqmlcoreexports_p.h %%QT_INCDIR%%/QtQmlCore/QtQmlCore %%QT_INCDIR%%/QtQmlCore/QtQmlCoreDepends %%QT_INCDIR%%/QtQmlCore/QtQmlCoreVersion @@ -522,6 +542,7 @@ bin/qmlscene6 %%QT_INCDIR%%/QtQmlIntegration/QtQmlIntegrationVersion %%QT_INCDIR%%/QtQmlIntegration/qqmlintegration.h %%QT_INCDIR%%/QtQmlIntegration/qtqmlintegrationversion.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 %%QT_INCDIR%%/QtQmlLS/%%FULLVER%%/QtQmlLS/private/qqmlbasemodule_p.h @@ -532,11 +553,19 @@ bin/qmlscene6 %%QT_INCDIR%%/QtQmlLS/%%FULLVER%%/QtQmlLS/private/qqmlformatting_p.h %%QT_INCDIR%%/QtQmlLS/%%FULLVER%%/QtQmlLS/private/qqmlgotodefinitionsupport_p.h %%QT_INCDIR%%/QtQmlLS/%%FULLVER%%/QtQmlLS/private/qqmlgototypedefinitionsupport_p.h +%%QT_INCDIR%%/QtQmlLS/%%FULLVER%%/QtQmlLS/private/qqmlhighlightsupport_p.h +%%QT_INCDIR%%/QtQmlLS/%%FULLVER%%/QtQmlLS/private/qqmlhover_p.h %%QT_INCDIR%%/QtQmlLS/%%FULLVER%%/QtQmlLS/private/qqmllanguageserver_p.h %%QT_INCDIR%%/QtQmlLS/%%FULLVER%%/QtQmlLS/private/qqmllintsuggestions_p.h +%%QT_INCDIR%%/QtQmlLS/%%FULLVER%%/QtQmlLS/private/qqmllscompletion_p.h +%%QT_INCDIR%%/QtQmlLS/%%FULLVER%%/QtQmlLS/private/qqmllscompletionplugin_p.h +%%QT_INCDIR%%/QtQmlLS/%%FULLVER%%/QtQmlLS/private/qqmllshelpplugininterface_p.h +%%QT_INCDIR%%/QtQmlLS/%%FULLVER%%/QtQmlLS/private/qqmllshelputils_p.h +%%QT_INCDIR%%/QtQmlLS/%%FULLVER%%/QtQmlLS/private/qqmllsplugin_p.h %%QT_INCDIR%%/QtQmlLS/%%FULLVER%%/QtQmlLS/private/qqmllsutils_p.h %%QT_INCDIR%%/QtQmlLS/%%FULLVER%%/QtQmlLS/private/qqmlrangeformatting_p.h %%QT_INCDIR%%/QtQmlLS/%%FULLVER%%/QtQmlLS/private/qqmlrenamesymbolsupport_p.h +%%QT_INCDIR%%/QtQmlLS/%%FULLVER%%/QtQmlLS/private/qqmlsemantictokens_p.h %%QT_INCDIR%%/QtQmlLS/%%FULLVER%%/QtQmlLS/private/qtextblock_p.h %%QT_INCDIR%%/QtQmlLS/%%FULLVER%%/QtQmlLS/private/qtextcursor_p.h %%QT_INCDIR%%/QtQmlLS/%%FULLVER%%/QtQmlLS/private/qtextdocument_p.h @@ -548,12 +577,22 @@ bin/qmlscene6 %%QT_INCDIR%%/QtQmlLS/qtqmllsversion.h %%QT_INCDIR%%/QtQmlLocalStorage/%%FULLVER%%/QtQmlLocalStorage/private/qqmllocalstorage_p.h %%QT_INCDIR%%/QtQmlLocalStorage/%%FULLVER%%/QtQmlLocalStorage/private/qqmllocalstorageglobal_p.h -%%QT_INCDIR%%/QtQmlLocalStorage/%%FULLVER%%/QtQmlLocalStorage/private/qtqmllocalstorageexports_p.h %%QT_INCDIR%%/QtQmlLocalStorage/QtQmlLocalStorage %%QT_INCDIR%%/QtQmlLocalStorage/QtQmlLocalStorageDepends %%QT_INCDIR%%/QtQmlLocalStorage/QtQmlLocalStorageVersion %%QT_INCDIR%%/QtQmlLocalStorage/qtqmllocalstorageexports.h %%QT_INCDIR%%/QtQmlLocalStorage/qtqmllocalstorageversion.h +%%QT_INCDIR%%/QtQmlMeta/%%FULLVER%%/QtQmlMeta/private/qqmlbind_p.h +%%QT_INCDIR%%/QtQmlMeta/%%FULLVER%%/QtQmlMeta/private/qqmlconnections_p.h +%%QT_INCDIR%%/QtQmlMeta/%%FULLVER%%/QtQmlMeta/private/qqmllocaleenums_p.h +%%QT_INCDIR%%/QtQmlMeta/%%FULLVER%%/QtQmlMeta/private/qqmlloggingcategory_p.h +%%QT_INCDIR%%/QtQmlMeta/%%FULLVER%%/QtQmlMeta/private/qqmlmetadependencies_p.h +%%QT_INCDIR%%/QtQmlMeta/%%FULLVER%%/QtQmlMeta/private/qqmltimer_p.h +%%QT_INCDIR%%/QtQmlMeta/QtQmlMeta +%%QT_INCDIR%%/QtQmlMeta/QtQmlMetaDepends +%%QT_INCDIR%%/QtQmlMeta/QtQmlMetaVersion +%%QT_INCDIR%%/QtQmlMeta/qtqmlmetaexports.h +%%QT_INCDIR%%/QtQmlMeta/qtqmlmetaversion.h %%QT_INCDIR%%/QtQmlModels/%%FULLVER%%/QtQmlModels/private/qqmlabstractdelegatecomponent_p.h %%QT_INCDIR%%/QtQmlModels/%%FULLVER%%/QtQmlModels/private/qqmladaptormodel_p.h %%QT_INCDIR%%/QtQmlModels/%%FULLVER%%/QtQmlModels/private/qqmladaptormodelenginedata_p.h @@ -577,7 +616,6 @@ bin/qmlscene6 %%QT_INCDIR%%/QtQmlModels/%%FULLVER%%/QtQmlModels/private/qqmltreemodeltotablemodel_p_p.h %%QT_INCDIR%%/QtQmlModels/%%FULLVER%%/QtQmlModels/private/qquickpackage_p.h %%QT_INCDIR%%/QtQmlModels/%%FULLVER%%/QtQmlModels/private/qtqmlmodels-config_p.h -%%QT_INCDIR%%/QtQmlModels/%%FULLVER%%/QtQmlModels/private/qtqmlmodelsexports_p.h %%QT_INCDIR%%/QtQmlModels/%%FULLVER%%/QtQmlModels/private/qtqmlmodelsglobal_p.h %%QT_INCDIR%%/QtQmlModels/QtQmlModels %%QT_INCDIR%%/QtQmlModels/QtQmlModelsDepends @@ -591,13 +629,13 @@ bin/qmlscene6 %%QT_INCDIR%%/QtQmlNetwork/%%FULLVER%%/QtQmlNetwork/private/qqmlsslkey_p.h %%QT_INCDIR%%/QtQmlNetwork/%%FULLVER%%/QtQmlNetwork/private/qqmlsslnamespace_p.h %%QT_INCDIR%%/QtQmlNetwork/%%FULLVER%%/QtQmlNetwork/private/qqmlsslsocketnamespace_p.h -%%QT_INCDIR%%/QtQmlNetwork/%%FULLVER%%/QtQmlNetwork/private/qtqmlnetworkexports_p.h %%QT_INCDIR%%/QtQmlNetwork/QtQmlNetwork %%QT_INCDIR%%/QtQmlNetwork/QtQmlNetworkDepends %%QT_INCDIR%%/QtQmlNetwork/QtQmlNetworkVersion %%QT_INCDIR%%/QtQmlNetwork/qtqmlnetworkexports.h %%QT_INCDIR%%/QtQmlNetwork/qtqmlnetworkversion.h %%QT_INCDIR%%/QtQmlToolingSettings/%%FULLVER%%/QtQmlToolingSettings/private/qqmltoolingsettings_p.h +%%QT_INCDIR%%/QtQmlToolingSettings/%%FULLVER%%/QtQmlToolingSettings/private/qqmltoolingutils_p.h %%QT_INCDIR%%/QtQmlToolingSettings/QtQmlToolingSettings %%QT_INCDIR%%/QtQmlToolingSettings/QtQmlToolingSettingsDepends %%QT_INCDIR%%/QtQmlToolingSettings/QtQmlToolingSettingsVersion @@ -615,7 +653,6 @@ bin/qmlscene6 %%QT_INCDIR%%/QtQmlTypeRegistrar/QtQmlTypeRegistrarVersion %%QT_INCDIR%%/QtQmlTypeRegistrar/qtqmltyperegistrarversion.h %%QT_INCDIR%%/QtQmlWorkerScript/%%FULLVER%%/QtQmlWorkerScript/private/qquickworkerscript_p.h -%%QT_INCDIR%%/QtQmlWorkerScript/%%FULLVER%%/QtQmlWorkerScript/private/qtqmlworkerscriptexports_p.h %%QT_INCDIR%%/QtQmlWorkerScript/%%FULLVER%%/QtQmlWorkerScript/private/qtqmlworkerscriptglobal_p.h %%QT_INCDIR%%/QtQmlWorkerScript/%%FULLVER%%/QtQmlWorkerScript/private/qv4serialize_p.h %%QT_INCDIR%%/QtQmlWorkerScript/QtQmlWorkerScript @@ -625,7 +662,6 @@ bin/qmlscene6 %%QT_INCDIR%%/QtQmlWorkerScript/qtqmlworkerscriptglobal.h %%QT_INCDIR%%/QtQmlWorkerScript/qtqmlworkerscriptversion.h %%QT_INCDIR%%/QtQmlXmlListModel/%%FULLVER%%/QtQmlXmlListModel/private/qqmlxmllistmodel_p.h -%%QT_INCDIR%%/QtQmlXmlListModel/%%FULLVER%%/QtQmlXmlListModel/private/qtqmlxmllistmodelexports_p.h %%QT_INCDIR%%/QtQmlXmlListModel/%%FULLVER%%/QtQmlXmlListModel/private/qtqmlxmllistmodelglobal_p.h %%QT_INCDIR%%/QtQmlXmlListModel/QtQmlXmlListModel %%QT_INCDIR%%/QtQmlXmlListModel/QtQmlXmlListModelDepends @@ -634,7 +670,6 @@ bin/qmlscene6 %%QT_INCDIR%%/QtQmlXmlListModel/qtqmlxmllistmodelversion.h %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qaccessiblequickitem_p.h %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qaccessiblequickview_p.h -%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qminimalflatset_p.h %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qqmldesignermetaobject_p.h %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquadpath_p.h %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickabstractpaletteprovider_p.h @@ -882,8 +917,8 @@ bin/qmlscene6 %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgtexturematerial_p.h %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgtexturereader_p.h %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgthreadedrenderloop_p.h +%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgtransform_p.h %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qtquick-config_p.h -%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qtquickexports_p.h %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qtquickglobal_p.h %%QT_INCDIR%%/QtQuick/QQuickAsyncImageProvider %%QT_INCDIR%%/QtQuick/QQuickFramebufferObject @@ -986,6 +1021,7 @@ bin/qmlscene6 %%QT_INCDIR%%/QtQuickControls2/qtquickcontrols2version.h %%QT_INCDIR%%/QtQuickControls2Basic/%%FULLVER%%/QtQuickControls2Basic/private/qquickbasicstyle_p.h %%QT_INCDIR%%/QtQuickControls2Basic/%%FULLVER%%/QtQuickControls2Basic/private/qquickbasictheme_p.h +%%QT_INCDIR%%/QtQuickControls2Basic/%%FULLVER%%/QtQuickControls2Basic/private/qtquickcontrols2basicforeign_p.h %%QT_INCDIR%%/QtQuickControls2Basic/QtQuickControls2Basic %%QT_INCDIR%%/QtQuickControls2Basic/QtQuickControls2BasicDepends %%QT_INCDIR%%/QtQuickControls2Basic/QtQuickControls2BasicVersion @@ -997,7 +1033,14 @@ bin/qmlscene6 %%QT_INCDIR%%/QtQuickControls2BasicStyleImpl/QtQuickControls2BasicStyleImpl %%QT_INCDIR%%/QtQuickControls2BasicStyleImpl/QtQuickControls2BasicStyleImplDepends %%QT_INCDIR%%/QtQuickControls2BasicStyleImpl/QtQuickControls2BasicStyleImplVersion +%%QT_INCDIR%%/QtQuickControls2BasicStyleImpl/qtquickcontrols2basicstyleimplexports.h %%QT_INCDIR%%/QtQuickControls2BasicStyleImpl/qtquickcontrols2basicstyleimplversion.h +%%QT_INCDIR%%/QtQuickControls2FluentWinUI3StyleImpl/%%FULLVER%%/QtQuickControls2FluentWinUI3StyleImpl/private/qquickfluentwinui3focusstroke_p.h +%%QT_INCDIR%%/QtQuickControls2FluentWinUI3StyleImpl/QtQuickControls2FluentWinUI3StyleImpl +%%QT_INCDIR%%/QtQuickControls2FluentWinUI3StyleImpl/QtQuickControls2FluentWinUI3StyleImplDepends +%%QT_INCDIR%%/QtQuickControls2FluentWinUI3StyleImpl/QtQuickControls2FluentWinUI3StyleImplVersion +%%QT_INCDIR%%/QtQuickControls2FluentWinUI3StyleImpl/qtquickcontrols2fluentwinui3styleimplexports.h +%%QT_INCDIR%%/QtQuickControls2FluentWinUI3StyleImpl/qtquickcontrols2fluentwinui3styleimplversion.h %%QT_INCDIR%%/QtQuickControls2Fusion/%%FULLVER%%/QtQuickControls2Fusion/private/qquickfusionstyle_p.h %%QT_INCDIR%%/QtQuickControls2Fusion/%%FULLVER%%/QtQuickControls2Fusion/private/qquickfusiontheme_p.h %%QT_INCDIR%%/QtQuickControls2Fusion/QtQuickControls2Fusion @@ -1011,6 +1054,7 @@ bin/qmlscene6 %%QT_INCDIR%%/QtQuickControls2FusionStyleImpl/QtQuickControls2FusionStyleImpl %%QT_INCDIR%%/QtQuickControls2FusionStyleImpl/QtQuickControls2FusionStyleImplDepends %%QT_INCDIR%%/QtQuickControls2FusionStyleImpl/QtQuickControls2FusionStyleImplVersion +%%QT_INCDIR%%/QtQuickControls2FusionStyleImpl/qtquickcontrols2fusionstyleimplexports.h %%QT_INCDIR%%/QtQuickControls2FusionStyleImpl/qtquickcontrols2fusionstyleimplversion.h %%QT_INCDIR%%/QtQuickControls2Imagine/%%FULLVER%%/QtQuickControls2Imagine/private/qquickimaginestyle_p.h %%QT_INCDIR%%/QtQuickControls2Imagine/%%FULLVER%%/QtQuickControls2Imagine/private/qquickimaginetheme_p.h @@ -1019,7 +1063,11 @@ bin/qmlscene6 %%QT_INCDIR%%/QtQuickControls2Imagine/QtQuickControls2ImagineVersion %%QT_INCDIR%%/QtQuickControls2Imagine/qtquickcontrols2imagineexports.h %%QT_INCDIR%%/QtQuickControls2Imagine/qtquickcontrols2imagineversion.h +%%QT_INCDIR%%/QtQuickControls2ImagineStyleImpl/QtQuickControls2ImagineStyleImpl %%QT_INCDIR%%/QtQuickControls2ImagineStyleImpl/QtQuickControls2ImagineStyleImplDepends +%%QT_INCDIR%%/QtQuickControls2ImagineStyleImpl/QtQuickControls2ImagineStyleImplVersion +%%QT_INCDIR%%/QtQuickControls2ImagineStyleImpl/qtquickcontrols2imaginestyleimplexports.h +%%QT_INCDIR%%/QtQuickControls2ImagineStyleImpl/qtquickcontrols2imaginestyleimplversion.h %%QT_INCDIR%%/QtQuickControls2Impl/%%FULLVER%%/QtQuickControls2Impl/private/qquickanimatednode_p.h %%QT_INCDIR%%/QtQuickControls2Impl/%%FULLVER%%/QtQuickControls2Impl/private/qquickchecklabel_p.h %%QT_INCDIR%%/QtQuickControls2Impl/%%FULLVER%%/QtQuickControls2Impl/private/qquickclippedtext_p.h @@ -1037,8 +1085,6 @@ bin/qmlscene6 %%QT_INCDIR%%/QtQuickControls2Impl/%%FULLVER%%/QtQuickControls2Impl/private/qquickplaceholdertext_p.h %%QT_INCDIR%%/QtQuickControls2Impl/%%FULLVER%%/QtQuickControls2Impl/private/qquickplatformtheme_p.h %%QT_INCDIR%%/QtQuickControls2Impl/%%FULLVER%%/QtQuickControls2Impl/private/qquicktumblerview_p.h -%%QT_INCDIR%%/QtQuickControls2Impl/%%FULLVER%%/QtQuickControls2Impl/private/qtquickcontrols2foreign_p.h -%%QT_INCDIR%%/QtQuickControls2Impl/%%FULLVER%%/QtQuickControls2Impl/private/qtquickcontrols2implexports_p.h %%QT_INCDIR%%/QtQuickControls2Impl/%%FULLVER%%/QtQuickControls2Impl/private/qtquickcontrols2implglobal_p.h %%QT_INCDIR%%/QtQuickControls2Impl/QtQuickControls2Impl %%QT_INCDIR%%/QtQuickControls2Impl/QtQuickControls2ImplDepends @@ -1060,6 +1106,7 @@ bin/qmlscene6 %%QT_INCDIR%%/QtQuickControls2MaterialStyleImpl/QtQuickControls2MaterialStyleImpl %%QT_INCDIR%%/QtQuickControls2MaterialStyleImpl/QtQuickControls2MaterialStyleImplDepends %%QT_INCDIR%%/QtQuickControls2MaterialStyleImpl/QtQuickControls2MaterialStyleImplVersion +%%QT_INCDIR%%/QtQuickControls2MaterialStyleImpl/qtquickcontrols2materialstyleimplexports.h %%QT_INCDIR%%/QtQuickControls2MaterialStyleImpl/qtquickcontrols2materialstyleimplversion.h %%QT_INCDIR%%/QtQuickControls2Universal/%%FULLVER%%/QtQuickControls2Universal/private/qquickuniversalstyle_p.h %%QT_INCDIR%%/QtQuickControls2Universal/%%FULLVER%%/QtQuickControls2Universal/private/qquickuniversaltheme_p.h @@ -1074,6 +1121,7 @@ bin/qmlscene6 %%QT_INCDIR%%/QtQuickControls2UniversalStyleImpl/QtQuickControls2UniversalStyleImpl %%QT_INCDIR%%/QtQuickControls2UniversalStyleImpl/QtQuickControls2UniversalStyleImplDepends %%QT_INCDIR%%/QtQuickControls2UniversalStyleImpl/QtQuickControls2UniversalStyleImplVersion +%%QT_INCDIR%%/QtQuickControls2UniversalStyleImpl/qtquickcontrols2universalstyleimplexports.h %%QT_INCDIR%%/QtQuickControls2UniversalStyleImpl/qtquickcontrols2universalstyleimplversion.h %%QT_INCDIR%%/QtQuickControlsTestUtils/%%FULLVER%%/QtQuickControlsTestUtils/private/controlstestutils_p.h %%QT_INCDIR%%/QtQuickControlsTestUtils/%%FULLVER%%/QtQuickControlsTestUtils/private/dialogstestutils_p.h @@ -1088,7 +1136,6 @@ bin/qmlscene6 %%QT_INCDIR%%/QtQuickDialogs2/%%FULLVER%%/QtQuickDialogs2/private/qquickfolderdialog_p.h %%QT_INCDIR%%/QtQuickDialogs2/%%FULLVER%%/QtQuickDialogs2/private/qquickfontdialog_p.h %%QT_INCDIR%%/QtQuickDialogs2/%%FULLVER%%/QtQuickDialogs2/private/qquickmessagedialog_p.h -%%QT_INCDIR%%/QtQuickDialogs2/%%FULLVER%%/QtQuickDialogs2/private/qtquickdialogs2exports_p.h %%QT_INCDIR%%/QtQuickDialogs2/%%FULLVER%%/QtQuickDialogs2/private/qtquickdialogs2foreign_p.h %%QT_INCDIR%%/QtQuickDialogs2/%%FULLVER%%/QtQuickDialogs2/private/qtquickdialogs2global_p.h %%QT_INCDIR%%/QtQuickDialogs2/QtQuickDialogs2 @@ -1120,7 +1167,6 @@ 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/qtquickdialogs2quickimplexports_p.h %%QT_INCDIR%%/QtQuickDialogs2QuickImpl/%%FULLVER%%/QtQuickDialogs2QuickImpl/private/qtquickdialogs2quickimplforeign_p.h %%QT_INCDIR%%/QtQuickDialogs2QuickImpl/%%FULLVER%%/QtQuickDialogs2QuickImpl/private/qtquickdialogs2quickimplglobal_p.h %%QT_INCDIR%%/QtQuickDialogs2QuickImpl/QtQuickDialogs2QuickImpl @@ -1130,7 +1176,6 @@ bin/qmlscene6 %%QT_INCDIR%%/QtQuickDialogs2QuickImpl/qtquickdialogs2quickimplversion.h %%QT_INCDIR%%/QtQuickDialogs2Utils/%%FULLVER%%/QtQuickDialogs2Utils/private/qquickdialogtype_p.h %%QT_INCDIR%%/QtQuickDialogs2Utils/%%FULLVER%%/QtQuickDialogs2Utils/private/qquickfilenamefilter_p.h -%%QT_INCDIR%%/QtQuickDialogs2Utils/%%FULLVER%%/QtQuickDialogs2Utils/private/qtquickdialogs2utilsexports_p.h %%QT_INCDIR%%/QtQuickDialogs2Utils/%%FULLVER%%/QtQuickDialogs2Utils/private/qtquickdialogs2utilsglobal_p.h %%QT_INCDIR%%/QtQuickDialogs2Utils/QtQuickDialogs2Utils %%QT_INCDIR%%/QtQuickDialogs2Utils/QtQuickDialogs2UtilsDepends @@ -1140,7 +1185,6 @@ 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/qtquickeffectsexports_p.h %%QT_INCDIR%%/QtQuickEffects/%%FULLVER%%/QtQuickEffects/private/qtquickeffectsglobal_p.h %%QT_INCDIR%%/QtQuickEffects/QtQuickEffects %%QT_INCDIR%%/QtQuickEffects/QtQuickEffectsDepends @@ -1154,7 +1198,6 @@ bin/qmlscene6 %%QT_INCDIR%%/QtQuickLayouts/%%FULLVER%%/QtQuickLayouts/private/qquicklayoutstyleinfo_p.h %%QT_INCDIR%%/QtQuickLayouts/%%FULLVER%%/QtQuickLayouts/private/qquicklinearlayout_p.h %%QT_INCDIR%%/QtQuickLayouts/%%FULLVER%%/QtQuickLayouts/private/qquickstacklayout_p.h -%%QT_INCDIR%%/QtQuickLayouts/%%FULLVER%%/QtQuickLayouts/private/qtquicklayoutsexports_p.h %%QT_INCDIR%%/QtQuickLayouts/QtQuickLayouts %%QT_INCDIR%%/QtQuickLayouts/QtQuickLayoutsDepends %%QT_INCDIR%%/QtQuickLayouts/QtQuickLayoutsVersion @@ -1188,7 +1231,6 @@ bin/qmlscene6 %%QT_INCDIR%%/QtQuickParticles/%%FULLVER%%/QtQuickParticles/private/qquickturbulence_p.h %%QT_INCDIR%%/QtQuickParticles/%%FULLVER%%/QtQuickParticles/private/qquickv4particledata_p.h %%QT_INCDIR%%/QtQuickParticles/%%FULLVER%%/QtQuickParticles/private/qquickwander_p.h -%%QT_INCDIR%%/QtQuickParticles/%%FULLVER%%/QtQuickParticles/private/qtquickparticlesexports_p.h %%QT_INCDIR%%/QtQuickParticles/%%FULLVER%%/QtQuickParticles/private/qtquickparticlesglobal_p.h %%QT_INCDIR%%/QtQuickParticles/QtQuickParticles %%QT_INCDIR%%/QtQuickParticles/QtQuickParticlesDepends @@ -1202,7 +1244,6 @@ bin/qmlscene6 %%QT_INCDIR%%/QtQuickShapes/%%FULLVER%%/QtQuickShapes/private/qquickshapegenericrenderer_p.h %%QT_INCDIR%%/QtQuickShapes/%%FULLVER%%/QtQuickShapes/private/qquickshapesglobal_p.h %%QT_INCDIR%%/QtQuickShapes/%%FULLVER%%/QtQuickShapes/private/qquickshapesoftwarerenderer_p.h -%%QT_INCDIR%%/QtQuickShapes/%%FULLVER%%/QtQuickShapes/private/qtquickshapesexports_p.h %%QT_INCDIR%%/QtQuickShapes/QtQuickShapes %%QT_INCDIR%%/QtQuickShapes/QtQuickShapesDepends %%QT_INCDIR%%/QtQuickShapes/QtQuickShapesVersion @@ -1263,6 +1304,9 @@ bin/qmlscene6 %%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquickmenuseparator_p.h %%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquickmonthgrid_p.h %%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquickmonthmodel_p.h +%%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquicknativeicon_p.h +%%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquicknativeiconloader_p.h +%%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquicknativemenuitem_p.h %%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquickoverlay_p.h %%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquickoverlay_p_p.h %%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquickpage_p.h @@ -1276,6 +1320,7 @@ bin/qmlscene6 %%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquickpopupanchors_p_p.h %%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquickpopupitem_p_p.h %%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquickpopuppositioner_p_p.h +%%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquickpopupwindow_p_p.h %%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquickpresshandler_p_p.h %%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquickprogressbar_p.h %%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquickradiobutton_p.h @@ -1321,7 +1366,6 @@ bin/qmlscene6 %%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquickweeknumbercolumn_p.h %%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquickweeknumbermodel_p.h %%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qtquicktemplates2-config_p.h -%%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qtquicktemplates2exports_p.h %%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qtquicktemplates2global_p.h %%QT_INCDIR%%/QtQuickTemplates2/QtQuickTemplates2 %%QT_INCDIR%%/QtQuickTemplates2/QtQuickTemplates2Depends @@ -1338,6 +1382,7 @@ bin/qmlscene6 %%QT_INCDIR%%/QtQuickTest/QtQuickTest %%QT_INCDIR%%/QtQuickTest/QtQuickTestDepends %%QT_INCDIR%%/QtQuickTest/QtQuickTestVersion +%%QT_INCDIR%%/QtQuickTest/qtquicktestexports.h %%QT_INCDIR%%/QtQuickTest/qtquicktestversion.h %%QT_INCDIR%%/QtQuickTest/quicktest.h %%QT_INCDIR%%/QtQuickTest/quicktestglobal.h @@ -1352,6 +1397,25 @@ bin/qmlscene6 %%QT_INCDIR%%/QtQuickTestUtils/QtQuickTestUtilsDepends %%QT_INCDIR%%/QtQuickTestUtils/QtQuickTestUtilsVersion %%QT_INCDIR%%/QtQuickTestUtils/qtquicktestutilsversion.h +%%QT_INCDIR%%/QtQuickVectorImage/%%FULLVER%%/QtQuickVectorImage/private/qquickvectorimage_p.h +%%QT_INCDIR%%/QtQuickVectorImage/%%FULLVER%%/QtQuickVectorImage/private/qquickvectorimage_p_p.h +%%QT_INCDIR%%/QtQuickVectorImage/QtQuickVectorImage +%%QT_INCDIR%%/QtQuickVectorImage/QtQuickVectorImageDepends +%%QT_INCDIR%%/QtQuickVectorImage/QtQuickVectorImageVersion +%%QT_INCDIR%%/QtQuickVectorImage/qtquickvectorimageexports.h +%%QT_INCDIR%%/QtQuickVectorImage/qtquickvectorimageversion.h +%%QT_INCDIR%%/QtQuickVectorImageGenerator/%%FULLVER%%/QtQuickVectorImageGenerator/private/qquickgenerator_p.h +%%QT_INCDIR%%/QtQuickVectorImageGenerator/%%FULLVER%%/QtQuickVectorImageGenerator/private/qquickitemgenerator_p.h +%%QT_INCDIR%%/QtQuickVectorImageGenerator/%%FULLVER%%/QtQuickVectorImageGenerator/private/qquicknodeinfo_p.h +%%QT_INCDIR%%/QtQuickVectorImageGenerator/%%FULLVER%%/QtQuickVectorImageGenerator/private/qquickqmlgenerator_p.h +%%QT_INCDIR%%/QtQuickVectorImageGenerator/%%FULLVER%%/QtQuickVectorImageGenerator/private/qquickvectorimageglobal_p.h +%%QT_INCDIR%%/QtQuickVectorImageGenerator/%%FULLVER%%/QtQuickVectorImageGenerator/private/qsvgvisitorimpl_p.h +%%QT_INCDIR%%/QtQuickVectorImageGenerator/%%FULLVER%%/QtQuickVectorImageGenerator/private/utils_p.h +%%QT_INCDIR%%/QtQuickVectorImageGenerator/QtQuickVectorImageGenerator +%%QT_INCDIR%%/QtQuickVectorImageGenerator/QtQuickVectorImageGeneratorDepends +%%QT_INCDIR%%/QtQuickVectorImageGenerator/QtQuickVectorImageGeneratorVersion +%%QT_INCDIR%%/QtQuickVectorImageGenerator/qtquickvectorimagegeneratorexports.h +%%QT_INCDIR%%/QtQuickVectorImageGenerator/qtquickvectorimagegeneratorversion.h %%QT_INCDIR%%/QtQuickWidgets/%%FULLVER%%/QtQuickWidgets/private/qaccessiblequickwidget_p.h %%QT_INCDIR%%/QtQuickWidgets/%%FULLVER%%/QtQuickWidgets/private/qaccessiblequickwidgetfactory_p.h %%QT_INCDIR%%/QtQuickWidgets/%%FULLVER%%/QtQuickWidgets/private/qquickwidget_p.h @@ -1371,6 +1435,7 @@ lib/cmake/Qt6LabsAnimation/Qt6LabsAnimationConfigVersionImpl.cmake lib/cmake/Qt6LabsAnimation/Qt6LabsAnimationDependencies.cmake 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/Qt6LabsFolderListModel/Qt6LabsFolderListModelAdditionalTargetInfo.cmake lib/cmake/Qt6LabsFolderListModel/Qt6LabsFolderListModelConfig.cmake @@ -1379,7 +1444,17 @@ lib/cmake/Qt6LabsFolderListModel/Qt6LabsFolderListModelConfigVersionImpl.cmake lib/cmake/Qt6LabsFolderListModel/Qt6LabsFolderListModelDependencies.cmake lib/cmake/Qt6LabsFolderListModel/Qt6LabsFolderListModelTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6LabsFolderListModel/Qt6LabsFolderListModelTargets.cmake +lib/cmake/Qt6LabsFolderListModel/Qt6LabsFolderListModelVersionlessAliasTargets.cmake lib/cmake/Qt6LabsFolderListModel/Qt6LabsFolderListModelVersionlessTargets.cmake +lib/cmake/Qt6LabsPlatform/Qt6LabsPlatformAdditionalTargetInfo.cmake +lib/cmake/Qt6LabsPlatform/Qt6LabsPlatformConfig.cmake +lib/cmake/Qt6LabsPlatform/Qt6LabsPlatformConfigVersion.cmake +lib/cmake/Qt6LabsPlatform/Qt6LabsPlatformConfigVersionImpl.cmake +lib/cmake/Qt6LabsPlatform/Qt6LabsPlatformDependencies.cmake +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/Qt6LabsQmlModels/Qt6LabsQmlModelsAdditionalTargetInfo.cmake lib/cmake/Qt6LabsQmlModels/Qt6LabsQmlModelsConfig.cmake lib/cmake/Qt6LabsQmlModels/Qt6LabsQmlModelsConfigVersion.cmake @@ -1387,6 +1462,7 @@ lib/cmake/Qt6LabsQmlModels/Qt6LabsQmlModelsConfigVersionImpl.cmake lib/cmake/Qt6LabsQmlModels/Qt6LabsQmlModelsDependencies.cmake 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/Qt6LabsSettings/Qt6LabsSettingsAdditionalTargetInfo.cmake lib/cmake/Qt6LabsSettings/Qt6LabsSettingsConfig.cmake @@ -1395,6 +1471,7 @@ lib/cmake/Qt6LabsSettings/Qt6LabsSettingsConfigVersionImpl.cmake lib/cmake/Qt6LabsSettings/Qt6LabsSettingsDependencies.cmake 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/Qt6LabsSharedImage/Qt6LabsSharedImageAdditionalTargetInfo.cmake lib/cmake/Qt6LabsSharedImage/Qt6LabsSharedImageConfig.cmake @@ -1403,6 +1480,7 @@ lib/cmake/Qt6LabsSharedImage/Qt6LabsSharedImageConfigVersionImpl.cmake lib/cmake/Qt6LabsSharedImage/Qt6LabsSharedImageDependencies.cmake lib/cmake/Qt6LabsSharedImage/Qt6LabsSharedImageTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6LabsSharedImage/Qt6LabsSharedImageTargets.cmake +lib/cmake/Qt6LabsSharedImage/Qt6LabsSharedImageVersionlessAliasTargets.cmake lib/cmake/Qt6LabsSharedImage/Qt6LabsSharedImageVersionlessTargets.cmake lib/cmake/Qt6LabsWavefrontMesh/Qt6LabsWavefrontMeshAdditionalTargetInfo.cmake lib/cmake/Qt6LabsWavefrontMesh/Qt6LabsWavefrontMeshConfig.cmake @@ -1411,6 +1489,7 @@ lib/cmake/Qt6LabsWavefrontMesh/Qt6LabsWavefrontMeshConfigVersionImpl.cmake lib/cmake/Qt6LabsWavefrontMesh/Qt6LabsWavefrontMeshDependencies.cmake lib/cmake/Qt6LabsWavefrontMesh/Qt6LabsWavefrontMeshTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6LabsWavefrontMesh/Qt6LabsWavefrontMeshTargets.cmake +lib/cmake/Qt6LabsWavefrontMesh/Qt6LabsWavefrontMeshVersionlessAliasTargets.cmake lib/cmake/Qt6LabsWavefrontMesh/Qt6LabsWavefrontMeshVersionlessTargets.cmake lib/cmake/Qt6PacketProtocolPrivate/Qt6PacketProtocolPrivateAdditionalTargetInfo.cmake lib/cmake/Qt6PacketProtocolPrivate/Qt6PacketProtocolPrivateConfig.cmake @@ -1419,13 +1498,21 @@ lib/cmake/Qt6PacketProtocolPrivate/Qt6PacketProtocolPrivateConfigVersionImpl.cma lib/cmake/Qt6PacketProtocolPrivate/Qt6PacketProtocolPrivateDependencies.cmake lib/cmake/Qt6PacketProtocolPrivate/Qt6PacketProtocolPrivateTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6PacketProtocolPrivate/Qt6PacketProtocolPrivateTargets.cmake +lib/cmake/Qt6PacketProtocolPrivate/Qt6PacketProtocolPrivateVersionlessAliasTargets.cmake lib/cmake/Qt6PacketProtocolPrivate/Qt6PacketProtocolPrivateVersionlessTargets.cmake -lib/cmake/Qt6Qml/QmlPlugins/Qt6QmlMetaAdditionalTargetInfo.cmake -lib/cmake/Qt6Qml/QmlPlugins/Qt6QmlMetaConfig.cmake -lib/cmake/Qt6Qml/QmlPlugins/Qt6QmlMetaConfigVersion.cmake -lib/cmake/Qt6Qml/QmlPlugins/Qt6QmlMetaConfigVersionImpl.cmake -lib/cmake/Qt6Qml/QmlPlugins/Qt6QmlMetaTargets-%%CMAKE_BUILD_TYPE%%.cmake -lib/cmake/Qt6Qml/QmlPlugins/Qt6QmlMetaTargets.cmake +lib/cmake/Qt6Qml/QmlPlugins/Qt6LabsPlatformpluginAdditionalTargetInfo.cmake +lib/cmake/Qt6Qml/QmlPlugins/Qt6LabsPlatformpluginConfig.cmake +lib/cmake/Qt6Qml/QmlPlugins/Qt6LabsPlatformpluginConfigVersion.cmake +lib/cmake/Qt6Qml/QmlPlugins/Qt6LabsPlatformpluginConfigVersionImpl.cmake +lib/cmake/Qt6Qml/QmlPlugins/Qt6LabsPlatformpluginTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/Qt6Qml/QmlPlugins/Qt6LabsPlatformpluginTargets.cmake +lib/cmake/Qt6Qml/QmlPlugins/Qt6QmlAssetDownloaderpluginAdditionalTargetInfo.cmake +lib/cmake/Qt6Qml/QmlPlugins/Qt6QmlAssetDownloaderpluginConfig.cmake +lib/cmake/Qt6Qml/QmlPlugins/Qt6QmlAssetDownloaderpluginConfigVersion.cmake +lib/cmake/Qt6Qml/QmlPlugins/Qt6QmlAssetDownloaderpluginConfigVersionImpl.cmake +lib/cmake/Qt6Qml/QmlPlugins/Qt6QmlAssetDownloaderpluginDependencies.cmake +lib/cmake/Qt6Qml/QmlPlugins/Qt6QmlAssetDownloaderpluginTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/Qt6Qml/QmlPlugins/Qt6QmlAssetDownloaderpluginTargets.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6QmlNetworkpluginAdditionalTargetInfo.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6QmlNetworkpluginConfig.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6QmlNetworkpluginConfigVersion.cmake @@ -1522,12 +1609,12 @@ lib/cmake/Qt6Qml/QmlPlugins/Qt6qquicklayoutspluginConfigVersion.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6qquicklayoutspluginConfigVersionImpl.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6qquicklayoutspluginTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6qquicklayoutspluginTargets.cmake -lib/cmake/Qt6Qml/QmlPlugins/Qt6qtlabsplatformpluginAdditionalTargetInfo.cmake -lib/cmake/Qt6Qml/QmlPlugins/Qt6qtlabsplatformpluginConfig.cmake -lib/cmake/Qt6Qml/QmlPlugins/Qt6qtlabsplatformpluginConfigVersion.cmake -lib/cmake/Qt6Qml/QmlPlugins/Qt6qtlabsplatformpluginConfigVersionImpl.cmake -lib/cmake/Qt6Qml/QmlPlugins/Qt6qtlabsplatformpluginTargets-%%CMAKE_BUILD_TYPE%%.cmake -lib/cmake/Qt6Qml/QmlPlugins/Qt6qtlabsplatformpluginTargets.cmake +lib/cmake/Qt6Qml/QmlPlugins/Qt6qquickvectorimagepluginAdditionalTargetInfo.cmake +lib/cmake/Qt6Qml/QmlPlugins/Qt6qquickvectorimagepluginConfig.cmake +lib/cmake/Qt6Qml/QmlPlugins/Qt6qquickvectorimagepluginConfigVersion.cmake +lib/cmake/Qt6Qml/QmlPlugins/Qt6qquickvectorimagepluginConfigVersionImpl.cmake +lib/cmake/Qt6Qml/QmlPlugins/Qt6qquickvectorimagepluginTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/Qt6Qml/QmlPlugins/Qt6qquickvectorimagepluginTargets.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6qtqmlcorepluginAdditionalTargetInfo.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6qtqmlcorepluginConfig.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6qtqmlcorepluginConfigVersion.cmake @@ -1552,6 +1639,18 @@ lib/cmake/Qt6Qml/QmlPlugins/Qt6qtquickcontrols2basicstylepluginConfigVersion.cma lib/cmake/Qt6Qml/QmlPlugins/Qt6qtquickcontrols2basicstylepluginConfigVersionImpl.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6qtquickcontrols2basicstylepluginTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6qtquickcontrols2basicstylepluginTargets.cmake +lib/cmake/Qt6Qml/QmlPlugins/Qt6qtquickcontrols2fluentwinui3styleimplpluginAdditionalTargetInfo.cmake +lib/cmake/Qt6Qml/QmlPlugins/Qt6qtquickcontrols2fluentwinui3styleimplpluginConfig.cmake +lib/cmake/Qt6Qml/QmlPlugins/Qt6qtquickcontrols2fluentwinui3styleimplpluginConfigVersion.cmake +lib/cmake/Qt6Qml/QmlPlugins/Qt6qtquickcontrols2fluentwinui3styleimplpluginConfigVersionImpl.cmake +lib/cmake/Qt6Qml/QmlPlugins/Qt6qtquickcontrols2fluentwinui3styleimplpluginTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/Qt6Qml/QmlPlugins/Qt6qtquickcontrols2fluentwinui3styleimplpluginTargets.cmake +lib/cmake/Qt6Qml/QmlPlugins/Qt6qtquickcontrols2fluentwinui3stylepluginAdditionalTargetInfo.cmake +lib/cmake/Qt6Qml/QmlPlugins/Qt6qtquickcontrols2fluentwinui3stylepluginConfig.cmake +lib/cmake/Qt6Qml/QmlPlugins/Qt6qtquickcontrols2fluentwinui3stylepluginConfigVersion.cmake +lib/cmake/Qt6Qml/QmlPlugins/Qt6qtquickcontrols2fluentwinui3stylepluginConfigVersionImpl.cmake +lib/cmake/Qt6Qml/QmlPlugins/Qt6qtquickcontrols2fluentwinui3stylepluginTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/Qt6Qml/QmlPlugins/Qt6qtquickcontrols2fluentwinui3stylepluginTargets.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6qtquickcontrols2fusionstyleimplpluginAdditionalTargetInfo.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6qtquickcontrols2fusionstyleimplpluginConfig.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6qtquickcontrols2fusionstyleimplpluginConfigVersion.cmake @@ -1739,18 +1838,23 @@ lib/cmake/Qt6Qml/Qt6QmlMacros.cmake lib/cmake/Qt6Qml/Qt6QmlModuleDirMappingTemplate.qrc.in lib/cmake/Qt6Qml/Qt6QmlPluginTemplate.cpp.in lib/cmake/Qt6Qml/Qt6QmlPlugins.cmake +lib/cmake/Qt6Qml/Qt6QmlPublicCMakeHelpers.cmake lib/cmake/Qt6Qml/Qt6QmlTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6Qml/Qt6QmlTargets.cmake +lib/cmake/Qt6Qml/Qt6QmlVersionlessAliasTargets.cmake lib/cmake/Qt6Qml/Qt6QmlVersionlessTargets.cmake lib/cmake/Qt6Qml/Qt6QmltcFileMappingTemplate.qrc.in lib/cmake/Qt6Qml/Qt6qmldirTemplate.cmake.in -lib/cmake/Qt6QmlBuiltins/Qt6QmlBuiltinsAdditionalTargetInfo.cmake -lib/cmake/Qt6QmlBuiltins/Qt6QmlBuiltinsConfig.cmake -lib/cmake/Qt6QmlBuiltins/Qt6QmlBuiltinsConfigVersion.cmake -lib/cmake/Qt6QmlBuiltins/Qt6QmlBuiltinsConfigVersionImpl.cmake -lib/cmake/Qt6QmlBuiltins/Qt6QmlBuiltinsTargets-%%CMAKE_BUILD_TYPE%%.cmake -lib/cmake/Qt6QmlBuiltins/Qt6QmlBuiltinsTargets.cmake -lib/cmake/Qt6QmlBuiltins/Qt6QmlBuiltinsVersionlessTargets.cmake +lib/cmake/Qt6Qml/Qt6qt.conf.in +lib/cmake/Qt6QmlAssetDownloader/Qt6QmlAssetDownloaderAdditionalTargetInfo.cmake +lib/cmake/Qt6QmlAssetDownloader/Qt6QmlAssetDownloaderConfig.cmake +lib/cmake/Qt6QmlAssetDownloader/Qt6QmlAssetDownloaderConfigVersion.cmake +lib/cmake/Qt6QmlAssetDownloader/Qt6QmlAssetDownloaderConfigVersionImpl.cmake +lib/cmake/Qt6QmlAssetDownloader/Qt6QmlAssetDownloaderDependencies.cmake +lib/cmake/Qt6QmlAssetDownloader/Qt6QmlAssetDownloaderTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/Qt6QmlAssetDownloader/Qt6QmlAssetDownloaderTargets.cmake +lib/cmake/Qt6QmlAssetDownloader/Qt6QmlAssetDownloaderVersionlessAliasTargets.cmake +lib/cmake/Qt6QmlAssetDownloader/Qt6QmlAssetDownloaderVersionlessTargets.cmake lib/cmake/Qt6QmlCompiler/Qt6QmlCompilerAdditionalTargetInfo.cmake lib/cmake/Qt6QmlCompiler/Qt6QmlCompilerConfig.cmake lib/cmake/Qt6QmlCompiler/Qt6QmlCompilerConfigVersion.cmake @@ -1759,6 +1863,7 @@ lib/cmake/Qt6QmlCompiler/Qt6QmlCompilerDependencies.cmake lib/cmake/Qt6QmlCompiler/Qt6QmlCompilerPlugins.cmake lib/cmake/Qt6QmlCompiler/Qt6QmlCompilerTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6QmlCompiler/Qt6QmlCompilerTargets.cmake +lib/cmake/Qt6QmlCompiler/Qt6QmlCompilerVersionlessAliasTargets.cmake lib/cmake/Qt6QmlCompiler/Qt6QmlCompilerVersionlessTargets.cmake lib/cmake/Qt6QmlCompiler/Qt6QmlLintQuickPluginAdditionalTargetInfo.cmake lib/cmake/Qt6QmlCompiler/Qt6QmlLintQuickPluginConfig.cmake @@ -1773,6 +1878,7 @@ lib/cmake/Qt6QmlCore/Qt6QmlCoreConfigVersionImpl.cmake lib/cmake/Qt6QmlCore/Qt6QmlCoreDependencies.cmake 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/Qt6QmlDebugPrivate/Qt6QmlDebugPrivateAdditionalTargetInfo.cmake lib/cmake/Qt6QmlDebugPrivate/Qt6QmlDebugPrivateConfig.cmake @@ -1781,6 +1887,7 @@ lib/cmake/Qt6QmlDebugPrivate/Qt6QmlDebugPrivateConfigVersionImpl.cmake lib/cmake/Qt6QmlDebugPrivate/Qt6QmlDebugPrivateDependencies.cmake lib/cmake/Qt6QmlDebugPrivate/Qt6QmlDebugPrivateTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6QmlDebugPrivate/Qt6QmlDebugPrivateTargets.cmake +lib/cmake/Qt6QmlDebugPrivate/Qt6QmlDebugPrivateVersionlessAliasTargets.cmake lib/cmake/Qt6QmlDebugPrivate/Qt6QmlDebugPrivateVersionlessTargets.cmake lib/cmake/Qt6QmlDomPrivate/Qt6QmlDomPrivateAdditionalTargetInfo.cmake lib/cmake/Qt6QmlDomPrivate/Qt6QmlDomPrivateConfig.cmake @@ -1789,6 +1896,7 @@ lib/cmake/Qt6QmlDomPrivate/Qt6QmlDomPrivateConfigVersionImpl.cmake lib/cmake/Qt6QmlDomPrivate/Qt6QmlDomPrivateDependencies.cmake 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/Qt6QmlImportScanner/Qt6QmlImportScannerConfig.cmake lib/cmake/Qt6QmlImportScanner/Qt6QmlImportScannerConfigVersion.cmake @@ -1799,15 +1907,24 @@ lib/cmake/Qt6QmlIntegration/Qt6QmlIntegrationConfig.cmake lib/cmake/Qt6QmlIntegration/Qt6QmlIntegrationConfigVersion.cmake lib/cmake/Qt6QmlIntegration/Qt6QmlIntegrationConfigVersionImpl.cmake lib/cmake/Qt6QmlIntegration/Qt6QmlIntegrationTargets.cmake +lib/cmake/Qt6QmlIntegration/Qt6QmlIntegrationVersionlessAliasTargets.cmake lib/cmake/Qt6QmlIntegration/Qt6QmlIntegrationVersionlessTargets.cmake lib/cmake/Qt6QmlLSPrivate/Qt6QmlLSPrivateAdditionalTargetInfo.cmake lib/cmake/Qt6QmlLSPrivate/Qt6QmlLSPrivateConfig.cmake lib/cmake/Qt6QmlLSPrivate/Qt6QmlLSPrivateConfigVersion.cmake lib/cmake/Qt6QmlLSPrivate/Qt6QmlLSPrivateConfigVersionImpl.cmake lib/cmake/Qt6QmlLSPrivate/Qt6QmlLSPrivateDependencies.cmake +lib/cmake/Qt6QmlLSPrivate/Qt6QmlLSPrivatePlugins.cmake lib/cmake/Qt6QmlLSPrivate/Qt6QmlLSPrivateTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6QmlLSPrivate/Qt6QmlLSPrivateTargets.cmake +lib/cmake/Qt6QmlLSPrivate/Qt6QmlLSPrivateVersionlessAliasTargets.cmake lib/cmake/Qt6QmlLSPrivate/Qt6QmlLSPrivateVersionlessTargets.cmake +lib/cmake/Qt6QmlLSPrivate/Qt6QmlLSQuickPluginAdditionalTargetInfo.cmake +lib/cmake/Qt6QmlLSPrivate/Qt6QmlLSQuickPluginConfig.cmake +lib/cmake/Qt6QmlLSPrivate/Qt6QmlLSQuickPluginConfigVersion.cmake +lib/cmake/Qt6QmlLSPrivate/Qt6QmlLSQuickPluginConfigVersionImpl.cmake +lib/cmake/Qt6QmlLSPrivate/Qt6QmlLSQuickPluginTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/Qt6QmlLSPrivate/Qt6QmlLSQuickPluginTargets.cmake lib/cmake/Qt6QmlLocalStorage/Qt6QmlLocalStorageAdditionalTargetInfo.cmake lib/cmake/Qt6QmlLocalStorage/Qt6QmlLocalStorageConfig.cmake lib/cmake/Qt6QmlLocalStorage/Qt6QmlLocalStorageConfigVersion.cmake @@ -1815,7 +1932,17 @@ lib/cmake/Qt6QmlLocalStorage/Qt6QmlLocalStorageConfigVersionImpl.cmake lib/cmake/Qt6QmlLocalStorage/Qt6QmlLocalStorageDependencies.cmake lib/cmake/Qt6QmlLocalStorage/Qt6QmlLocalStorageTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6QmlLocalStorage/Qt6QmlLocalStorageTargets.cmake +lib/cmake/Qt6QmlLocalStorage/Qt6QmlLocalStorageVersionlessAliasTargets.cmake lib/cmake/Qt6QmlLocalStorage/Qt6QmlLocalStorageVersionlessTargets.cmake +lib/cmake/Qt6QmlMeta/Qt6QmlMetaAdditionalTargetInfo.cmake +lib/cmake/Qt6QmlMeta/Qt6QmlMetaConfig.cmake +lib/cmake/Qt6QmlMeta/Qt6QmlMetaConfigVersion.cmake +lib/cmake/Qt6QmlMeta/Qt6QmlMetaConfigVersionImpl.cmake +lib/cmake/Qt6QmlMeta/Qt6QmlMetaDependencies.cmake +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/Qt6QmlModels/Qt6QmlModelsAdditionalTargetInfo.cmake lib/cmake/Qt6QmlModels/Qt6QmlModelsConfig.cmake lib/cmake/Qt6QmlModels/Qt6QmlModelsConfigVersion.cmake @@ -1823,6 +1950,7 @@ lib/cmake/Qt6QmlModels/Qt6QmlModelsConfigVersionImpl.cmake lib/cmake/Qt6QmlModels/Qt6QmlModelsDependencies.cmake 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/Qt6QmlNetwork/Qt6QmlNetworkAdditionalTargetInfo.cmake lib/cmake/Qt6QmlNetwork/Qt6QmlNetworkConfig.cmake @@ -1831,6 +1959,7 @@ lib/cmake/Qt6QmlNetwork/Qt6QmlNetworkConfigVersionImpl.cmake lib/cmake/Qt6QmlNetwork/Qt6QmlNetworkDependencies.cmake 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/Qt6QmlToolingSettingsPrivate/Qt6QmlToolingSettingsPrivateAdditionalTargetInfo.cmake lib/cmake/Qt6QmlToolingSettingsPrivate/Qt6QmlToolingSettingsPrivateConfig.cmake @@ -1839,6 +1968,7 @@ lib/cmake/Qt6QmlToolingSettingsPrivate/Qt6QmlToolingSettingsPrivateConfigVersion lib/cmake/Qt6QmlToolingSettingsPrivate/Qt6QmlToolingSettingsPrivateDependencies.cmake lib/cmake/Qt6QmlToolingSettingsPrivate/Qt6QmlToolingSettingsPrivateTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6QmlToolingSettingsPrivate/Qt6QmlToolingSettingsPrivateTargets.cmake +lib/cmake/Qt6QmlToolingSettingsPrivate/Qt6QmlToolingSettingsPrivateVersionlessAliasTargets.cmake lib/cmake/Qt6QmlToolingSettingsPrivate/Qt6QmlToolingSettingsPrivateVersionlessTargets.cmake lib/cmake/Qt6QmlTools/Qt6QmlToolsAdditionalTargetInfo.cmake lib/cmake/Qt6QmlTools/Qt6QmlToolsConfig.cmake @@ -1855,6 +1985,7 @@ lib/cmake/Qt6QmlTypeRegistrarPrivate/Qt6QmlTypeRegistrarPrivateConfigVersionImpl lib/cmake/Qt6QmlTypeRegistrarPrivate/Qt6QmlTypeRegistrarPrivateDependencies.cmake lib/cmake/Qt6QmlTypeRegistrarPrivate/Qt6QmlTypeRegistrarPrivateTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6QmlTypeRegistrarPrivate/Qt6QmlTypeRegistrarPrivateTargets.cmake +lib/cmake/Qt6QmlTypeRegistrarPrivate/Qt6QmlTypeRegistrarPrivateVersionlessAliasTargets.cmake lib/cmake/Qt6QmlTypeRegistrarPrivate/Qt6QmlTypeRegistrarPrivateVersionlessTargets.cmake lib/cmake/Qt6QmlWorkerScript/Qt6QmlWorkerScriptAdditionalTargetInfo.cmake lib/cmake/Qt6QmlWorkerScript/Qt6QmlWorkerScriptConfig.cmake @@ -1863,6 +1994,7 @@ lib/cmake/Qt6QmlWorkerScript/Qt6QmlWorkerScriptConfigVersionImpl.cmake lib/cmake/Qt6QmlWorkerScript/Qt6QmlWorkerScriptDependencies.cmake lib/cmake/Qt6QmlWorkerScript/Qt6QmlWorkerScriptTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6QmlWorkerScript/Qt6QmlWorkerScriptTargets.cmake +lib/cmake/Qt6QmlWorkerScript/Qt6QmlWorkerScriptVersionlessAliasTargets.cmake lib/cmake/Qt6QmlWorkerScript/Qt6QmlWorkerScriptVersionlessTargets.cmake lib/cmake/Qt6QmlXmlListModel/Qt6QmlXmlListModelAdditionalTargetInfo.cmake lib/cmake/Qt6QmlXmlListModel/Qt6QmlXmlListModelConfig.cmake @@ -1871,6 +2003,7 @@ lib/cmake/Qt6QmlXmlListModel/Qt6QmlXmlListModelConfigVersionImpl.cmake lib/cmake/Qt6QmlXmlListModel/Qt6QmlXmlListModelDependencies.cmake lib/cmake/Qt6QmlXmlListModel/Qt6QmlXmlListModelTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6QmlXmlListModel/Qt6QmlXmlListModelTargets.cmake +lib/cmake/Qt6QmlXmlListModel/Qt6QmlXmlListModelVersionlessAliasTargets.cmake lib/cmake/Qt6QmlXmlListModel/Qt6QmlXmlListModelVersionlessTargets.cmake lib/cmake/Qt6Quick/Qt6QuickAdditionalTargetInfo.cmake lib/cmake/Qt6Quick/Qt6QuickConfig.cmake @@ -1880,6 +2013,7 @@ lib/cmake/Qt6Quick/Qt6QuickDependencies.cmake lib/cmake/Qt6Quick/Qt6QuickPlugins.cmake lib/cmake/Qt6Quick/Qt6QuickTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6Quick/Qt6QuickTargets.cmake +lib/cmake/Qt6Quick/Qt6QuickVersionlessAliasTargets.cmake lib/cmake/Qt6Quick/Qt6QuickVersionlessTargets.cmake lib/cmake/Qt6QuickControls2/Qt6QuickControls2AdditionalTargetInfo.cmake lib/cmake/Qt6QuickControls2/Qt6QuickControls2Config.cmake @@ -1888,6 +2022,7 @@ lib/cmake/Qt6QuickControls2/Qt6QuickControls2ConfigVersionImpl.cmake lib/cmake/Qt6QuickControls2/Qt6QuickControls2Dependencies.cmake lib/cmake/Qt6QuickControls2/Qt6QuickControls2Targets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6QuickControls2/Qt6QuickControls2Targets.cmake +lib/cmake/Qt6QuickControls2/Qt6QuickControls2VersionlessAliasTargets.cmake lib/cmake/Qt6QuickControls2/Qt6QuickControls2VersionlessTargets.cmake lib/cmake/Qt6QuickControls2Basic/Qt6QuickControls2BasicAdditionalTargetInfo.cmake lib/cmake/Qt6QuickControls2Basic/Qt6QuickControls2BasicConfig.cmake @@ -1896,6 +2031,7 @@ lib/cmake/Qt6QuickControls2Basic/Qt6QuickControls2BasicConfigVersionImpl.cmake lib/cmake/Qt6QuickControls2Basic/Qt6QuickControls2BasicDependencies.cmake lib/cmake/Qt6QuickControls2Basic/Qt6QuickControls2BasicTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6QuickControls2Basic/Qt6QuickControls2BasicTargets.cmake +lib/cmake/Qt6QuickControls2Basic/Qt6QuickControls2BasicVersionlessAliasTargets.cmake lib/cmake/Qt6QuickControls2Basic/Qt6QuickControls2BasicVersionlessTargets.cmake lib/cmake/Qt6QuickControls2BasicStyleImpl/Qt6QuickControls2BasicStyleImplAdditionalTargetInfo.cmake lib/cmake/Qt6QuickControls2BasicStyleImpl/Qt6QuickControls2BasicStyleImplConfig.cmake @@ -1904,7 +2040,17 @@ lib/cmake/Qt6QuickControls2BasicStyleImpl/Qt6QuickControls2BasicStyleImplConfigV lib/cmake/Qt6QuickControls2BasicStyleImpl/Qt6QuickControls2BasicStyleImplDependencies.cmake lib/cmake/Qt6QuickControls2BasicStyleImpl/Qt6QuickControls2BasicStyleImplTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6QuickControls2BasicStyleImpl/Qt6QuickControls2BasicStyleImplTargets.cmake +lib/cmake/Qt6QuickControls2BasicStyleImpl/Qt6QuickControls2BasicStyleImplVersionlessAliasTargets.cmake lib/cmake/Qt6QuickControls2BasicStyleImpl/Qt6QuickControls2BasicStyleImplVersionlessTargets.cmake +lib/cmake/Qt6QuickControls2FluentWinUI3StyleImpl/Qt6QuickControls2FluentWinUI3StyleImplAdditionalTargetInfo.cmake +lib/cmake/Qt6QuickControls2FluentWinUI3StyleImpl/Qt6QuickControls2FluentWinUI3StyleImplConfig.cmake +lib/cmake/Qt6QuickControls2FluentWinUI3StyleImpl/Qt6QuickControls2FluentWinUI3StyleImplConfigVersion.cmake +lib/cmake/Qt6QuickControls2FluentWinUI3StyleImpl/Qt6QuickControls2FluentWinUI3StyleImplConfigVersionImpl.cmake +lib/cmake/Qt6QuickControls2FluentWinUI3StyleImpl/Qt6QuickControls2FluentWinUI3StyleImplDependencies.cmake +lib/cmake/Qt6QuickControls2FluentWinUI3StyleImpl/Qt6QuickControls2FluentWinUI3StyleImplTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/Qt6QuickControls2FluentWinUI3StyleImpl/Qt6QuickControls2FluentWinUI3StyleImplTargets.cmake +lib/cmake/Qt6QuickControls2FluentWinUI3StyleImpl/Qt6QuickControls2FluentWinUI3StyleImplVersionlessAliasTargets.cmake +lib/cmake/Qt6QuickControls2FluentWinUI3StyleImpl/Qt6QuickControls2FluentWinUI3StyleImplVersionlessTargets.cmake lib/cmake/Qt6QuickControls2Fusion/Qt6QuickControls2FusionAdditionalTargetInfo.cmake lib/cmake/Qt6QuickControls2Fusion/Qt6QuickControls2FusionConfig.cmake lib/cmake/Qt6QuickControls2Fusion/Qt6QuickControls2FusionConfigVersion.cmake @@ -1912,6 +2058,7 @@ lib/cmake/Qt6QuickControls2Fusion/Qt6QuickControls2FusionConfigVersionImpl.cmake lib/cmake/Qt6QuickControls2Fusion/Qt6QuickControls2FusionDependencies.cmake lib/cmake/Qt6QuickControls2Fusion/Qt6QuickControls2FusionTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6QuickControls2Fusion/Qt6QuickControls2FusionTargets.cmake +lib/cmake/Qt6QuickControls2Fusion/Qt6QuickControls2FusionVersionlessAliasTargets.cmake lib/cmake/Qt6QuickControls2Fusion/Qt6QuickControls2FusionVersionlessTargets.cmake lib/cmake/Qt6QuickControls2FusionStyleImpl/Qt6QuickControls2FusionStyleImplAdditionalTargetInfo.cmake lib/cmake/Qt6QuickControls2FusionStyleImpl/Qt6QuickControls2FusionStyleImplConfig.cmake @@ -1920,6 +2067,7 @@ lib/cmake/Qt6QuickControls2FusionStyleImpl/Qt6QuickControls2FusionStyleImplConfi lib/cmake/Qt6QuickControls2FusionStyleImpl/Qt6QuickControls2FusionStyleImplDependencies.cmake lib/cmake/Qt6QuickControls2FusionStyleImpl/Qt6QuickControls2FusionStyleImplTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6QuickControls2FusionStyleImpl/Qt6QuickControls2FusionStyleImplTargets.cmake +lib/cmake/Qt6QuickControls2FusionStyleImpl/Qt6QuickControls2FusionStyleImplVersionlessAliasTargets.cmake lib/cmake/Qt6QuickControls2FusionStyleImpl/Qt6QuickControls2FusionStyleImplVersionlessTargets.cmake lib/cmake/Qt6QuickControls2Imagine/Qt6QuickControls2ImagineAdditionalTargetInfo.cmake lib/cmake/Qt6QuickControls2Imagine/Qt6QuickControls2ImagineConfig.cmake @@ -1928,6 +2076,7 @@ lib/cmake/Qt6QuickControls2Imagine/Qt6QuickControls2ImagineConfigVersionImpl.cma lib/cmake/Qt6QuickControls2Imagine/Qt6QuickControls2ImagineDependencies.cmake lib/cmake/Qt6QuickControls2Imagine/Qt6QuickControls2ImagineTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6QuickControls2Imagine/Qt6QuickControls2ImagineTargets.cmake +lib/cmake/Qt6QuickControls2Imagine/Qt6QuickControls2ImagineVersionlessAliasTargets.cmake lib/cmake/Qt6QuickControls2Imagine/Qt6QuickControls2ImagineVersionlessTargets.cmake lib/cmake/Qt6QuickControls2ImagineStyleImpl/Qt6QuickControls2ImagineStyleImplAdditionalTargetInfo.cmake lib/cmake/Qt6QuickControls2ImagineStyleImpl/Qt6QuickControls2ImagineStyleImplConfig.cmake @@ -1936,6 +2085,7 @@ lib/cmake/Qt6QuickControls2ImagineStyleImpl/Qt6QuickControls2ImagineStyleImplCon lib/cmake/Qt6QuickControls2ImagineStyleImpl/Qt6QuickControls2ImagineStyleImplDependencies.cmake lib/cmake/Qt6QuickControls2ImagineStyleImpl/Qt6QuickControls2ImagineStyleImplTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6QuickControls2ImagineStyleImpl/Qt6QuickControls2ImagineStyleImplTargets.cmake +lib/cmake/Qt6QuickControls2ImagineStyleImpl/Qt6QuickControls2ImagineStyleImplVersionlessAliasTargets.cmake lib/cmake/Qt6QuickControls2ImagineStyleImpl/Qt6QuickControls2ImagineStyleImplVersionlessTargets.cmake lib/cmake/Qt6QuickControls2Impl/Qt6QuickControls2ImplAdditionalTargetInfo.cmake lib/cmake/Qt6QuickControls2Impl/Qt6QuickControls2ImplConfig.cmake @@ -1944,6 +2094,7 @@ lib/cmake/Qt6QuickControls2Impl/Qt6QuickControls2ImplConfigVersionImpl.cmake lib/cmake/Qt6QuickControls2Impl/Qt6QuickControls2ImplDependencies.cmake lib/cmake/Qt6QuickControls2Impl/Qt6QuickControls2ImplTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6QuickControls2Impl/Qt6QuickControls2ImplTargets.cmake +lib/cmake/Qt6QuickControls2Impl/Qt6QuickControls2ImplVersionlessAliasTargets.cmake lib/cmake/Qt6QuickControls2Impl/Qt6QuickControls2ImplVersionlessTargets.cmake lib/cmake/Qt6QuickControls2Material/Qt6QuickControls2MaterialAdditionalTargetInfo.cmake lib/cmake/Qt6QuickControls2Material/Qt6QuickControls2MaterialConfig.cmake @@ -1952,6 +2103,7 @@ lib/cmake/Qt6QuickControls2Material/Qt6QuickControls2MaterialConfigVersionImpl.c lib/cmake/Qt6QuickControls2Material/Qt6QuickControls2MaterialDependencies.cmake lib/cmake/Qt6QuickControls2Material/Qt6QuickControls2MaterialTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6QuickControls2Material/Qt6QuickControls2MaterialTargets.cmake +lib/cmake/Qt6QuickControls2Material/Qt6QuickControls2MaterialVersionlessAliasTargets.cmake lib/cmake/Qt6QuickControls2Material/Qt6QuickControls2MaterialVersionlessTargets.cmake lib/cmake/Qt6QuickControls2MaterialStyleImpl/Qt6QuickControls2MaterialStyleImplAdditionalTargetInfo.cmake lib/cmake/Qt6QuickControls2MaterialStyleImpl/Qt6QuickControls2MaterialStyleImplConfig.cmake @@ -1960,6 +2112,7 @@ lib/cmake/Qt6QuickControls2MaterialStyleImpl/Qt6QuickControls2MaterialStyleImplC lib/cmake/Qt6QuickControls2MaterialStyleImpl/Qt6QuickControls2MaterialStyleImplDependencies.cmake lib/cmake/Qt6QuickControls2MaterialStyleImpl/Qt6QuickControls2MaterialStyleImplTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6QuickControls2MaterialStyleImpl/Qt6QuickControls2MaterialStyleImplTargets.cmake +lib/cmake/Qt6QuickControls2MaterialStyleImpl/Qt6QuickControls2MaterialStyleImplVersionlessAliasTargets.cmake lib/cmake/Qt6QuickControls2MaterialStyleImpl/Qt6QuickControls2MaterialStyleImplVersionlessTargets.cmake lib/cmake/Qt6QuickControls2Universal/Qt6QuickControls2UniversalAdditionalTargetInfo.cmake lib/cmake/Qt6QuickControls2Universal/Qt6QuickControls2UniversalConfig.cmake @@ -1968,6 +2121,7 @@ lib/cmake/Qt6QuickControls2Universal/Qt6QuickControls2UniversalConfigVersionImpl lib/cmake/Qt6QuickControls2Universal/Qt6QuickControls2UniversalDependencies.cmake lib/cmake/Qt6QuickControls2Universal/Qt6QuickControls2UniversalTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6QuickControls2Universal/Qt6QuickControls2UniversalTargets.cmake +lib/cmake/Qt6QuickControls2Universal/Qt6QuickControls2UniversalVersionlessAliasTargets.cmake lib/cmake/Qt6QuickControls2Universal/Qt6QuickControls2UniversalVersionlessTargets.cmake lib/cmake/Qt6QuickControls2UniversalStyleImpl/Qt6QuickControls2UniversalStyleImplAdditionalTargetInfo.cmake lib/cmake/Qt6QuickControls2UniversalStyleImpl/Qt6QuickControls2UniversalStyleImplConfig.cmake @@ -1976,6 +2130,7 @@ lib/cmake/Qt6QuickControls2UniversalStyleImpl/Qt6QuickControls2UniversalStyleImp lib/cmake/Qt6QuickControls2UniversalStyleImpl/Qt6QuickControls2UniversalStyleImplDependencies.cmake lib/cmake/Qt6QuickControls2UniversalStyleImpl/Qt6QuickControls2UniversalStyleImplTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6QuickControls2UniversalStyleImpl/Qt6QuickControls2UniversalStyleImplTargets.cmake +lib/cmake/Qt6QuickControls2UniversalStyleImpl/Qt6QuickControls2UniversalStyleImplVersionlessAliasTargets.cmake lib/cmake/Qt6QuickControls2UniversalStyleImpl/Qt6QuickControls2UniversalStyleImplVersionlessTargets.cmake lib/cmake/Qt6QuickControlsTestUtilsPrivate/Qt6QuickControlsTestUtilsPrivateAdditionalTargetInfo.cmake lib/cmake/Qt6QuickControlsTestUtilsPrivate/Qt6QuickControlsTestUtilsPrivateConfig.cmake @@ -1984,6 +2139,7 @@ lib/cmake/Qt6QuickControlsTestUtilsPrivate/Qt6QuickControlsTestUtilsPrivateConfi lib/cmake/Qt6QuickControlsTestUtilsPrivate/Qt6QuickControlsTestUtilsPrivateDependencies.cmake lib/cmake/Qt6QuickControlsTestUtilsPrivate/Qt6QuickControlsTestUtilsPrivateTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6QuickControlsTestUtilsPrivate/Qt6QuickControlsTestUtilsPrivateTargets.cmake +lib/cmake/Qt6QuickControlsTestUtilsPrivate/Qt6QuickControlsTestUtilsPrivateVersionlessAliasTargets.cmake lib/cmake/Qt6QuickControlsTestUtilsPrivate/Qt6QuickControlsTestUtilsPrivateVersionlessTargets.cmake lib/cmake/Qt6QuickDialogs2/Qt6QuickDialogs2AdditionalTargetInfo.cmake lib/cmake/Qt6QuickDialogs2/Qt6QuickDialogs2Config.cmake @@ -1992,6 +2148,7 @@ lib/cmake/Qt6QuickDialogs2/Qt6QuickDialogs2ConfigVersionImpl.cmake lib/cmake/Qt6QuickDialogs2/Qt6QuickDialogs2Dependencies.cmake 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/Qt6QuickDialogs2QuickImpl/Qt6QuickDialogs2QuickImplAdditionalTargetInfo.cmake lib/cmake/Qt6QuickDialogs2QuickImpl/Qt6QuickDialogs2QuickImplConfig.cmake @@ -2000,6 +2157,7 @@ lib/cmake/Qt6QuickDialogs2QuickImpl/Qt6QuickDialogs2QuickImplConfigVersionImpl.c lib/cmake/Qt6QuickDialogs2QuickImpl/Qt6QuickDialogs2QuickImplDependencies.cmake lib/cmake/Qt6QuickDialogs2QuickImpl/Qt6QuickDialogs2QuickImplTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6QuickDialogs2QuickImpl/Qt6QuickDialogs2QuickImplTargets.cmake +lib/cmake/Qt6QuickDialogs2QuickImpl/Qt6QuickDialogs2QuickImplVersionlessAliasTargets.cmake lib/cmake/Qt6QuickDialogs2QuickImpl/Qt6QuickDialogs2QuickImplVersionlessTargets.cmake lib/cmake/Qt6QuickDialogs2Utils/Qt6QuickDialogs2UtilsAdditionalTargetInfo.cmake lib/cmake/Qt6QuickDialogs2Utils/Qt6QuickDialogs2UtilsConfig.cmake @@ -2008,6 +2166,7 @@ lib/cmake/Qt6QuickDialogs2Utils/Qt6QuickDialogs2UtilsConfigVersionImpl.cmake lib/cmake/Qt6QuickDialogs2Utils/Qt6QuickDialogs2UtilsDependencies.cmake lib/cmake/Qt6QuickDialogs2Utils/Qt6QuickDialogs2UtilsTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6QuickDialogs2Utils/Qt6QuickDialogs2UtilsTargets.cmake +lib/cmake/Qt6QuickDialogs2Utils/Qt6QuickDialogs2UtilsVersionlessAliasTargets.cmake lib/cmake/Qt6QuickDialogs2Utils/Qt6QuickDialogs2UtilsVersionlessTargets.cmake lib/cmake/Qt6QuickEffectsPrivate/Qt6QuickEffectsPrivateAdditionalTargetInfo.cmake lib/cmake/Qt6QuickEffectsPrivate/Qt6QuickEffectsPrivateConfig.cmake @@ -2016,6 +2175,7 @@ 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 lib/cmake/Qt6QuickLayouts/Qt6QuickLayoutsAdditionalTargetInfo.cmake lib/cmake/Qt6QuickLayouts/Qt6QuickLayoutsConfig.cmake @@ -2024,6 +2184,7 @@ lib/cmake/Qt6QuickLayouts/Qt6QuickLayoutsConfigVersionImpl.cmake lib/cmake/Qt6QuickLayouts/Qt6QuickLayoutsDependencies.cmake 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/Qt6QuickParticlesPrivate/Qt6QuickParticlesPrivateAdditionalTargetInfo.cmake lib/cmake/Qt6QuickParticlesPrivate/Qt6QuickParticlesPrivateConfig.cmake @@ -2032,6 +2193,7 @@ lib/cmake/Qt6QuickParticlesPrivate/Qt6QuickParticlesPrivateConfigVersionImpl.cma lib/cmake/Qt6QuickParticlesPrivate/Qt6QuickParticlesPrivateDependencies.cmake lib/cmake/Qt6QuickParticlesPrivate/Qt6QuickParticlesPrivateTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6QuickParticlesPrivate/Qt6QuickParticlesPrivateTargets.cmake +lib/cmake/Qt6QuickParticlesPrivate/Qt6QuickParticlesPrivateVersionlessAliasTargets.cmake lib/cmake/Qt6QuickParticlesPrivate/Qt6QuickParticlesPrivateVersionlessTargets.cmake lib/cmake/Qt6QuickShapesPrivate/Qt6QuickShapesPrivateAdditionalTargetInfo.cmake lib/cmake/Qt6QuickShapesPrivate/Qt6QuickShapesPrivateConfig.cmake @@ -2040,6 +2202,7 @@ lib/cmake/Qt6QuickShapesPrivate/Qt6QuickShapesPrivateConfigVersionImpl.cmake lib/cmake/Qt6QuickShapesPrivate/Qt6QuickShapesPrivateDependencies.cmake lib/cmake/Qt6QuickShapesPrivate/Qt6QuickShapesPrivateTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6QuickShapesPrivate/Qt6QuickShapesPrivateTargets.cmake +lib/cmake/Qt6QuickShapesPrivate/Qt6QuickShapesPrivateVersionlessAliasTargets.cmake lib/cmake/Qt6QuickShapesPrivate/Qt6QuickShapesPrivateVersionlessTargets.cmake lib/cmake/Qt6QuickTemplates2/Qt6QuickTemplates2AdditionalTargetInfo.cmake lib/cmake/Qt6QuickTemplates2/Qt6QuickTemplates2Config.cmake @@ -2048,6 +2211,7 @@ lib/cmake/Qt6QuickTemplates2/Qt6QuickTemplates2ConfigVersionImpl.cmake lib/cmake/Qt6QuickTemplates2/Qt6QuickTemplates2Dependencies.cmake lib/cmake/Qt6QuickTemplates2/Qt6QuickTemplates2Targets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6QuickTemplates2/Qt6QuickTemplates2Targets.cmake +lib/cmake/Qt6QuickTemplates2/Qt6QuickTemplates2VersionlessAliasTargets.cmake lib/cmake/Qt6QuickTemplates2/Qt6QuickTemplates2VersionlessTargets.cmake lib/cmake/Qt6QuickTest/Qt6QuickTestAdditionalTargetInfo.cmake lib/cmake/Qt6QuickTest/Qt6QuickTestConfig.cmake @@ -2056,6 +2220,7 @@ lib/cmake/Qt6QuickTest/Qt6QuickTestConfigVersionImpl.cmake lib/cmake/Qt6QuickTest/Qt6QuickTestDependencies.cmake 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/Qt6QuickTestUtilsPrivate/Qt6QuickTestUtilsPrivateAdditionalTargetInfo.cmake lib/cmake/Qt6QuickTestUtilsPrivate/Qt6QuickTestUtilsPrivateConfig.cmake @@ -2064,6 +2229,7 @@ lib/cmake/Qt6QuickTestUtilsPrivate/Qt6QuickTestUtilsPrivateConfigVersionImpl.cma lib/cmake/Qt6QuickTestUtilsPrivate/Qt6QuickTestUtilsPrivateDependencies.cmake lib/cmake/Qt6QuickTestUtilsPrivate/Qt6QuickTestUtilsPrivateTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6QuickTestUtilsPrivate/Qt6QuickTestUtilsPrivateTargets.cmake +lib/cmake/Qt6QuickTestUtilsPrivate/Qt6QuickTestUtilsPrivateVersionlessAliasTargets.cmake lib/cmake/Qt6QuickTestUtilsPrivate/Qt6QuickTestUtilsPrivateVersionlessTargets.cmake lib/cmake/Qt6QuickTools/Qt6QuickToolsAdditionalTargetInfo.cmake lib/cmake/Qt6QuickTools/Qt6QuickToolsConfig.cmake @@ -2073,6 +2239,24 @@ lib/cmake/Qt6QuickTools/Qt6QuickToolsDependencies.cmake lib/cmake/Qt6QuickTools/Qt6QuickToolsTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6QuickTools/Qt6QuickToolsTargets.cmake lib/cmake/Qt6QuickTools/Qt6QuickToolsVersionlessTargets.cmake +lib/cmake/Qt6QuickVectorImage/Qt6QuickVectorImageAdditionalTargetInfo.cmake +lib/cmake/Qt6QuickVectorImage/Qt6QuickVectorImageConfig.cmake +lib/cmake/Qt6QuickVectorImage/Qt6QuickVectorImageConfigVersion.cmake +lib/cmake/Qt6QuickVectorImage/Qt6QuickVectorImageConfigVersionImpl.cmake +lib/cmake/Qt6QuickVectorImage/Qt6QuickVectorImageDependencies.cmake +lib/cmake/Qt6QuickVectorImage/Qt6QuickVectorImageTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/Qt6QuickVectorImage/Qt6QuickVectorImageTargets.cmake +lib/cmake/Qt6QuickVectorImage/Qt6QuickVectorImageVersionlessAliasTargets.cmake +lib/cmake/Qt6QuickVectorImage/Qt6QuickVectorImageVersionlessTargets.cmake +lib/cmake/Qt6QuickVectorImageGeneratorPrivate/Qt6QuickVectorImageGeneratorPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6QuickVectorImageGeneratorPrivate/Qt6QuickVectorImageGeneratorPrivateConfig.cmake +lib/cmake/Qt6QuickVectorImageGeneratorPrivate/Qt6QuickVectorImageGeneratorPrivateConfigVersion.cmake +lib/cmake/Qt6QuickVectorImageGeneratorPrivate/Qt6QuickVectorImageGeneratorPrivateConfigVersionImpl.cmake +lib/cmake/Qt6QuickVectorImageGeneratorPrivate/Qt6QuickVectorImageGeneratorPrivateDependencies.cmake +lib/cmake/Qt6QuickVectorImageGeneratorPrivate/Qt6QuickVectorImageGeneratorPrivateTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/Qt6QuickVectorImageGeneratorPrivate/Qt6QuickVectorImageGeneratorPrivateTargets.cmake +lib/cmake/Qt6QuickVectorImageGeneratorPrivate/Qt6QuickVectorImageGeneratorPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6QuickVectorImageGeneratorPrivate/Qt6QuickVectorImageGeneratorPrivateVersionlessTargets.cmake lib/cmake/Qt6QuickWidgets/Qt6QuickWidgetsAdditionalTargetInfo.cmake lib/cmake/Qt6QuickWidgets/Qt6QuickWidgetsConfig.cmake lib/cmake/Qt6QuickWidgets/Qt6QuickWidgetsConfigVersion.cmake @@ -2080,6 +2264,7 @@ lib/cmake/Qt6QuickWidgets/Qt6QuickWidgetsConfigVersionImpl.cmake lib/cmake/Qt6QuickWidgets/Qt6QuickWidgetsDependencies.cmake lib/cmake/Qt6QuickWidgets/Qt6QuickWidgetsTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6QuickWidgets/Qt6QuickWidgetsTargets.cmake +lib/cmake/Qt6QuickWidgets/Qt6QuickWidgetsVersionlessAliasTargets.cmake lib/cmake/Qt6QuickWidgets/Qt6QuickWidgetsVersionlessTargets.cmake %%QT_BINDIR%%/qml %%QT_BINDIR%%/qmldom @@ -2103,6 +2288,10 @@ lib/cmake/Qt6QuickWidgets/Qt6QuickWidgetsVersionlessTargets.cmake %%QT_LIBDIR%%/libQt6LabsFolderListModel.so %%QT_LIBDIR%%/libQt6LabsFolderListModel.so.6 %%QT_LIBDIR%%/libQt6LabsFolderListModel.so.%%FULLVER%% +%%QT_LIBDIR%%/libQt6LabsPlatform.prl +%%QT_LIBDIR%%/libQt6LabsPlatform.so +%%QT_LIBDIR%%/libQt6LabsPlatform.so.6 +%%QT_LIBDIR%%/libQt6LabsPlatform.so.%%FULLVER%% %%QT_LIBDIR%%/libQt6LabsQmlModels.prl %%QT_LIBDIR%%/libQt6LabsQmlModels.so %%QT_LIBDIR%%/libQt6LabsQmlModels.so.6 @@ -2125,8 +2314,8 @@ lib/cmake/Qt6QuickWidgets/Qt6QuickWidgetsVersionlessTargets.cmake %%QT_LIBDIR%%/libQt6Qml.so %%QT_LIBDIR%%/libQt6Qml.so.6 %%QT_LIBDIR%%/libQt6Qml.so.%%FULLVER%% -%%QT_LIBDIR%%/libQt6QmlBuiltins.a -%%QT_LIBDIR%%/libQt6QmlBuiltins.prl +%%QT_LIBDIR%%/libQt6QmlAssetDownloader.a +%%QT_LIBDIR%%/libQt6QmlAssetDownloader.prl %%QT_LIBDIR%%/libQt6QmlCompiler.prl %%QT_LIBDIR%%/libQt6QmlCompiler.so %%QT_LIBDIR%%/libQt6QmlCompiler.so.6 @@ -2145,6 +2334,10 @@ lib/cmake/Qt6QuickWidgets/Qt6QuickWidgetsVersionlessTargets.cmake %%QT_LIBDIR%%/libQt6QmlLocalStorage.so %%QT_LIBDIR%%/libQt6QmlLocalStorage.so.6 %%QT_LIBDIR%%/libQt6QmlLocalStorage.so.%%FULLVER%% +%%QT_LIBDIR%%/libQt6QmlMeta.prl +%%QT_LIBDIR%%/libQt6QmlMeta.so +%%QT_LIBDIR%%/libQt6QmlMeta.so.6 +%%QT_LIBDIR%%/libQt6QmlMeta.so.%%FULLVER%% %%QT_LIBDIR%%/libQt6QmlModels.prl %%QT_LIBDIR%%/libQt6QmlModels.so %%QT_LIBDIR%%/libQt6QmlModels.so.6 @@ -2181,6 +2374,10 @@ lib/cmake/Qt6QuickWidgets/Qt6QuickWidgetsVersionlessTargets.cmake %%QT_LIBDIR%%/libQt6QuickControls2BasicStyleImpl.so %%QT_LIBDIR%%/libQt6QuickControls2BasicStyleImpl.so.6 %%QT_LIBDIR%%/libQt6QuickControls2BasicStyleImpl.so.%%FULLVER%% +%%QT_LIBDIR%%/libQt6QuickControls2FluentWinUI3StyleImpl.prl +%%QT_LIBDIR%%/libQt6QuickControls2FluentWinUI3StyleImpl.so +%%QT_LIBDIR%%/libQt6QuickControls2FluentWinUI3StyleImpl.so.6 +%%QT_LIBDIR%%/libQt6QuickControls2FluentWinUI3StyleImpl.so.%%FULLVER%% %%QT_LIBDIR%%/libQt6QuickControls2Fusion.prl %%QT_LIBDIR%%/libQt6QuickControls2Fusion.so %%QT_LIBDIR%%/libQt6QuickControls2Fusion.so.6 @@ -2257,25 +2454,35 @@ lib/cmake/Qt6QuickWidgets/Qt6QuickWidgetsVersionlessTargets.cmake %%QT_LIBDIR%%/libQt6QuickTest.so.%%FULLVER%% %%QT_LIBDIR%%/libQt6QuickTestUtils.a %%QT_LIBDIR%%/libQt6QuickTestUtils.prl +%%QT_LIBDIR%%/libQt6QuickVectorImage.prl +%%QT_LIBDIR%%/libQt6QuickVectorImage.so +%%QT_LIBDIR%%/libQt6QuickVectorImage.so.6 +%%QT_LIBDIR%%/libQt6QuickVectorImage.so.%%FULLVER%% +%%QT_LIBDIR%%/libQt6QuickVectorImageGenerator.prl +%%QT_LIBDIR%%/libQt6QuickVectorImageGenerator.so +%%QT_LIBDIR%%/libQt6QuickVectorImageGenerator.so.6 +%%QT_LIBDIR%%/libQt6QuickVectorImageGenerator.so.%%FULLVER%% %%QT_LIBDIR%%/libQt6QuickWidgets.prl %%QT_LIBDIR%%/libQt6QuickWidgets.so %%QT_LIBDIR%%/libQt6QuickWidgets.so.6 %%QT_LIBDIR%%/libQt6QuickWidgets.so.%%FULLVER%% %%QT_LIBDIR%%/metatypes/qt6labsanimation_%%CMAKE_BUILD_TYPE%%_metatypes.json %%QT_LIBDIR%%/metatypes/qt6labsfolderlistmodel_%%CMAKE_BUILD_TYPE%%_metatypes.json +%%QT_LIBDIR%%/metatypes/qt6labsplatform_%%CMAKE_BUILD_TYPE%%_metatypes.json %%QT_LIBDIR%%/metatypes/qt6labsqmlmodels_%%CMAKE_BUILD_TYPE%%_metatypes.json %%QT_LIBDIR%%/metatypes/qt6labssettings_%%CMAKE_BUILD_TYPE%%_metatypes.json %%QT_LIBDIR%%/metatypes/qt6labssharedimage_%%CMAKE_BUILD_TYPE%%_metatypes.json %%QT_LIBDIR%%/metatypes/qt6labswavefrontmesh_%%CMAKE_BUILD_TYPE%%_metatypes.json %%QT_LIBDIR%%/metatypes/qt6packetprotocolprivate_%%CMAKE_BUILD_TYPE%%_metatypes.json %%QT_LIBDIR%%/metatypes/qt6qml_%%CMAKE_BUILD_TYPE%%_metatypes.json -%%QT_LIBDIR%%/metatypes/qt6qmlbuiltins_%%CMAKE_BUILD_TYPE%%_metatypes.json +%%QT_LIBDIR%%/metatypes/qt6qmlassetdownloader_%%CMAKE_BUILD_TYPE%%_metatypes.json %%QT_LIBDIR%%/metatypes/qt6qmlcompiler_%%CMAKE_BUILD_TYPE%%_metatypes.json %%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/qt6qmllocalstorage_%%CMAKE_BUILD_TYPE%%_metatypes.json %%QT_LIBDIR%%/metatypes/qt6qmllsprivate_%%CMAKE_BUILD_TYPE%%_metatypes.json +%%QT_LIBDIR%%/metatypes/qt6qmlmeta_%%CMAKE_BUILD_TYPE%%_metatypes.json %%QT_LIBDIR%%/metatypes/qt6qmlmodels_%%CMAKE_BUILD_TYPE%%_metatypes.json %%QT_LIBDIR%%/metatypes/qt6qmlnetwork_%%CMAKE_BUILD_TYPE%%_metatypes.json %%QT_LIBDIR%%/metatypes/qt6qmltoolingsettingsprivate_%%CMAKE_BUILD_TYPE%%_metatypes.json @@ -2286,6 +2493,7 @@ lib/cmake/Qt6QuickWidgets/Qt6QuickWidgetsVersionlessTargets.cmake %%QT_LIBDIR%%/metatypes/qt6quickcontrols2_%%CMAKE_BUILD_TYPE%%_metatypes.json %%QT_LIBDIR%%/metatypes/qt6quickcontrols2basic_%%CMAKE_BUILD_TYPE%%_metatypes.json %%QT_LIBDIR%%/metatypes/qt6quickcontrols2basicstyleimpl_%%CMAKE_BUILD_TYPE%%_metatypes.json +%%QT_LIBDIR%%/metatypes/qt6quickcontrols2fluentwinui3styleimpl_%%CMAKE_BUILD_TYPE%%_metatypes.json %%QT_LIBDIR%%/metatypes/qt6quickcontrols2fusion_%%CMAKE_BUILD_TYPE%%_metatypes.json %%QT_LIBDIR%%/metatypes/qt6quickcontrols2fusionstyleimpl_%%CMAKE_BUILD_TYPE%%_metatypes.json %%QT_LIBDIR%%/metatypes/qt6quickcontrols2imagine_%%CMAKE_BUILD_TYPE%%_metatypes.json @@ -2306,6 +2514,8 @@ lib/cmake/Qt6QuickWidgets/Qt6QuickWidgetsVersionlessTargets.cmake %%QT_LIBDIR%%/metatypes/qt6quicktemplates2_%%CMAKE_BUILD_TYPE%%_metatypes.json %%QT_LIBDIR%%/metatypes/qt6quicktest_%%CMAKE_BUILD_TYPE%%_metatypes.json %%QT_LIBDIR%%/metatypes/qt6quicktestutilsprivate_%%CMAKE_BUILD_TYPE%%_metatypes.json +%%QT_LIBDIR%%/metatypes/qt6quickvectorimage_%%CMAKE_BUILD_TYPE%%_metatypes.json +%%QT_LIBDIR%%/metatypes/qt6quickvectorimagegeneratorprivate_%%CMAKE_BUILD_TYPE%%_metatypes.json %%QT_LIBDIR%%/metatypes/qt6quickwidgets_%%CMAKE_BUILD_TYPE%%_metatypes.json %%QT_MKSPECDIR%%/features/qmlcache.prf %%QT_MKSPECDIR%%/features/qmltypes.prf @@ -2314,6 +2524,8 @@ lib/cmake/Qt6QuickWidgets/Qt6QuickWidgetsVersionlessTargets.cmake %%QT_MKSPECDIR%%/modules/qt_lib_labsanimation_private.pri %%QT_MKSPECDIR%%/modules/qt_lib_labsfolderlistmodel.pri %%QT_MKSPECDIR%%/modules/qt_lib_labsfolderlistmodel_private.pri +%%QT_MKSPECDIR%%/modules/qt_lib_labsplatform.pri +%%QT_MKSPECDIR%%/modules/qt_lib_labsplatform_private.pri %%QT_MKSPECDIR%%/modules/qt_lib_labsqmlmodels.pri %%QT_MKSPECDIR%%/modules/qt_lib_labsqmlmodels_private.pri %%QT_MKSPECDIR%%/modules/qt_lib_labssettings.pri @@ -2325,8 +2537,8 @@ lib/cmake/Qt6QuickWidgets/Qt6QuickWidgetsVersionlessTargets.cmake %%QT_MKSPECDIR%%/modules/qt_lib_packetprotocol_private.pri %%QT_MKSPECDIR%%/modules/qt_lib_qml.pri %%QT_MKSPECDIR%%/modules/qt_lib_qml_private.pri -%%QT_MKSPECDIR%%/modules/qt_lib_qmlbuiltins.pri -%%QT_MKSPECDIR%%/modules/qt_lib_qmlbuiltins_private.pri +%%QT_MKSPECDIR%%/modules/qt_lib_qmlassetdownloader.pri +%%QT_MKSPECDIR%%/modules/qt_lib_qmlassetdownloader_private.pri %%QT_MKSPECDIR%%/modules/qt_lib_qmlcompiler.pri %%QT_MKSPECDIR%%/modules/qt_lib_qmlcompiler_private.pri %%QT_MKSPECDIR%%/modules/qt_lib_qmlcore.pri @@ -2338,6 +2550,8 @@ lib/cmake/Qt6QuickWidgets/Qt6QuickWidgetsVersionlessTargets.cmake %%QT_MKSPECDIR%%/modules/qt_lib_qmllocalstorage.pri %%QT_MKSPECDIR%%/modules/qt_lib_qmllocalstorage_private.pri %%QT_MKSPECDIR%%/modules/qt_lib_qmlls_private.pri +%%QT_MKSPECDIR%%/modules/qt_lib_qmlmeta.pri +%%QT_MKSPECDIR%%/modules/qt_lib_qmlmeta_private.pri %%QT_MKSPECDIR%%/modules/qt_lib_qmlmodels.pri %%QT_MKSPECDIR%%/modules/qt_lib_qmlmodels_private.pri %%QT_MKSPECDIR%%/modules/qt_lib_qmlnetwork.pri @@ -2358,6 +2572,8 @@ lib/cmake/Qt6QuickWidgets/Qt6QuickWidgetsVersionlessTargets.cmake %%QT_MKSPECDIR%%/modules/qt_lib_quickcontrols2basic_private.pri %%QT_MKSPECDIR%%/modules/qt_lib_quickcontrols2basicstyleimpl.pri %%QT_MKSPECDIR%%/modules/qt_lib_quickcontrols2basicstyleimpl_private.pri +%%QT_MKSPECDIR%%/modules/qt_lib_quickcontrols2fluentwinui3styleimpl.pri +%%QT_MKSPECDIR%%/modules/qt_lib_quickcontrols2fluentwinui3styleimpl_private.pri %%QT_MKSPECDIR%%/modules/qt_lib_quickcontrols2fusion.pri %%QT_MKSPECDIR%%/modules/qt_lib_quickcontrols2fusion_private.pri %%QT_MKSPECDIR%%/modules/qt_lib_quickcontrols2fusionstyleimpl.pri @@ -2391,11 +2607,15 @@ lib/cmake/Qt6QuickWidgets/Qt6QuickWidgetsVersionlessTargets.cmake %%QT_MKSPECDIR%%/modules/qt_lib_quicktemplates2.pri %%QT_MKSPECDIR%%/modules/qt_lib_quicktemplates2_private.pri %%QT_MKSPECDIR%%/modules/qt_lib_quicktestutilsprivate_private.pri +%%QT_MKSPECDIR%%/modules/qt_lib_quickvectorimage.pri +%%QT_MKSPECDIR%%/modules/qt_lib_quickvectorimage_private.pri +%%QT_MKSPECDIR%%/modules/qt_lib_quickvectorimagegenerator_private.pri %%QT_MKSPECDIR%%/modules/qt_lib_quickwidgets.pri %%QT_MKSPECDIR%%/modules/qt_lib_quickwidgets_private.pri %%DEBUG%%%%QT_LIBDIR%%/objects-Debug/QmlTypeRegistrarPrivate_resources_1/.qt/rcc/qrc_jsRootMetaTypes_init.cpp.o %%NO_DEBUG%%%%QT_LIBDIR%%/objects-Release/QmlTypeRegistrarPrivate_resources_1/.qt/rcc/qrc_jsRootMetaTypes_init.cpp.o %%QT_PLUGINDIR%%/qmllint/libquicklintplugin.so +%%QT_PLUGINDIR%%/qmlls/libqmllsquickplugin.so %%QT_PLUGINDIR%%/qmltooling/libqmldbg_debugger.so %%QT_PLUGINDIR%%/qmltooling/libqmldbg_inspector.so %%QT_PLUGINDIR%%/qmltooling/libqmldbg_local.so @@ -2407,6 +2627,16 @@ lib/cmake/Qt6QuickWidgets/Qt6QuickWidgetsVersionlessTargets.cmake %%QT_PLUGINDIR%%/qmltooling/libqmldbg_quickprofiler.so %%QT_PLUGINDIR%%/qmltooling/libqmldbg_server.so %%QT_PLUGINDIR%%/qmltooling/libqmldbg_tcp.so +%%QT_QMLDIR%%/Assets/Downloader/libqmlassetdownloaderplugin.a +%%QT_QMLDIR%%/Assets/Downloader/libqmlassetdownloaderplugin.prl +%%DEBUG%%%%QT_QMLDIR%%/Assets/Downloader/objects-Debug/QmlAssetDownloader_resources_1/.qt/rcc/qrc_qmake_Assets_Downloader_init.cpp.o +%%NO_DEBUG%%%%QT_QMLDIR%%/Assets/Downloader/objects-Release/QmlAssetDownloader_resources_1/.qt/rcc/qrc_qmake_Assets_Downloader_init.cpp.o +%%DEBUG%%%%QT_QMLDIR%%/Assets/Downloader/objects-Debug/QmlAssetDownloaderplugin_init/QmlAssetDownloaderplugin_init.cpp.o +%%NO_DEBUG%%%%QT_QMLDIR%%/Assets/Downloader/objects-Release/QmlAssetDownloaderplugin_init/QmlAssetDownloaderplugin_init.cpp.o +%%QT_QMLDIR%%/Assets/Downloader/plugins.qmltypes +%%QT_QMLDIR%%/Assets/Downloader/qmldir +%%QT_QMLDIR%%/QML/plugins.qmltypes +%%QT_QMLDIR%%/QML/qmldir %%QT_QMLDIR%%/QmlTime/qmldir %%QT_QMLDIR%%/QmlTime/qmltime.qmltypes %%QT_QMLDIR%%/Qt/labs/animation/liblabsanimationplugin.so @@ -2415,7 +2645,7 @@ lib/cmake/Qt6QuickWidgets/Qt6QuickWidgetsVersionlessTargets.cmake %%QT_QMLDIR%%/Qt/labs/folderlistmodel/libqmlfolderlistmodelplugin.so %%QT_QMLDIR%%/Qt/labs/folderlistmodel/plugins.qmltypes %%QT_QMLDIR%%/Qt/labs/folderlistmodel/qmldir -%%QT_QMLDIR%%/Qt/labs/platform/libqtlabsplatformplugin.so +%%QT_QMLDIR%%/Qt/labs/platform/liblabsplatformplugin.so %%QT_QMLDIR%%/Qt/labs/platform/plugins.qmltypes %%QT_QMLDIR%%/Qt/labs/platform/qmldir %%QT_QMLDIR%%/Qt/labs/qmlmodels/liblabsmodelsplugin.so @@ -2441,9 +2671,6 @@ lib/cmake/Qt6QuickWidgets/Qt6QuickWidgetsVersionlessTargets.cmake %%QT_QMLDIR%%/QtNetwork/libqmlnetworkplugin.so %%QT_QMLDIR%%/QtNetwork/plugins.qmltypes %%QT_QMLDIR%%/QtNetwork/qmldir -%%QT_QMLDIR%%/QtQml/Base/libqmlplugin.so -%%QT_QMLDIR%%/QtQml/Base/plugins.qmltypes -%%QT_QMLDIR%%/QtQml/Base/qmldir %%QT_QMLDIR%%/QtQml/Models/libmodelsplugin.so %%QT_QMLDIR%%/QtQml/Models/plugins.qmltypes %%QT_QMLDIR%%/QtQml/Models/qmldir @@ -2453,7 +2680,8 @@ lib/cmake/Qt6QuickWidgets/Qt6QuickWidgetsVersionlessTargets.cmake %%QT_QMLDIR%%/QtQml/XmlListModel/libqmlxmllistmodelplugin.so %%QT_QMLDIR%%/QtQml/XmlListModel/plugins.qmltypes %%QT_QMLDIR%%/QtQml/XmlListModel/qmldir -%%QT_QMLDIR%%/QtQml/libqmlmetaplugin.so +%%QT_QMLDIR%%/QtQml/libqmlplugin.so +%%QT_QMLDIR%%/QtQml/plugins.qmltypes %%QT_QMLDIR%%/QtQml/qmldir %%QT_QMLDIR%%/QtQuick/Controls/Basic/AbstractButton.qml %%QT_QMLDIR%%/QtQuick/Controls/Basic/Action.qml @@ -2525,6 +2753,842 @@ lib/cmake/Qt6QuickWidgets/Qt6QuickWidgetsVersionlessTargets.cmake %%QT_QMLDIR%%/QtQuick/Controls/Basic/libqtquickcontrols2basicstyleplugin.so %%QT_QMLDIR%%/QtQuick/Controls/Basic/plugins.qmltypes %%QT_QMLDIR%%/QtQuick/Controls/Basic/qmldir +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/ApplicationWindow.qml +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/BusyIndicator.qml +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/Button.qml +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/CheckBox.qml +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/CheckDelegate.qml +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/ComboBox.qml +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/Config.qml +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/DelayButton.qml +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/Dialog.qml +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/DialogButtonBox.qml +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/FocusFrame.qml +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/Frame.qml +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/GroupBox.qml +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/ItemDelegate.qml +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/Menu.qml +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/MenuBar.qml +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/MenuBarItem.qml +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/MenuItem.qml +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/MenuSeparator.qml +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/PageIndicator.qml +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/Popup.qml +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/ProgressBar.qml +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/RadioButton.qml +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/RadioDelegate.qml +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/RangeSlider.qml +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/RoundButton.qml +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/Slider.qml +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/SpinBox.qml +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/StyleImage.qml +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/SwipeDelegate.qml +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/Switch.qml +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/SwitchDelegate.qml +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/TabBar.qml +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/TabButton.qml +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/TextArea.qml +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/TextField.qml +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/ToolBar.qml +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/ToolButton.qml +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/ToolSeparator.qml +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/ToolTip.qml +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/checkbox-indicator-checked-disabled.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/checkbox-indicator-checked-disabled@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/checkbox-indicator-checked-disabled@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/checkbox-indicator-checked-hovered.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/checkbox-indicator-checked-hovered@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/checkbox-indicator-checked-hovered@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/checkbox-indicator-checked-pressed.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/checkbox-indicator-checked-pressed@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/checkbox-indicator-checked-pressed@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/checkbox-indicator-checked.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/checkbox-indicator-checked@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/checkbox-indicator-checked@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/checkbox-indicator-disabled-partiallyChecked.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/checkbox-indicator-disabled-partiallyChecked@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/checkbox-indicator-disabled-partiallyChecked@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/checkbox-indicator-disabled.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/checkbox-indicator-disabled@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/checkbox-indicator-disabled@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/checkbox-indicator-hovered-partiallyChecked.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/checkbox-indicator-hovered-partiallyChecked@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/checkbox-indicator-hovered-partiallyChecked@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/checkbox-indicator-hovered.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/checkbox-indicator-hovered@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/checkbox-indicator-hovered@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/checkbox-indicator-partiallyChecked-pressed.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/checkbox-indicator-partiallyChecked-pressed@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/checkbox-indicator-partiallyChecked-pressed@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/checkbox-indicator-partiallyChecked.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/checkbox-indicator-partiallyChecked@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/checkbox-indicator-partiallyChecked@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/checkbox-indicator-pressed.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/checkbox-indicator-pressed@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/checkbox-indicator-pressed@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/checkbox-indicator.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/checkbox-indicator@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/checkbox-indicator@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/combobox-background-disabled.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/combobox-background-disabled@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/combobox-background-disabled@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/combobox-background-focused.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/combobox-background-focused@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/combobox-background-focused@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/combobox-background-hovered-open.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/combobox-background-hovered-open@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/combobox-background-hovered-open@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/combobox-background-hovered.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/combobox-background-hovered@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/combobox-background-hovered@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/combobox-background-open-pressed.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/combobox-background-open-pressed@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/combobox-background-open-pressed@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/combobox-background-open.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/combobox-background-open@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/combobox-background-open@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/combobox-background-pressed.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/combobox-background-pressed@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/combobox-background-pressed@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/combobox-background.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/combobox-background@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/combobox-background@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/combobox-indicator-disabled.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/combobox-indicator-disabled@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/combobox-indicator-disabled@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/combobox-indicator-focused.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/combobox-indicator-focused@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/combobox-indicator-focused@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/combobox-indicator-hovered-open.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/combobox-indicator-hovered-open@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/combobox-indicator-hovered-open@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/combobox-indicator-hovered.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/combobox-indicator-hovered@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/combobox-indicator-hovered@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/combobox-indicator-open-pressed.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/combobox-indicator-open-pressed@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/combobox-indicator-open-pressed@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/combobox-indicator-open.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/combobox-indicator-open@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/combobox-indicator-open@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/combobox-indicator-pressed.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/combobox-indicator-pressed@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/combobox-indicator-pressed@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/combobox-indicator.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/combobox-indicator@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/combobox-indicator@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/editablecombobox-background-hovered-open.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/editablecombobox-background-hovered-open@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/editablecombobox-background-hovered-open@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/editablecombobox-background-open-pressed.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/editablecombobox-background-open-pressed@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/editablecombobox-background-open-pressed@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/editablecombobox-background-open.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/editablecombobox-background-open@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/editablecombobox-background-open@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/editablecombobox-indicator-hovered-open.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/editablecombobox-indicator-hovered-open@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/editablecombobox-indicator-hovered-open@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/editablecombobox-indicator-open-pressed.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/editablecombobox-indicator-open-pressed@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/editablecombobox-indicator-open-pressed@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/editablecombobox-indicator-open.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/editablecombobox-indicator-open@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/editablecombobox-indicator-open@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/editablecombobox-popup-background-hovered-open.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/editablecombobox-popup-background-hovered-open@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/editablecombobox-popup-background-hovered-open@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/editablecombobox-popup-background-open-pressed.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/editablecombobox-popup-background-open-pressed@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/editablecombobox-popup-background-open-pressed@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/editablecombobox-popup-background-open.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/editablecombobox-popup-background-open@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/editablecombobox-popup-background-open@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/frame-background-disabled.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/frame-background-disabled@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/frame-background-disabled@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/frame-background.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/frame-background@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/frame-background@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/itemdelegate-background-highlighted-hovered.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/itemdelegate-background-highlighted-hovered@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/itemdelegate-background-highlighted-hovered@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/itemdelegate-background-highlighted-pressed.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/itemdelegate-background-highlighted-pressed@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/itemdelegate-background-highlighted-pressed@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/itemdelegate-background-highlighted.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/itemdelegate-background-highlighted@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/itemdelegate-background-highlighted@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/itemdelegate-background-hovered.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/itemdelegate-background-hovered@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/itemdelegate-background-hovered@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/itemdelegate-background-pressed.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/itemdelegate-background-pressed@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/itemdelegate-background-pressed@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/pageindicatordelegate-indicator-delegate-current-hovered.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/pageindicatordelegate-indicator-delegate-current-hovered@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/pageindicatordelegate-indicator-delegate-current-hovered@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/pageindicatordelegate-indicator-delegate-current-pressed.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/pageindicatordelegate-indicator-delegate-current-pressed@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/pageindicatordelegate-indicator-delegate-current-pressed@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/pageindicatordelegate-indicator-delegate-current.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/pageindicatordelegate-indicator-delegate-current@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/pageindicatordelegate-indicator-delegate-current@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/pageindicatordelegate-indicator-delegate-pressed.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/pageindicatordelegate-indicator-delegate-pressed@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/pageindicatordelegate-indicator-delegate-pressed@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/pageindicatordelegate-indicator-disabled.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/pageindicatordelegate-indicator-disabled@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/pageindicatordelegate-indicator-disabled@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/pageindicatordelegate-indicator-hovered.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/pageindicatordelegate-indicator-hovered@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/pageindicatordelegate-indicator-hovered@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/pageindicatordelegate-indicator.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/pageindicatordelegate-indicator@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/pageindicatordelegate-indicator@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/popup-background.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/popup-background@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/popup-background@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/progressbar-groove-disabled.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/progressbar-groove-disabled@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/progressbar-groove-disabled@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/progressbar-groove.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/progressbar-groove@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/progressbar-groove@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/radiobutton-indicator-checked-disabled.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/radiobutton-indicator-checked-disabled@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/radiobutton-indicator-checked-disabled@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/radiobutton-indicator-checked-hovered.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/radiobutton-indicator-checked-hovered@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/radiobutton-indicator-checked-hovered@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/radiobutton-indicator-checked-pressed.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/radiobutton-indicator-checked-pressed@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/radiobutton-indicator-checked-pressed@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/radiobutton-indicator-checked.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/radiobutton-indicator-checked@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/radiobutton-indicator-checked@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/radiobutton-indicator-disabled.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/radiobutton-indicator-disabled@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/radiobutton-indicator-disabled@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/radiobutton-indicator-hovered.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/radiobutton-indicator-hovered@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/radiobutton-indicator-hovered@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/radiobutton-indicator-pressed.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/radiobutton-indicator-pressed@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/radiobutton-indicator-pressed@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/radiobutton-indicator.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/radiobutton-indicator@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/radiobutton-indicator@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/rangeslider-first-handle-disabled.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/rangeslider-first-handle-disabled@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/rangeslider-first-handle-disabled@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/rangeslider-first-handle-handle-pressed.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/rangeslider-first-handle-handle-pressed@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/rangeslider-first-handle-handle-pressed@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/rangeslider-first-handle-hovered.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/rangeslider-first-handle-hovered@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/rangeslider-first-handle-hovered@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/rangeslider-first-handle.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/rangeslider-first-handle@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/rangeslider-first-handle@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/rangeslider-groove-disabled.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/rangeslider-groove-disabled@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/rangeslider-groove-disabled@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/rangeslider-groove-handle-pressed.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/rangeslider-groove-handle-pressed@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/rangeslider-groove-handle-pressed@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/rangeslider-groove-hovered.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/rangeslider-groove-hovered@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/rangeslider-groove-hovered@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/rangeslider-groove.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/rangeslider-groove@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/rangeslider-groove@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/rangeslider-second-handle-disabled.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/rangeslider-second-handle-disabled@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/rangeslider-second-handle-disabled@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/rangeslider-second-handle-handle-pressed.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/rangeslider-second-handle-handle-pressed@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/rangeslider-second-handle-handle-pressed@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/rangeslider-second-handle-hovered.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/rangeslider-second-handle-hovered@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/rangeslider-second-handle-hovered@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/rangeslider-second-handle.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/rangeslider-second-handle@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/rangeslider-second-handle@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/slider-groove-disabled.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/slider-groove-disabled@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/slider-groove-disabled@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/slider-groove-hovered.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/slider-groove-hovered@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/slider-groove-hovered@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/slider-groove-pressed.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/slider-groove-pressed@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/slider-groove-pressed@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/slider-groove.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/slider-groove@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/slider-groove@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/slider-handle-disabled.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/slider-handle-disabled@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/slider-handle-disabled@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/slider-handle-hovered.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/slider-handle-hovered@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/slider-handle-hovered@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/slider-handle-pressed.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/slider-handle-pressed@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/slider-handle-pressed@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/slider-handle.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/slider-handle@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/slider-handle@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-background-atlimit.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-background-atlimit@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-background-atlimit@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-background-disabled.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-background-disabled@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-background-disabled@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-background-down-hovered.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-background-down-hovered@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-background-down-hovered@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-background-down-pressed.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-background-down-pressed@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-background-down-pressed@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-background-hovered.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-background-hovered@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-background-hovered@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-background-up-hovered.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-background-up-hovered@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-background-up-hovered@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-background-up-pressed.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-background-up-pressed@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-background-up-pressed@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-background.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-background@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-background@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-down-background-atlimit.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-down-background-atlimit@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-down-background-atlimit@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-down-background-disabled.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-down-background-disabled@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-down-background-disabled@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-down-background-down-hovered.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-down-background-down-hovered@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-down-background-down-hovered@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-down-background-down-pressed.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-down-background-down-pressed@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-down-background-down-pressed@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-down-background-hovered.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-down-background-hovered@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-down-background-hovered@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-down-background-up-hovered.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-down-background-up-hovered@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-down-background-up-hovered@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-down-background-up-pressed.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-down-background-up-pressed@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-down-background-up-pressed@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-down-background.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-down-background@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-down-background@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-down-icon-atlimit.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-down-icon-atlimit@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-down-icon-atlimit@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-down-icon-disabled.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-down-icon-disabled@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-down-icon-disabled@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-down-icon-down-hovered.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-down-icon-down-hovered@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-down-icon-down-hovered@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-down-icon-down-pressed.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-down-icon-down-pressed@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-down-icon-down-pressed@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-down-icon-hovered.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-down-icon-hovered@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-down-icon-hovered@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-down-icon-up-hovered.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-down-icon-up-hovered@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-down-icon-up-hovered@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-down-icon-up-pressed.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-down-icon-up-pressed@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-down-icon-up-pressed@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-down-icon.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-down-icon@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-down-icon@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-up-background-atlimit.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-up-background-atlimit@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-up-background-atlimit@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-up-background-disabled.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-up-background-disabled@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-up-background-disabled@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-up-background-down-hovered.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-up-background-down-hovered@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-up-background-down-hovered@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-up-background-down-pressed.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-up-background-down-pressed@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-up-background-down-pressed@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-up-background-hovered.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-up-background-hovered@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-up-background-hovered@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-up-background-up-hovered.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-up-background-up-hovered@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-up-background-up-hovered@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-up-background-up-pressed.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-up-background-up-pressed@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-up-background-up-pressed@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-up-background.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-up-background@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-up-background@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-up-icon-atlimit.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-up-icon-atlimit@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-up-icon-atlimit@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-up-icon-disabled.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-up-icon-disabled@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-up-icon-disabled@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-up-icon-down-hovered.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-up-icon-down-hovered@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-up-icon-down-hovered@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-up-icon-down-pressed.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-up-icon-down-pressed@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-up-icon-down-pressed@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-up-icon-hovered.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-up-icon-hovered@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-up-icon-hovered@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-up-icon-up-hovered.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-up-icon-up-hovered@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-up-icon-up-hovered@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-up-icon-up-pressed.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-up-icon-up-pressed@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-up-icon-up-pressed@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-up-icon.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-up-icon@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/spinbox-indicator-up-icon@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/textarea-background-disabled.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/textarea-background-disabled@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/textarea-background-disabled@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/textarea-background-focused.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/textarea-background-focused@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/textarea-background-focused@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/textarea-background-hovered.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/textarea-background-hovered@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/textarea-background-hovered@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/textarea-background.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/textarea-background@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/textarea-background@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/textfield-background-disabled.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/textfield-background-disabled@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/textfield-background-disabled@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/textfield-background-focused.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/textfield-background-focused@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/textfield-background-focused@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/textfield-background-hovered.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/textfield-background-hovered@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/textfield-background-hovered@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/textfield-background.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/textfield-background@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/dark/images/textfield-background@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/icons/checkmark.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/icons/checkmark@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/icons/checkmark@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/icons/menuarrow.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/icons/menuarrow@2x.png +%%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/RadioIndicator.qml +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/impl/SwitchIndicator.qml +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/impl/libqtquickcontrols2fluentwinui3styleimplplugin.so +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/impl/plugins.qmltypes +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/impl/qmldir +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/libqtquickcontrols2fluentwinui3styleplugin.so +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/checkbox-indicator-checked-disabled.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/checkbox-indicator-checked-disabled@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/checkbox-indicator-checked-disabled@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/checkbox-indicator-checked-hovered.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/checkbox-indicator-checked-hovered@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/checkbox-indicator-checked-hovered@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/checkbox-indicator-checked-pressed.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/checkbox-indicator-checked-pressed@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/checkbox-indicator-checked-pressed@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/checkbox-indicator-checked.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/checkbox-indicator-checked@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/checkbox-indicator-checked@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/checkbox-indicator-disabled-partiallyChecked.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/checkbox-indicator-disabled-partiallyChecked@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/checkbox-indicator-disabled-partiallyChecked@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/checkbox-indicator-disabled.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/checkbox-indicator-disabled@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/checkbox-indicator-disabled@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/checkbox-indicator-hovered-partiallyChecked.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/checkbox-indicator-hovered-partiallyChecked@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/checkbox-indicator-hovered-partiallyChecked@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/checkbox-indicator-hovered.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/checkbox-indicator-hovered@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/checkbox-indicator-hovered@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/checkbox-indicator-partiallyChecked-pressed.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/checkbox-indicator-partiallyChecked-pressed@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/checkbox-indicator-partiallyChecked-pressed@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/checkbox-indicator-partiallyChecked.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/checkbox-indicator-partiallyChecked@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/checkbox-indicator-partiallyChecked@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/checkbox-indicator-pressed.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/checkbox-indicator-pressed@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/checkbox-indicator-pressed@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/checkbox-indicator.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/checkbox-indicator@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/checkbox-indicator@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/combobox-background-disabled.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/combobox-background-disabled@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/combobox-background-disabled@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/combobox-background-focused.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/combobox-background-focused@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/combobox-background-focused@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/combobox-background-hovered-open.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/combobox-background-hovered-open@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/combobox-background-hovered-open@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/combobox-background-hovered.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/combobox-background-hovered@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/combobox-background-hovered@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/combobox-background-open-pressed.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/combobox-background-open-pressed@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/combobox-background-open-pressed@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/combobox-background-open.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/combobox-background-open@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/combobox-background-open@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/combobox-background-pressed.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/combobox-background-pressed@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/combobox-background-pressed@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/combobox-background.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/combobox-background@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/combobox-background@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/combobox-indicator-disabled.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/combobox-indicator-disabled@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/combobox-indicator-disabled@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/combobox-indicator-focused.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/combobox-indicator-focused@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/combobox-indicator-focused@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/combobox-indicator-hovered-open.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/combobox-indicator-hovered-open@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/combobox-indicator-hovered-open@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/combobox-indicator-hovered.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/combobox-indicator-hovered@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/combobox-indicator-hovered@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/combobox-indicator-open-pressed.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/combobox-indicator-open-pressed@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/combobox-indicator-open-pressed@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/combobox-indicator-open.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/combobox-indicator-open@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/combobox-indicator-open@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/combobox-indicator-pressed.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/combobox-indicator-pressed@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/combobox-indicator-pressed@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/combobox-indicator.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/combobox-indicator@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/combobox-indicator@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/editablecombobox-background-hovered-open.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/editablecombobox-background-hovered-open@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/editablecombobox-background-hovered-open@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/editablecombobox-background-open-pressed.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/editablecombobox-background-open-pressed@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/editablecombobox-background-open-pressed@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/editablecombobox-background-open.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/editablecombobox-background-open@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/editablecombobox-background-open@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/editablecombobox-indicator-hovered-open.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/editablecombobox-indicator-hovered-open@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/editablecombobox-indicator-hovered-open@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/editablecombobox-indicator-open-pressed.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/editablecombobox-indicator-open-pressed@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/editablecombobox-indicator-open-pressed@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/editablecombobox-indicator-open.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/editablecombobox-indicator-open@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/editablecombobox-indicator-open@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/editablecombobox-popup-background-hovered-open.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/editablecombobox-popup-background-hovered-open@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/editablecombobox-popup-background-hovered-open@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/editablecombobox-popup-background-open-pressed.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/editablecombobox-popup-background-open-pressed@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/editablecombobox-popup-background-open-pressed@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/editablecombobox-popup-background-open.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/editablecombobox-popup-background-open@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/editablecombobox-popup-background-open@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/frame-background-disabled.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/frame-background-disabled@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/frame-background-disabled@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/frame-background.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/frame-background@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/frame-background@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/itemdelegate-background-highlighted-hovered.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/itemdelegate-background-highlighted-hovered@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/itemdelegate-background-highlighted-hovered@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/itemdelegate-background-highlighted-pressed.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/itemdelegate-background-highlighted-pressed@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/itemdelegate-background-highlighted-pressed@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/itemdelegate-background-highlighted.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/itemdelegate-background-highlighted@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/itemdelegate-background-highlighted@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/itemdelegate-background-hovered.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/itemdelegate-background-hovered@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/itemdelegate-background-hovered@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/itemdelegate-background-pressed.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/itemdelegate-background-pressed@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/itemdelegate-background-pressed@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/pageindicatordelegate-indicator-delegate-current-hovered.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/pageindicatordelegate-indicator-delegate-current-hovered@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/pageindicatordelegate-indicator-delegate-current-hovered@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/pageindicatordelegate-indicator-delegate-current-pressed.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/pageindicatordelegate-indicator-delegate-current-pressed@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/pageindicatordelegate-indicator-delegate-current-pressed@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/pageindicatordelegate-indicator-delegate-current.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/pageindicatordelegate-indicator-delegate-current@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/pageindicatordelegate-indicator-delegate-current@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/pageindicatordelegate-indicator-delegate-pressed.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/pageindicatordelegate-indicator-delegate-pressed@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/pageindicatordelegate-indicator-delegate-pressed@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/pageindicatordelegate-indicator-disabled.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/pageindicatordelegate-indicator-disabled@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/pageindicatordelegate-indicator-disabled@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/pageindicatordelegate-indicator-hovered.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/pageindicatordelegate-indicator-hovered@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/pageindicatordelegate-indicator-hovered@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/pageindicatordelegate-indicator.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/pageindicatordelegate-indicator@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/pageindicatordelegate-indicator@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/popup-background.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/popup-background@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/popup-background@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/progressbar-groove-disabled.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/progressbar-groove-disabled@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/progressbar-groove-disabled@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/progressbar-groove.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/progressbar-groove@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/progressbar-groove@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/radiobutton-indicator-checked-disabled.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/radiobutton-indicator-checked-disabled@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/radiobutton-indicator-checked-disabled@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/radiobutton-indicator-checked-hovered.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/radiobutton-indicator-checked-hovered@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/radiobutton-indicator-checked-hovered@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/radiobutton-indicator-checked-pressed.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/radiobutton-indicator-checked-pressed@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/radiobutton-indicator-checked-pressed@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/radiobutton-indicator-checked.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/radiobutton-indicator-checked@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/radiobutton-indicator-checked@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/radiobutton-indicator-disabled.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/radiobutton-indicator-disabled@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/radiobutton-indicator-disabled@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/radiobutton-indicator-hovered.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/radiobutton-indicator-hovered@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/radiobutton-indicator-hovered@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/radiobutton-indicator-pressed.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/radiobutton-indicator-pressed@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/radiobutton-indicator-pressed@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/radiobutton-indicator.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/radiobutton-indicator@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/radiobutton-indicator@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/rangeslider-first-handle-disabled.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/rangeslider-first-handle-disabled@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/rangeslider-first-handle-disabled@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/rangeslider-first-handle-handle-pressed.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/rangeslider-first-handle-handle-pressed@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/rangeslider-first-handle-handle-pressed@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/rangeslider-first-handle-hovered.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/rangeslider-first-handle-hovered@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/rangeslider-first-handle-hovered@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/rangeslider-first-handle.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/rangeslider-first-handle@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/rangeslider-first-handle@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/rangeslider-groove-disabled.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/rangeslider-groove-disabled@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/rangeslider-groove-disabled@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/rangeslider-groove-handle-pressed.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/rangeslider-groove-handle-pressed@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/rangeslider-groove-handle-pressed@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/rangeslider-groove-hovered.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/rangeslider-groove-hovered@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/rangeslider-groove-hovered@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/rangeslider-groove.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/rangeslider-groove@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/rangeslider-groove@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/rangeslider-second-handle-disabled.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/rangeslider-second-handle-disabled@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/rangeslider-second-handle-disabled@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/rangeslider-second-handle-handle-pressed.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/rangeslider-second-handle-handle-pressed@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/rangeslider-second-handle-handle-pressed@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/rangeslider-second-handle-hovered.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/rangeslider-second-handle-hovered@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/rangeslider-second-handle-hovered@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/rangeslider-second-handle.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/rangeslider-second-handle@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/rangeslider-second-handle@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/slider-groove-disabled.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/slider-groove-disabled@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/slider-groove-disabled@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/slider-groove-hovered.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/slider-groove-hovered@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/slider-groove-hovered@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/slider-groove-pressed.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/slider-groove-pressed@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/slider-groove-pressed@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/slider-groove.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/slider-groove@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/slider-groove@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/slider-handle-disabled.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/slider-handle-disabled@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/slider-handle-disabled@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/slider-handle-hovered.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/slider-handle-hovered@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/slider-handle-hovered@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/slider-handle-pressed.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/slider-handle-pressed@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/slider-handle-pressed@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/slider-handle.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/slider-handle@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/slider-handle@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-background-atlimit.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-background-atlimit@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-background-atlimit@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-background-disabled.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-background-disabled@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-background-disabled@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-background-down-hovered.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-background-down-hovered@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-background-down-hovered@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-background-down-pressed.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-background-down-pressed@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-background-down-pressed@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-background-hovered.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-background-hovered@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-background-hovered@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-background-up-hovered.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-background-up-hovered@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-background-up-hovered@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-background-up-pressed.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-background-up-pressed@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-background-up-pressed@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-background.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-background@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-background@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-down-background-atlimit.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-down-background-atlimit@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-down-background-atlimit@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-down-background-disabled.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-down-background-disabled@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-down-background-disabled@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-down-background-down-hovered.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-down-background-down-hovered@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-down-background-down-hovered@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-down-background-down-pressed.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-down-background-down-pressed@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-down-background-down-pressed@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-down-background-hovered.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-down-background-hovered@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-down-background-hovered@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-down-background-up-hovered.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-down-background-up-hovered@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-down-background-up-hovered@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-down-background-up-pressed.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-down-background-up-pressed@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-down-background-up-pressed@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-down-background.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-down-background@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-down-background@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-down-icon-atlimit.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-down-icon-atlimit@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-down-icon-atlimit@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-down-icon-disabled.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-down-icon-disabled@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-down-icon-disabled@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-down-icon-down-hovered.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-down-icon-down-hovered@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-down-icon-down-hovered@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-down-icon-down-pressed.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-down-icon-down-pressed@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-down-icon-down-pressed@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-down-icon-hovered.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-down-icon-hovered@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-down-icon-hovered@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-down-icon-up-hovered.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-down-icon-up-hovered@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-down-icon-up-hovered@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-down-icon-up-pressed.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-down-icon-up-pressed@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-down-icon-up-pressed@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-down-icon.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-down-icon@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-down-icon@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-up-background-atlimit.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-up-background-atlimit@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-up-background-atlimit@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-up-background-disabled.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-up-background-disabled@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-up-background-disabled@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-up-background-down-hovered.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-up-background-down-hovered@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-up-background-down-hovered@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-up-background-down-pressed.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-up-background-down-pressed@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-up-background-down-pressed@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-up-background-hovered.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-up-background-hovered@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-up-background-hovered@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-up-background-up-hovered.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-up-background-up-hovered@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-up-background-up-hovered@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-up-background-up-pressed.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-up-background-up-pressed@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-up-background-up-pressed@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-up-background.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-up-background@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-up-background@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-up-icon-atlimit.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-up-icon-atlimit@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-up-icon-atlimit@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-up-icon-disabled.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-up-icon-disabled@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-up-icon-disabled@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-up-icon-down-hovered.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-up-icon-down-hovered@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-up-icon-down-hovered@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-up-icon-down-pressed.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-up-icon-down-pressed@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-up-icon-down-pressed@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-up-icon-hovered.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-up-icon-hovered@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-up-icon-hovered@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-up-icon-up-hovered.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-up-icon-up-hovered@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-up-icon-up-hovered@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-up-icon-up-pressed.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-up-icon-up-pressed@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-up-icon-up-pressed@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-up-icon.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-up-icon@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/spinbox-indicator-up-icon@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/textarea-background-disabled.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/textarea-background-disabled@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/textarea-background-disabled@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/textarea-background-focused.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/textarea-background-focused@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/textarea-background-focused@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/textarea-background-hovered.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/textarea-background-hovered@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/textarea-background-hovered@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/textarea-background.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/textarea-background@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/textarea-background@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/textfield-background-disabled.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/textfield-background-disabled@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/textfield-background-disabled@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/textfield-background-focused.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/textfield-background-focused@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/textfield-background-focused@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/textfield-background-hovered.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/textfield-background-hovered@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/textfield-background-hovered@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/textfield-background.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/textfield-background@2x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/light/images/textfield-background@3x.png +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/plugins.qmltypes +%%QT_QMLDIR%%/QtQuick/Controls/FluentWinUI3/qmldir %%QT_QMLDIR%%/QtQuick/Controls/Fusion/ApplicationWindow.qml %%QT_QMLDIR%%/QtQuick/Controls/Fusion/BusyIndicator.qml %%QT_QMLDIR%%/QtQuick/Controls/Fusion/Button.qml @@ -2994,6 +4058,7 @@ lib/cmake/Qt6QuickWidgets/Qt6QuickWidgetsVersionlessTargets.cmake %%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 @@ -3006,6 +4071,9 @@ lib/cmake/Qt6QuickWidgets/Qt6QuickWidgetsVersionlessTargets.cmake %%QT_QMLDIR%%/QtQuick/Templates/libqtquicktemplates2plugin.so %%QT_QMLDIR%%/QtQuick/Templates/plugins.qmltypes %%QT_QMLDIR%%/QtQuick/Templates/qmldir +%%QT_QMLDIR%%/QtQuick/VectorImage/libqquickvectorimageplugin.so +%%QT_QMLDIR%%/QtQuick/VectorImage/plugins.qmltypes +%%QT_QMLDIR%%/QtQuick/VectorImage/qmldir %%QT_QMLDIR%%/QtQuick/Window/libquickwindowplugin.so %%QT_QMLDIR%%/QtQuick/Window/qmldir %%QT_QMLDIR%%/QtQuick/Window/quickwindow.qmltypes @@ -3032,18 +4100,21 @@ lib/cmake/Qt6QuickWidgets/Qt6QuickWidgetsVersionlessTargets.cmake %%QT_QMLDIR%%/QtTest/testlogger.js %%QT_QMLDIR%%/builtins.qmltypes %%QT_QMLDIR%%/jsroot.qmltypes +%%QT_SBOMDIR%%/qtdeclarative-%%FULLVER%%.spdx libdata/pkgconfig/Qt6LabsAnimation.pc libdata/pkgconfig/Qt6LabsFolderListModel.pc +libdata/pkgconfig/Qt6LabsPlatform.pc libdata/pkgconfig/Qt6LabsQmlModels.pc libdata/pkgconfig/Qt6LabsSettings.pc libdata/pkgconfig/Qt6LabsSharedImage.pc libdata/pkgconfig/Qt6LabsWavefrontMesh.pc libdata/pkgconfig/Qt6Qml.pc -libdata/pkgconfig/Qt6QmlBuiltins.pc +libdata/pkgconfig/Qt6QmlAssetDownloader.pc libdata/pkgconfig/Qt6QmlCompiler.pc libdata/pkgconfig/Qt6QmlCore.pc libdata/pkgconfig/Qt6QmlIntegration.pc libdata/pkgconfig/Qt6QmlLocalStorage.pc +libdata/pkgconfig/Qt6QmlMeta.pc libdata/pkgconfig/Qt6QmlModels.pc libdata/pkgconfig/Qt6QmlNetwork.pc libdata/pkgconfig/Qt6QmlWorkerScript.pc @@ -3052,6 +4123,7 @@ libdata/pkgconfig/Qt6Quick.pc libdata/pkgconfig/Qt6QuickControls2.pc libdata/pkgconfig/Qt6QuickControls2Basic.pc libdata/pkgconfig/Qt6QuickControls2BasicStyleImpl.pc +libdata/pkgconfig/Qt6QuickControls2FluentWinUI3StyleImpl.pc libdata/pkgconfig/Qt6QuickControls2Fusion.pc libdata/pkgconfig/Qt6QuickControls2FusionStyleImpl.pc libdata/pkgconfig/Qt6QuickControls2Imagine.pc @@ -3067,20 +4139,23 @@ libdata/pkgconfig/Qt6QuickDialogs2Utils.pc libdata/pkgconfig/Qt6QuickLayouts.pc libdata/pkgconfig/Qt6QuickTemplates2.pc libdata/pkgconfig/Qt6QuickTest.pc +libdata/pkgconfig/Qt6QuickVectorImage.pc libdata/pkgconfig/Qt6QuickWidgets.pc +%%QT_TOOLDIR%%/qmlaotstats %%QT_TOOLDIR%%/qmlcachegen %%QT_TOOLDIR%%/qmlimportscanner %%QT_TOOLDIR%%/qmljsrootgen %%QT_TOOLDIR%%/qmltyperegistrar %%QT_DATADIR%%/modules/LabsAnimation.json %%QT_DATADIR%%/modules/LabsFolderListModel.json +%%QT_DATADIR%%/modules/LabsPlatform.json %%QT_DATADIR%%/modules/LabsQmlModels.json %%QT_DATADIR%%/modules/LabsSettings.json %%QT_DATADIR%%/modules/LabsSharedImage.json %%QT_DATADIR%%/modules/LabsWavefrontMesh.json %%QT_DATADIR%%/modules/PacketProtocolPrivate.json %%QT_DATADIR%%/modules/Qml.json -%%QT_DATADIR%%/modules/QmlBuiltins.json +%%QT_DATADIR%%/modules/QmlAssetDownloader.json %%QT_DATADIR%%/modules/QmlCompiler.json %%QT_DATADIR%%/modules/QmlCore.json %%QT_DATADIR%%/modules/QmlDebugPrivate.json @@ -3088,6 +4163,7 @@ libdata/pkgconfig/Qt6QuickWidgets.pc %%QT_DATADIR%%/modules/QmlIntegration.json %%QT_DATADIR%%/modules/QmlLSPrivate.json %%QT_DATADIR%%/modules/QmlLocalStorage.json +%%QT_DATADIR%%/modules/QmlMeta.json %%QT_DATADIR%%/modules/QmlModels.json %%QT_DATADIR%%/modules/QmlNetwork.json %%QT_DATADIR%%/modules/QmlToolingSettingsPrivate.json @@ -3098,6 +4174,7 @@ libdata/pkgconfig/Qt6QuickWidgets.pc %%QT_DATADIR%%/modules/QuickControls2.json %%QT_DATADIR%%/modules/QuickControls2Basic.json %%QT_DATADIR%%/modules/QuickControls2BasicStyleImpl.json +%%QT_DATADIR%%/modules/QuickControls2FluentWinUI3StyleImpl.json %%QT_DATADIR%%/modules/QuickControls2Fusion.json %%QT_DATADIR%%/modules/QuickControls2FusionStyleImpl.json %%QT_DATADIR%%/modules/QuickControls2Imagine.json @@ -3118,5 +4195,7 @@ libdata/pkgconfig/Qt6QuickWidgets.pc %%QT_DATADIR%%/modules/QuickTemplates2.json %%QT_DATADIR%%/modules/QuickTest.json %%QT_DATADIR%%/modules/QuickTestUtilsPrivate.json +%%QT_DATADIR%%/modules/QuickVectorImage.json +%%QT_DATADIR%%/modules/QuickVectorImageGeneratorPrivate.json %%QT_DATADIR%%/modules/QuickWidgets.json @dir lib/cmake/Qt6 diff --git a/x11-toolkits/qt6-graphs/distinfo b/x11-toolkits/qt6-graphs/distinfo index ba4fce5425c8..4a96a8f541c2 100644 --- a/x11-toolkits/qt6-graphs/distinfo +++ b/x11-toolkits/qt6-graphs/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1727500702 -SHA256 (KDE/Qt/6.7.3/qtgraphs-everywhere-src-6.7.3.tar.xz) = c309decc63cc14881494e1d1bfb20e398ed00b401648abbddc7ea73e1de86c8f -SIZE (KDE/Qt/6.7.3/qtgraphs-everywhere-src-6.7.3.tar.xz) = 4395644 +TIMESTAMP = 1733205764 +SHA256 (KDE/Qt/6.8.1/qtgraphs-everywhere-src-6.8.1.tar.xz) = 1e46e3de69936835652ab40ef8caf5824ea71e26871274561fb65ec142d54a80 +SIZE (KDE/Qt/6.8.1/qtgraphs-everywhere-src-6.8.1.tar.xz) = 4826412 diff --git a/x11-toolkits/qt6-graphs/pkg-plist b/x11-toolkits/qt6-graphs/pkg-plist index 5689ba3dfb86..b71122504506 100644 --- a/x11-toolkits/qt6-graphs/pkg-plist +++ b/x11-toolkits/qt6-graphs/pkg-plist @@ -1,4 +1,5 @@ %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/abstractitemmodelhandler_p.h +%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/arearenderer_p.h %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/axisgrid_p.h %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/axisline_p.h %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/axisrenderer_p.h @@ -11,34 +12,43 @@ %%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/graphsglobal_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 -%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/q3dinputhandler_p.h %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/q3dscene_p.h -%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/q3dtheme_p.h %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qabstract3daxis_p.h -%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qabstract3dinputhandler_p.h %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qabstract3dseries_p.h %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qabstractaxis_p.h -%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qabstractbarseries_p.h %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qabstractdataproxy_p.h %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qabstractseries_p.h +%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qareaseries_p.h %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qbar3dseries_p.h %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qbarcategoryaxis_p.h %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qbardataproxy_p.h +%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qbarmodelmapper_p.h %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qbarseries_p.h %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qbarset_p.h %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qcategory3daxis_p.h %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qcustom3ditem_p.h %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qcustom3dlabel_p.h %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qcustom3dvolume_p.h +%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qdatetimeaxis_p.h +%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qgraphanimation_p.h +%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qgraphpointanimation_p.h +%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qgraphsglobal_p.h +%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qgraphsinputhandler_p.h +%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qgraphstheme_p.h %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qgraphsview_p.h +%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qgraphtransition_p.h %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qheightmapsurfacedataproxy_p.h %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qitemmodelbardataproxy_p.h %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qitemmodelscatterdataproxy_p.h %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qitemmodelsurfacedataproxy_p.h %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qlineseries_p.h %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qlogvalue3daxisformatter_p.h +%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qpiemodelmapper_p.h +%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qpieseries_p.h +%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qpieslice_p.h %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qquickgraphsbars_p.h %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qquickgraphsbarsseries_p.h %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qquickgraphscolor_p.h @@ -51,115 +61,136 @@ %%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/qsplinecontrolanimation_p.h +%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qsplineseries_p.h %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qsurface3dseries_p.h %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qsurfacedataproxy_p.h -%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qtouch3dinputhandler_p.h +%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qtgraphs-config_p.h %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qvalue3daxis_p.h %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qvalue3daxisformatter_p.h %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qvalueaxis_p.h +%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qxymodelmapper_p.h %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qxypoint_p.h %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qxyseries_p.h +%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qxyseriesanimation_p.h %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/scatterinstancing_p.h %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/scatteritemmodelhandler_p.h %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/surfaceitemmodelhandler_p.h -%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/surfaceselectioninstancing_p.h -%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/thememanager_p.h %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/utils_p.h -%%QT_INCDIR%%/QtGraphs/Q3DBars -%%QT_INCDIR%%/QtGraphs/Q3DInputHandler -%%QT_INCDIR%%/QtGraphs/Q3DScatter %%QT_INCDIR%%/QtGraphs/Q3DScene -%%QT_INCDIR%%/QtGraphs/Q3DSurface -%%QT_INCDIR%%/QtGraphs/Q3DTheme %%QT_INCDIR%%/QtGraphs/QAbstract3DAxis -%%QT_INCDIR%%/QtGraphs/QAbstract3DGraph -%%QT_INCDIR%%/QtGraphs/QAbstract3DInputHandler %%QT_INCDIR%%/QtGraphs/QAbstract3DSeries %%QT_INCDIR%%/QtGraphs/QAbstractAxis -%%QT_INCDIR%%/QtGraphs/QAbstractBarSeries %%QT_INCDIR%%/QtGraphs/QAbstractDataProxy %%QT_INCDIR%%/QtGraphs/QAbstractSeries +%%QT_INCDIR%%/QtGraphs/QAreaSeries %%QT_INCDIR%%/QtGraphs/QBar3DSeries %%QT_INCDIR%%/QtGraphs/QBarCategoryAxis %%QT_INCDIR%%/QtGraphs/QBarDataItem %%QT_INCDIR%%/QtGraphs/QBarDataProxy +%%QT_INCDIR%%/QtGraphs/QBarModelMapper %%QT_INCDIR%%/QtGraphs/QBarSeries %%QT_INCDIR%%/QtGraphs/QBarSet %%QT_INCDIR%%/QtGraphs/QCategory3DAxis %%QT_INCDIR%%/QtGraphs/QCustom3DItem %%QT_INCDIR%%/QtGraphs/QCustom3DLabel %%QT_INCDIR%%/QtGraphs/QCustom3DVolume -%%QT_INCDIR%%/QtGraphs/QGraphTheme +%%QT_INCDIR%%/QtGraphs/QDateTimeAxis +%%QT_INCDIR%%/QtGraphs/QGraphsLine +%%QT_INCDIR%%/QtGraphs/QGraphsTheme +%%QT_INCDIR%%/QtGraphs/QGraphsThemeDirtyBitField %%QT_INCDIR%%/QtGraphs/QHeightMapSurfaceDataProxy %%QT_INCDIR%%/QtGraphs/QItemModelBarDataProxy %%QT_INCDIR%%/QtGraphs/QItemModelScatterDataProxy %%QT_INCDIR%%/QtGraphs/QItemModelSurfaceDataProxy +%%QT_INCDIR%%/QtGraphs/QLegendData %%QT_INCDIR%%/QtGraphs/QLineSeries %%QT_INCDIR%%/QtGraphs/QLogValue3DAxisFormatter +%%QT_INCDIR%%/QtGraphs/QPieModelMapper +%%QT_INCDIR%%/QtGraphs/QPieSeries +%%QT_INCDIR%%/QtGraphs/QPieSlice %%QT_INCDIR%%/QtGraphs/QScatter3DSeries %%QT_INCDIR%%/QtGraphs/QScatterDataItem %%QT_INCDIR%%/QtGraphs/QScatterDataProxy %%QT_INCDIR%%/QtGraphs/QScatterSeries -%%QT_INCDIR%%/QtGraphs/QSeriesTheme +%%QT_INCDIR%%/QtGraphs/QSplineSeries %%QT_INCDIR%%/QtGraphs/QSurface3DSeries %%QT_INCDIR%%/QtGraphs/QSurfaceDataItem %%QT_INCDIR%%/QtGraphs/QSurfaceDataProxy -%%QT_INCDIR%%/QtGraphs/QTouch3DInputHandler %%QT_INCDIR%%/QtGraphs/QValue3DAxis %%QT_INCDIR%%/QtGraphs/QValue3DAxisFormatter %%QT_INCDIR%%/QtGraphs/QValueAxis +%%QT_INCDIR%%/QtGraphs/QXYModelMapper %%QT_INCDIR%%/QtGraphs/QXYSeries %%QT_INCDIR%%/QtGraphs/QtGraphs %%QT_INCDIR%%/QtGraphs/QtGraphsDepends %%QT_INCDIR%%/QtGraphs/QtGraphsVersion -%%QT_INCDIR%%/QtGraphs/q3dbars.h -%%QT_INCDIR%%/QtGraphs/q3dinputhandler.h -%%QT_INCDIR%%/QtGraphs/q3dscatter.h %%QT_INCDIR%%/QtGraphs/q3dscene.h -%%QT_INCDIR%%/QtGraphs/q3dsurface.h -%%QT_INCDIR%%/QtGraphs/q3dtheme.h %%QT_INCDIR%%/QtGraphs/qabstract3daxis.h -%%QT_INCDIR%%/QtGraphs/qabstract3dgraph.h -%%QT_INCDIR%%/QtGraphs/qabstract3dinputhandler.h %%QT_INCDIR%%/QtGraphs/qabstract3dseries.h %%QT_INCDIR%%/QtGraphs/qabstractaxis.h -%%QT_INCDIR%%/QtGraphs/qabstractbarseries.h %%QT_INCDIR%%/QtGraphs/qabstractdataproxy.h %%QT_INCDIR%%/QtGraphs/qabstractseries.h +%%QT_INCDIR%%/QtGraphs/qareaseries.h %%QT_INCDIR%%/QtGraphs/qbar3dseries.h %%QT_INCDIR%%/QtGraphs/qbarcategoryaxis.h %%QT_INCDIR%%/QtGraphs/qbardataitem.h %%QT_INCDIR%%/QtGraphs/qbardataproxy.h +%%QT_INCDIR%%/QtGraphs/qbarmodelmapper.h %%QT_INCDIR%%/QtGraphs/qbarseries.h %%QT_INCDIR%%/QtGraphs/qbarset.h %%QT_INCDIR%%/QtGraphs/qcategory3daxis.h %%QT_INCDIR%%/QtGraphs/qcustom3ditem.h %%QT_INCDIR%%/QtGraphs/qcustom3dlabel.h %%QT_INCDIR%%/QtGraphs/qcustom3dvolume.h +%%QT_INCDIR%%/QtGraphs/qdatetimeaxis.h +%%QT_INCDIR%%/QtGraphs/qgraphs3dnamespace.h %%QT_INCDIR%%/QtGraphs/qgraphsglobal.h -%%QT_INCDIR%%/QtGraphs/qgraphtheme.h +%%QT_INCDIR%%/QtGraphs/qgraphstheme.h %%QT_INCDIR%%/QtGraphs/qheightmapsurfacedataproxy.h %%QT_INCDIR%%/QtGraphs/qitemmodelbardataproxy.h %%QT_INCDIR%%/QtGraphs/qitemmodelscatterdataproxy.h %%QT_INCDIR%%/QtGraphs/qitemmodelsurfacedataproxy.h %%QT_INCDIR%%/QtGraphs/qlineseries.h %%QT_INCDIR%%/QtGraphs/qlogvalue3daxisformatter.h +%%QT_INCDIR%%/QtGraphs/qpiemodelmapper.h +%%QT_INCDIR%%/QtGraphs/qpieseries.h +%%QT_INCDIR%%/QtGraphs/qpieslice.h %%QT_INCDIR%%/QtGraphs/qscatter3dseries.h %%QT_INCDIR%%/QtGraphs/qscatterdataitem.h %%QT_INCDIR%%/QtGraphs/qscatterdataproxy.h %%QT_INCDIR%%/QtGraphs/qscatterseries.h -%%QT_INCDIR%%/QtGraphs/qseriestheme.h +%%QT_INCDIR%%/QtGraphs/qsplineseries.h %%QT_INCDIR%%/QtGraphs/qsurface3dseries.h %%QT_INCDIR%%/QtGraphs/qsurfacedataitem.h %%QT_INCDIR%%/QtGraphs/qsurfacedataproxy.h +%%QT_INCDIR%%/QtGraphs/qtgraphs-config.h %%QT_INCDIR%%/QtGraphs/qtgraphsexports.h %%QT_INCDIR%%/QtGraphs/qtgraphsversion.h -%%QT_INCDIR%%/QtGraphs/qtouch3dinputhandler.h %%QT_INCDIR%%/QtGraphs/qutils.h %%QT_INCDIR%%/QtGraphs/qvalue3daxis.h %%QT_INCDIR%%/QtGraphs/qvalue3daxisformatter.h %%QT_INCDIR%%/QtGraphs/qvalueaxis.h +%%QT_INCDIR%%/QtGraphs/qxymodelmapper.h %%QT_INCDIR%%/QtGraphs/qxyseries.h +%%QT_INCDIR%%/QtGraphsWidgets/%%FULLVER%%/QtGraphsWidgets/private/q3dbarswidgetitem_p.h +%%QT_INCDIR%%/QtGraphsWidgets/%%FULLVER%%/QtGraphsWidgets/private/q3dgraphswidgetitem_p.h +%%QT_INCDIR%%/QtGraphsWidgets/%%FULLVER%%/QtGraphsWidgets/private/q3dscatterwidgetitem_p.h +%%QT_INCDIR%%/QtGraphsWidgets/%%FULLVER%%/QtGraphsWidgets/private/q3dsurfacewidgetitem_p.h +%%QT_INCDIR%%/QtGraphsWidgets/Q3DBarsWidgetItem +%%QT_INCDIR%%/QtGraphsWidgets/Q3DGraphsWidgetItem +%%QT_INCDIR%%/QtGraphsWidgets/Q3DScatterWidgetItem +%%QT_INCDIR%%/QtGraphsWidgets/Q3DSurfaceWidgetItem +%%QT_INCDIR%%/QtGraphsWidgets/QtGraphsWidgets +%%QT_INCDIR%%/QtGraphsWidgets/QtGraphsWidgetsDepends +%%QT_INCDIR%%/QtGraphsWidgets/QtGraphsWidgetsVersion +%%QT_INCDIR%%/QtGraphsWidgets/q3dbarswidgetitem.h +%%QT_INCDIR%%/QtGraphsWidgets/q3dgraphswidgetitem.h +%%QT_INCDIR%%/QtGraphsWidgets/q3dscatterwidgetitem.h +%%QT_INCDIR%%/QtGraphsWidgets/q3dsurfacewidgetitem.h +%%QT_INCDIR%%/QtGraphsWidgets/qgraphswidgetsglobal.h +%%QT_INCDIR%%/QtGraphsWidgets/qtgraphswidgetsexports.h +%%QT_INCDIR%%/QtGraphsWidgets/qtgraphswidgetsversion.h lib/cmake/Qt6BuildInternals/StandaloneTests/QtGraphsTestsConfig.cmake lib/cmake/Qt6Graphs/Qt6GraphsAdditionalTargetInfo.cmake lib/cmake/Qt6Graphs/Qt6GraphsConfig.cmake @@ -168,7 +199,17 @@ lib/cmake/Qt6Graphs/Qt6GraphsConfigVersionImpl.cmake lib/cmake/Qt6Graphs/Qt6GraphsDependencies.cmake 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/Qt6GraphsWidgets/Qt6GraphsWidgetsAdditionalTargetInfo.cmake +lib/cmake/Qt6GraphsWidgets/Qt6GraphsWidgetsConfig.cmake +lib/cmake/Qt6GraphsWidgets/Qt6GraphsWidgetsConfigVersion.cmake +lib/cmake/Qt6GraphsWidgets/Qt6GraphsWidgetsConfigVersionImpl.cmake +lib/cmake/Qt6GraphsWidgets/Qt6GraphsWidgetsDependencies.cmake +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/Qt6Qml/QmlPlugins/Qt6GraphspluginAdditionalTargetInfo.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6GraphspluginConfig.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6GraphspluginConfigVersion.cmake @@ -179,9 +220,16 @@ lib/cmake/Qt6Qml/QmlPlugins/Qt6GraphspluginTargets.cmake %%QT_LIBDIR%%/libQt6Graphs.so %%QT_LIBDIR%%/libQt6Graphs.so.6 %%QT_LIBDIR%%/libQt6Graphs.so.%%FULLVER%% +%%QT_LIBDIR%%/libQt6GraphsWidgets.prl +%%QT_LIBDIR%%/libQt6GraphsWidgets.so +%%QT_LIBDIR%%/libQt6GraphsWidgets.so.6 +%%QT_LIBDIR%%/libQt6GraphsWidgets.so.%%FULLVER%% %%QT_LIBDIR%%/metatypes/qt6graphs_%%CMAKE_BUILD_TYPE%%_metatypes.json +%%QT_LIBDIR%%/metatypes/qt6graphswidgets_%%CMAKE_BUILD_TYPE%%_metatypes.json %%QT_MKSPECDIR%%/modules/qt_lib_graphs.pri %%QT_MKSPECDIR%%/modules/qt_lib_graphs_private.pri +%%QT_MKSPECDIR%%/modules/qt_lib_graphswidgets.pri +%%QT_MKSPECDIR%%/modules/qt_lib_graphswidgets_private.pri %%QT_QMLDIR%%/QtGraphs/Graphs.qmltypes %%QT_QMLDIR%%/QtGraphs/designer/Bars3DSpecifics.qml %%QT_QMLDIR%%/QtGraphs/designer/GraphsCameraSection.qml @@ -189,27 +237,39 @@ lib/cmake/Qt6Qml/QmlPlugins/Qt6GraphspluginTargets.cmake %%QT_QMLDIR%%/QtGraphs/designer/GraphsViewSpecifics.qml %%QT_QMLDIR%%/QtGraphs/designer/Scatter3DSpecifics.qml %%QT_QMLDIR%%/QtGraphs/designer/Surface3DSpecifics.qml +%%QT_QMLDIR%%/QtGraphs/designer/default/AreaSeries.qml %%QT_QMLDIR%%/QtGraphs/designer/default/BarSeries.qml %%QT_QMLDIR%%/QtGraphs/designer/default/Bars3D.qml %%QT_QMLDIR%%/QtGraphs/designer/default/LineSeries.qml +%%QT_QMLDIR%%/QtGraphs/designer/default/PieSeries.qml %%QT_QMLDIR%%/QtGraphs/designer/default/Scatter3D.qml %%QT_QMLDIR%%/QtGraphs/designer/default/ScatterSeries.qml +%%QT_QMLDIR%%/QtGraphs/designer/default/SplineSeries.qml %%QT_QMLDIR%%/QtGraphs/designer/default/Surface3D.qml +%%QT_QMLDIR%%/QtGraphs/designer/images/areaseries-icon.png +%%QT_QMLDIR%%/QtGraphs/designer/images/areaseries-icon16.png %%QT_QMLDIR%%/QtGraphs/designer/images/bars3d-icon.png %%QT_QMLDIR%%/QtGraphs/designer/images/bars3d-icon16.png %%QT_QMLDIR%%/QtGraphs/designer/images/barseries-icon.png %%QT_QMLDIR%%/QtGraphs/designer/images/barseries-icon16.png -%%QT_QMLDIR%%/QtGraphs/designer/images/lineseries-chart-icon.png -%%QT_QMLDIR%%/QtGraphs/designer/images/lineseries-chart-icon16.png +%%QT_QMLDIR%%/QtGraphs/designer/images/lineseries-icon.png +%%QT_QMLDIR%%/QtGraphs/designer/images/lineseries-icon16.png +%%QT_QMLDIR%%/QtGraphs/designer/images/pieseries-icon.png +%%QT_QMLDIR%%/QtGraphs/designer/images/pieseries-icon16.png %%QT_QMLDIR%%/QtGraphs/designer/images/scatter3d-icon.png %%QT_QMLDIR%%/QtGraphs/designer/images/scatter3d-icon16.png -%%QT_QMLDIR%%/QtGraphs/designer/images/scatterseries-chart-icon.png -%%QT_QMLDIR%%/QtGraphs/designer/images/scatterseries-chart-icon16.png +%%QT_QMLDIR%%/QtGraphs/designer/images/scatterseries-icon.png +%%QT_QMLDIR%%/QtGraphs/designer/images/scatterseries-icon16.png +%%QT_QMLDIR%%/QtGraphs/designer/images/splineseries-icon.png +%%QT_QMLDIR%%/QtGraphs/designer/images/splineseries-icon16.png %%QT_QMLDIR%%/QtGraphs/designer/images/surface3d-icon.png %%QT_QMLDIR%%/QtGraphs/designer/images/surface3d-icon16.png %%QT_QMLDIR%%/QtGraphs/designer/qtgraphs.metainfo %%QT_QMLDIR%%/QtGraphs/designer/qtgraphs2d.metainfo %%QT_QMLDIR%%/QtGraphs/libgraphsplugin.so %%QT_QMLDIR%%/QtGraphs/qmldir +%%QT_SBOMDIR%%/qtgraphs-%%FULLVER%%.spdx libdata/pkgconfig/Qt6Graphs.pc +libdata/pkgconfig/Qt6GraphsWidgets.pc %%QT_DATADIR%%/modules/Graphs.json +%%QT_DATADIR%%/modules/GraphsWidgets.json diff --git a/x11-toolkits/qt6-quick3d/distinfo b/x11-toolkits/qt6-quick3d/distinfo index 7bb428dfddf1..89368fbc2589 100644 --- a/x11-toolkits/qt6-quick3d/distinfo +++ b/x11-toolkits/qt6-quick3d/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1727500704 -SHA256 (KDE/Qt/6.7.3/qtquick3d-everywhere-src-6.7.3.tar.xz) = d19a19750d42ef54860682b458adeccfd23335843d55427eb73b8228d3a79957 -SIZE (KDE/Qt/6.7.3/qtquick3d-everywhere-src-6.7.3.tar.xz) = 66208152 +TIMESTAMP = 1733205812 +SHA256 (KDE/Qt/6.8.1/qtquick3d-everywhere-src-6.8.1.tar.xz) = 3f3d345e6c95fcd40ab37e6a37cd31811e5d239dea8e142e632d4ea41bf20ce7 +SIZE (KDE/Qt/6.8.1/qtquick3d-everywhere-src-6.8.1.tar.xz) = 75292284 diff --git a/x11-toolkits/qt6-quick3d/pkg-plist b/x11-toolkits/qt6-quick3d/pkg-plist index 269fcfbf50be..06feadd29ac5 100644 --- a/x11-toolkits/qt6-quick3d/pkg-plist +++ b/x11-toolkits/qt6-quick3d/pkg-plist @@ -48,7 +48,6 @@ %%QT_INCDIR%%/QtQuick3D/%%FULLVER%%/QtQuick3D/private/qquick3dtexturedata_p.h %%QT_INCDIR%%/QtQuick3D/%%FULLVER%%/QtQuick3D/private/qquick3dutils_p.h %%QT_INCDIR%%/QtQuick3D/%%FULLVER%%/QtQuick3D/private/qquick3dviewport_p.h -%%QT_INCDIR%%/QtQuick3D/%%FULLVER%%/QtQuick3D/private/qtquick3dexports_p.h %%QT_INCDIR%%/QtQuick3D/%%FULLVER%%/QtQuick3D/private/qtquick3dglobal_p.h %%QT_INCDIR%%/QtQuick3D/%%FULLVER%%/QtQuick3D/ssg/qquick3dextensionhelpers.h %%QT_INCDIR%%/QtQuick3D/QQuick3D @@ -73,7 +72,6 @@ %%QT_INCDIR%%/QtQuick3DAssetImport/%%FULLVER%%/QtQuick3DAssetImport/private/qssgassetimporterfactory_p.h %%QT_INCDIR%%/QtQuick3DAssetImport/%%FULLVER%%/QtQuick3DAssetImport/private/qssgassetimporterplugin_p.h %%QT_INCDIR%%/QtQuick3DAssetImport/%%FULLVER%%/QtQuick3DAssetImport/private/qssgassetimportmanager_p.h -%%QT_INCDIR%%/QtQuick3DAssetImport/%%FULLVER%%/QtQuick3DAssetImport/private/qtquick3dassetimportexports_p.h %%QT_INCDIR%%/QtQuick3DAssetImport/%%FULLVER%%/QtQuick3DAssetImport/private/qtquick3dassetimportglobal_p.h %%QT_INCDIR%%/QtQuick3DAssetImport/QtQuick3DAssetImport %%QT_INCDIR%%/QtQuick3DAssetImport/QtQuick3DAssetImportDepends @@ -85,7 +83,6 @@ %%QT_INCDIR%%/QtQuick3DAssetUtils/%%FULLVER%%/QtQuick3DAssetUtils/private/qssgrtutilities_p.h %%QT_INCDIR%%/QtQuick3DAssetUtils/%%FULLVER%%/QtQuick3DAssetUtils/private/qssgscenedesc_p.h %%QT_INCDIR%%/QtQuick3DAssetUtils/%%FULLVER%%/QtQuick3DAssetUtils/private/qssgsceneedit_p.h -%%QT_INCDIR%%/QtQuick3DAssetUtils/%%FULLVER%%/QtQuick3DAssetUtils/private/qtquick3dassetutilsexports_p.h %%QT_INCDIR%%/QtQuick3DAssetUtils/%%FULLVER%%/QtQuick3DAssetUtils/private/qtquick3dassetutilsglobal_p.h %%QT_INCDIR%%/QtQuick3DAssetUtils/QtQuick3DAssetUtils %%QT_INCDIR%%/QtQuick3DAssetUtils/QtQuick3DAssetUtilsDepends @@ -106,7 +103,6 @@ %%QT_INCDIR%%/QtQuick3DGlslParser/%%FULLVER%%/QtQuick3DGlslParser/private/glslsymbols_p.h %%QT_INCDIR%%/QtQuick3DGlslParser/%%FULLVER%%/QtQuick3DGlslParser/private/glsltype_p.h %%QT_INCDIR%%/QtQuick3DGlslParser/%%FULLVER%%/QtQuick3DGlslParser/private/glsltypes_p.h -%%QT_INCDIR%%/QtQuick3DGlslParser/%%FULLVER%%/QtQuick3DGlslParser/private/qtquick3dglslparserexports_p.h %%QT_INCDIR%%/QtQuick3DGlslParser/QtQuick3DGlslParser %%QT_INCDIR%%/QtQuick3DGlslParser/QtQuick3DGlslParserDepends %%QT_INCDIR%%/QtQuick3DGlslParser/QtQuick3DGlslParserVersion @@ -120,7 +116,6 @@ %%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/qtquick3dhelpersexports_p.h %%QT_INCDIR%%/QtQuick3DHelpers/%%FULLVER%%/QtQuick3DHelpers/private/qtquick3dhelpersglobal_p.h %%QT_INCDIR%%/QtQuick3DHelpers/%%FULLVER%%/QtQuick3DHelpers/private/randominstancing_p.h %%QT_INCDIR%%/QtQuick3DHelpers/QtQuick3DHelpers @@ -138,7 +133,6 @@ %%QT_INCDIR%%/QtQuick3DHelpersImpl/qtquick3dhelpersimplversion.h %%QT_INCDIR%%/QtQuick3DIblBaker/%%FULLVER%%/QtQuick3DIblBaker/private/qssgiblbaker_p.h %%QT_INCDIR%%/QtQuick3DIblBaker/%%FULLVER%%/QtQuick3DIblBaker/private/qtquick3diblbaker_p.h -%%QT_INCDIR%%/QtQuick3DIblBaker/%%FULLVER%%/QtQuick3DIblBaker/private/qtquick3diblbakerexports_p.h %%QT_INCDIR%%/QtQuick3DIblBaker/QtQuick3DIblBaker %%QT_INCDIR%%/QtQuick3DIblBaker/QtQuick3DIblBakerDepends %%QT_INCDIR%%/QtQuick3DIblBaker/QtQuick3DIblBakerVersion @@ -174,7 +168,6 @@ %%QT_INCDIR%%/QtQuick3DParticles/%%FULLVER%%/QtQuick3DParticles/private/qquick3dparticleutils_p.h %%QT_INCDIR%%/QtQuick3DParticles/%%FULLVER%%/QtQuick3DParticles/private/qquick3dparticlevectordirection_p.h %%QT_INCDIR%%/QtQuick3DParticles/%%FULLVER%%/QtQuick3DParticles/private/qquick3dparticlewander_p.h -%%QT_INCDIR%%/QtQuick3DParticles/%%FULLVER%%/QtQuick3DParticles/private/qtquick3dparticlesexports_p.h %%QT_INCDIR%%/QtQuick3DParticles/%%FULLVER%%/QtQuick3DParticles/private/qtquick3dparticlesglobal_p.h %%QT_INCDIR%%/QtQuick3DParticles/QtQuick3DParticles %%QT_INCDIR%%/QtQuick3DParticles/QtQuick3DParticlesDepends @@ -211,7 +204,6 @@ %%QT_INCDIR%%/QtQuick3DRuntimeRender/%%FULLVER%%/QtQuick3DRuntimeRender/private/qssgrenderlayer_p.h %%QT_INCDIR%%/QtQuick3DRuntimeRender/%%FULLVER%%/QtQuick3DRuntimeRender/private/qssgrenderlight_p.h %%QT_INCDIR%%/QtQuick3DRuntimeRender/%%FULLVER%%/QtQuick3DRuntimeRender/private/qssgrenderloadedtexture_p.h -%%QT_INCDIR%%/QtQuick3DRuntimeRender/%%FULLVER%%/QtQuick3DRuntimeRender/private/qssgrendermaterialshadergenerator_p.h %%QT_INCDIR%%/QtQuick3DRuntimeRender/%%FULLVER%%/QtQuick3DRuntimeRender/private/qssgrendermesh_p.h %%QT_INCDIR%%/QtQuick3DRuntimeRender/%%FULLVER%%/QtQuick3DRuntimeRender/private/qssgrendermodel_p.h %%QT_INCDIR%%/QtQuick3DRuntimeRender/%%FULLVER%%/QtQuick3DRuntimeRender/private/qssgrendermorphtarget_p.h @@ -241,8 +233,8 @@ %%QT_INCDIR%%/QtQuick3DRuntimeRender/%%FULLVER%%/QtQuick3DRuntimeRender/private/qssgshadermapkey_p.h %%QT_INCDIR%%/QtQuick3DRuntimeRender/%%FULLVER%%/QtQuick3DRuntimeRender/private/qssgshadermaterialadapter_p.h %%QT_INCDIR%%/QtQuick3DRuntimeRender/%%FULLVER%%/QtQuick3DRuntimeRender/private/qssgshaderresourcemergecontext_p.h +%%QT_INCDIR%%/QtQuick3DRuntimeRender/%%FULLVER%%/QtQuick3DRuntimeRender/private/qssgshadowmaphelpers_p.h %%QT_INCDIR%%/QtQuick3DRuntimeRender/%%FULLVER%%/QtQuick3DRuntimeRender/private/qssgvertexpipelineimpl_p.h -%%QT_INCDIR%%/QtQuick3DRuntimeRender/%%FULLVER%%/QtQuick3DRuntimeRender/private/qtquick3druntimerenderexports_p.h %%QT_INCDIR%%/QtQuick3DRuntimeRender/%%FULLVER%%/QtQuick3DRuntimeRender/private/qtquick3druntimerenderglobal_p.h %%QT_INCDIR%%/QtQuick3DRuntimeRender/%%FULLVER%%/QtQuick3DRuntimeRender/ssg/qssglightmapper.h %%QT_INCDIR%%/QtQuick3DRuntimeRender/%%FULLVER%%/QtQuick3DRuntimeRender/ssg/qssgrendercontextcore.h @@ -271,7 +263,6 @@ %%QT_INCDIR%%/QtQuick3DUtils/%%FULLVER%%/QtQuick3DUtils/private/qssgplane_p.h %%QT_INCDIR%%/QtQuick3DUtils/%%FULLVER%%/QtQuick3DUtils/private/qssgrenderbasetypes_p.h %%QT_INCDIR%%/QtQuick3DUtils/%%FULLVER%%/QtQuick3DUtils/private/qssgutils_p.h -%%QT_INCDIR%%/QtQuick3DUtils/%%FULLVER%%/QtQuick3DUtils/private/qtquick3dutilsexports_p.h %%QT_INCDIR%%/QtQuick3DUtils/%%FULLVER%%/QtQuick3DUtils/private/qtquick3dutilsglobal_p.h %%QT_INCDIR%%/QtQuick3DUtils/%%FULLVER%%/QtQuick3DUtils/ssg/qssgrenderbasetypes.h %%QT_INCDIR%%/QtQuick3DUtils/QtQuick3DUtils @@ -279,7 +270,10 @@ %%QT_INCDIR%%/QtQuick3DUtils/QtQuick3DUtilsVersion %%QT_INCDIR%%/QtQuick3DUtils/qtquick3dutilsexports.h %%QT_INCDIR%%/QtQuick3DUtils/qtquick3dutilsversion.h +lib/cmake/Qt6/FindWrapBundledOpenXRConfigExtra.cmake +lib/cmake/Qt6/FindWrapOpenXR.cmake lib/cmake/Qt6/FindWrapQuick3DAssimp.cmake +lib/cmake/Qt6/FindWrapSystemOpenXR.cmake lib/cmake/Qt6BuildInternals/StandaloneTests/QtQuick3DTestsConfig.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6qquick3dpluginAdditionalTargetInfo.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6qquick3dpluginConfig.cmake @@ -337,6 +331,7 @@ lib/cmake/Qt6Quick3D/Qt6Quick3DDependencies.cmake lib/cmake/Qt6Quick3D/Qt6Quick3DMacros.cmake lib/cmake/Qt6Quick3D/Qt6Quick3DTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6Quick3D/Qt6Quick3DTargets.cmake +lib/cmake/Qt6Quick3D/Qt6Quick3DVersionlessAliasTargets.cmake lib/cmake/Qt6Quick3D/Qt6Quick3DVersionlessTargets.cmake lib/cmake/Qt6Quick3DAssetImport/Qt6AssimpImporterPluginAdditionalTargetInfo.cmake lib/cmake/Qt6Quick3DAssetImport/Qt6AssimpImporterPluginConfig.cmake @@ -352,6 +347,7 @@ lib/cmake/Qt6Quick3DAssetImport/Qt6Quick3DAssetImportDependencies.cmake lib/cmake/Qt6Quick3DAssetImport/Qt6Quick3DAssetImportPlugins.cmake lib/cmake/Qt6Quick3DAssetImport/Qt6Quick3DAssetImportTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6Quick3DAssetImport/Qt6Quick3DAssetImportTargets.cmake +lib/cmake/Qt6Quick3DAssetImport/Qt6Quick3DAssetImportVersionlessAliasTargets.cmake lib/cmake/Qt6Quick3DAssetImport/Qt6Quick3DAssetImportVersionlessTargets.cmake lib/cmake/Qt6Quick3DAssetUtils/Qt6Quick3DAssetUtilsAdditionalTargetInfo.cmake lib/cmake/Qt6Quick3DAssetUtils/Qt6Quick3DAssetUtilsConfig.cmake @@ -360,6 +356,7 @@ lib/cmake/Qt6Quick3DAssetUtils/Qt6Quick3DAssetUtilsConfigVersionImpl.cmake lib/cmake/Qt6Quick3DAssetUtils/Qt6Quick3DAssetUtilsDependencies.cmake lib/cmake/Qt6Quick3DAssetUtils/Qt6Quick3DAssetUtilsTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6Quick3DAssetUtils/Qt6Quick3DAssetUtilsTargets.cmake +lib/cmake/Qt6Quick3DAssetUtils/Qt6Quick3DAssetUtilsVersionlessAliasTargets.cmake lib/cmake/Qt6Quick3DAssetUtils/Qt6Quick3DAssetUtilsVersionlessTargets.cmake lib/cmake/Qt6Quick3DEffects/Qt6Quick3DEffectsAdditionalTargetInfo.cmake lib/cmake/Qt6Quick3DEffects/Qt6Quick3DEffectsConfig.cmake @@ -368,6 +365,7 @@ lib/cmake/Qt6Quick3DEffects/Qt6Quick3DEffectsConfigVersionImpl.cmake lib/cmake/Qt6Quick3DEffects/Qt6Quick3DEffectsDependencies.cmake 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/Qt6Quick3DGlslParserPrivate/Qt6Quick3DGlslParserPrivateAdditionalTargetInfo.cmake lib/cmake/Qt6Quick3DGlslParserPrivate/Qt6Quick3DGlslParserPrivateConfig.cmake @@ -376,6 +374,7 @@ lib/cmake/Qt6Quick3DGlslParserPrivate/Qt6Quick3DGlslParserPrivateConfigVersionIm lib/cmake/Qt6Quick3DGlslParserPrivate/Qt6Quick3DGlslParserPrivateDependencies.cmake lib/cmake/Qt6Quick3DGlslParserPrivate/Qt6Quick3DGlslParserPrivateTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6Quick3DGlslParserPrivate/Qt6Quick3DGlslParserPrivateTargets.cmake +lib/cmake/Qt6Quick3DGlslParserPrivate/Qt6Quick3DGlslParserPrivateVersionlessAliasTargets.cmake lib/cmake/Qt6Quick3DGlslParserPrivate/Qt6Quick3DGlslParserPrivateVersionlessTargets.cmake lib/cmake/Qt6Quick3DHelpers/Qt6Quick3DHelpersAdditionalTargetInfo.cmake lib/cmake/Qt6Quick3DHelpers/Qt6Quick3DHelpersConfig.cmake @@ -384,6 +383,7 @@ lib/cmake/Qt6Quick3DHelpers/Qt6Quick3DHelpersConfigVersionImpl.cmake lib/cmake/Qt6Quick3DHelpers/Qt6Quick3DHelpersDependencies.cmake lib/cmake/Qt6Quick3DHelpers/Qt6Quick3DHelpersTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6Quick3DHelpers/Qt6Quick3DHelpersTargets.cmake +lib/cmake/Qt6Quick3DHelpers/Qt6Quick3DHelpersVersionlessAliasTargets.cmake lib/cmake/Qt6Quick3DHelpers/Qt6Quick3DHelpersVersionlessTargets.cmake lib/cmake/Qt6Quick3DHelpersImpl/Qt6Quick3DHelpersImplAdditionalTargetInfo.cmake lib/cmake/Qt6Quick3DHelpersImpl/Qt6Quick3DHelpersImplConfig.cmake @@ -392,6 +392,7 @@ lib/cmake/Qt6Quick3DHelpersImpl/Qt6Quick3DHelpersImplConfigVersionImpl.cmake lib/cmake/Qt6Quick3DHelpersImpl/Qt6Quick3DHelpersImplDependencies.cmake lib/cmake/Qt6Quick3DHelpersImpl/Qt6Quick3DHelpersImplTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6Quick3DHelpersImpl/Qt6Quick3DHelpersImplTargets.cmake +lib/cmake/Qt6Quick3DHelpersImpl/Qt6Quick3DHelpersImplVersionlessAliasTargets.cmake lib/cmake/Qt6Quick3DHelpersImpl/Qt6Quick3DHelpersImplVersionlessTargets.cmake lib/cmake/Qt6Quick3DIblBaker/Qt6Quick3DIblBakerAdditionalTargetInfo.cmake lib/cmake/Qt6Quick3DIblBaker/Qt6Quick3DIblBakerConfig.cmake @@ -400,6 +401,7 @@ lib/cmake/Qt6Quick3DIblBaker/Qt6Quick3DIblBakerConfigVersionImpl.cmake lib/cmake/Qt6Quick3DIblBaker/Qt6Quick3DIblBakerDependencies.cmake lib/cmake/Qt6Quick3DIblBaker/Qt6Quick3DIblBakerTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6Quick3DIblBaker/Qt6Quick3DIblBakerTargets.cmake +lib/cmake/Qt6Quick3DIblBaker/Qt6Quick3DIblBakerVersionlessAliasTargets.cmake lib/cmake/Qt6Quick3DIblBaker/Qt6Quick3DIblBakerVersionlessTargets.cmake lib/cmake/Qt6Quick3DParticleEffects/Qt6Quick3DParticleEffectsAdditionalTargetInfo.cmake lib/cmake/Qt6Quick3DParticleEffects/Qt6Quick3DParticleEffectsConfig.cmake @@ -408,6 +410,7 @@ lib/cmake/Qt6Quick3DParticleEffects/Qt6Quick3DParticleEffectsConfigVersionImpl.c lib/cmake/Qt6Quick3DParticleEffects/Qt6Quick3DParticleEffectsDependencies.cmake lib/cmake/Qt6Quick3DParticleEffects/Qt6Quick3DParticleEffectsTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6Quick3DParticleEffects/Qt6Quick3DParticleEffectsTargets.cmake +lib/cmake/Qt6Quick3DParticleEffects/Qt6Quick3DParticleEffectsVersionlessAliasTargets.cmake lib/cmake/Qt6Quick3DParticleEffects/Qt6Quick3DParticleEffectsVersionlessTargets.cmake lib/cmake/Qt6Quick3DParticles/Qt6Quick3DParticlesAdditionalTargetInfo.cmake lib/cmake/Qt6Quick3DParticles/Qt6Quick3DParticlesConfig.cmake @@ -416,6 +419,7 @@ lib/cmake/Qt6Quick3DParticles/Qt6Quick3DParticlesConfigVersionImpl.cmake lib/cmake/Qt6Quick3DParticles/Qt6Quick3DParticlesDependencies.cmake lib/cmake/Qt6Quick3DParticles/Qt6Quick3DParticlesTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6Quick3DParticles/Qt6Quick3DParticlesTargets.cmake +lib/cmake/Qt6Quick3DParticles/Qt6Quick3DParticlesVersionlessAliasTargets.cmake lib/cmake/Qt6Quick3DParticles/Qt6Quick3DParticlesVersionlessTargets.cmake lib/cmake/Qt6Quick3DRuntimeRender/Qt6Quick3DRuntimeRenderAdditionalTargetInfo.cmake lib/cmake/Qt6Quick3DRuntimeRender/Qt6Quick3DRuntimeRenderConfig.cmake @@ -424,6 +428,7 @@ lib/cmake/Qt6Quick3DRuntimeRender/Qt6Quick3DRuntimeRenderConfigVersionImpl.cmake lib/cmake/Qt6Quick3DRuntimeRender/Qt6Quick3DRuntimeRenderDependencies.cmake lib/cmake/Qt6Quick3DRuntimeRender/Qt6Quick3DRuntimeRenderTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6Quick3DRuntimeRender/Qt6Quick3DRuntimeRenderTargets.cmake +lib/cmake/Qt6Quick3DRuntimeRender/Qt6Quick3DRuntimeRenderVersionlessAliasTargets.cmake lib/cmake/Qt6Quick3DRuntimeRender/Qt6Quick3DRuntimeRenderVersionlessTargets.cmake lib/cmake/Qt6Quick3DTools/Qt6Quick3DToolsAdditionalTargetInfo.cmake lib/cmake/Qt6Quick3DTools/Qt6Quick3DToolsConfig.cmake @@ -440,6 +445,7 @@ lib/cmake/Qt6Quick3DUtils/Qt6Quick3DUtilsConfigVersionImpl.cmake lib/cmake/Qt6Quick3DUtils/Qt6Quick3DUtilsDependencies.cmake lib/cmake/Qt6Quick3DUtils/Qt6Quick3DUtilsTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6Quick3DUtils/Qt6Quick3DUtilsTargets.cmake +lib/cmake/Qt6Quick3DUtils/Qt6Quick3DUtilsVersionlessAliasTargets.cmake lib/cmake/Qt6Quick3DUtils/Qt6Quick3DUtilsVersionlessTargets.cmake %%QT_BINDIR%%/balsam %%QT_BINDIR%%/balsamui @@ -875,6 +881,7 @@ lib/cmake/Qt6Quick3DUtils/Qt6Quick3DUtilsVersionlessTargets.cmake %%QT_QMLDIR%%/QtQuick3D/designer/BufferSection.qml %%QT_QMLDIR%%/QtQuick3D/designer/BufferSpecifics.qml %%QT_QMLDIR%%/QtQuick3D/designer/CameraSection.qml +%%QT_QMLDIR%%/QtQuick3D/designer/CascadesSection.qml %%QT_QMLDIR%%/QtQuick3D/designer/CubeMapTextureSpecifics.qml %%QT_QMLDIR%%/QtQuick3D/designer/CustomCameraSpecifics.qml %%QT_QMLDIR%%/QtQuick3D/designer/CustomMaterialSection.qml @@ -1058,6 +1065,7 @@ lib/cmake/Qt6Quick3DUtils/Qt6Quick3DUtilsVersionlessTargets.cmake %%QT_QMLDIR%%/QtQuick3D/designer/source/view3D_template.qml %%QT_QMLDIR%%/QtQuick3D/libqquick3dplugin.so %%QT_QMLDIR%%/QtQuick3D/qmldir +%%QT_SBOMDIR%%/qtquick3d-%%FULLVER%%.spdx libdata/pkgconfig/Qt6Quick3D.pc libdata/pkgconfig/Qt6Quick3DAssetImport.pc libdata/pkgconfig/Qt6Quick3DAssetUtils.pc diff --git a/x11-toolkits/qt6-quicktimeline/distinfo b/x11-toolkits/qt6-quicktimeline/distinfo index 1db158713f0f..3de56c34a83f 100644 --- a/x11-toolkits/qt6-quicktimeline/distinfo +++ b/x11-toolkits/qt6-quicktimeline/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1727500705 -SHA256 (KDE/Qt/6.7.3/qtquicktimeline-everywhere-src-6.7.3.tar.xz) = b7904667884c51de01b7990710001f885daf8d21a8b4188c1eece85f1503c902 -SIZE (KDE/Qt/6.7.3/qtquicktimeline-everywhere-src-6.7.3.tar.xz) = 110184 +TIMESTAMP = 1733205814 +SHA256 (KDE/Qt/6.8.1/qtquicktimeline-everywhere-src-6.8.1.tar.xz) = fdbc198e27fd7bce0801fb3cfa336e81932607e6a36c97ae8394880eedfe12a3 +SIZE (KDE/Qt/6.8.1/qtquicktimeline-everywhere-src-6.8.1.tar.xz) = 110612 diff --git a/x11-toolkits/qt6-quicktimeline/pkg-plist b/x11-toolkits/qt6-quicktimeline/pkg-plist index c60c66f9aeb2..0e09546570f8 100644 --- a/x11-toolkits/qt6-quicktimeline/pkg-plist +++ b/x11-toolkits/qt6-quicktimeline/pkg-plist @@ -2,7 +2,6 @@ %%QT_INCDIR%%/QtQuickTimeline/%%FULLVER%%/QtQuickTimeline/private/qquickkeyframedatautils_p.h %%QT_INCDIR%%/QtQuickTimeline/%%FULLVER%%/QtQuickTimeline/private/qquicktimeline_p.h %%QT_INCDIR%%/QtQuickTimeline/%%FULLVER%%/QtQuickTimeline/private/qquicktimelineanimation_p.h -%%QT_INCDIR%%/QtQuickTimeline/%%FULLVER%%/QtQuickTimeline/private/qtquicktimelineexports_p.h %%QT_INCDIR%%/QtQuickTimeline/%%FULLVER%%/QtQuickTimeline/private/qtquicktimelineglobal_p.h %%QT_INCDIR%%/QtQuickTimeline/QtQuickTimeline %%QT_INCDIR%%/QtQuickTimeline/QtQuickTimelineDepends @@ -13,7 +12,6 @@ %%QT_INCDIR%%/QtQuickTimelineBlendTrees/%%FULLVER%%/QtQuickTimelineBlendTrees/private/qblendanimationnode_p.h %%QT_INCDIR%%/QtQuickTimelineBlendTrees/%%FULLVER%%/QtQuickTimelineBlendTrees/private/qblendtreenode_p.h %%QT_INCDIR%%/QtQuickTimelineBlendTrees/%%FULLVER%%/QtQuickTimelineBlendTrees/private/qtimelineanimationnode_p.h -%%QT_INCDIR%%/QtQuickTimelineBlendTrees/%%FULLVER%%/QtQuickTimelineBlendTrees/private/qtquicktimelineblendtreesexports_p.h %%QT_INCDIR%%/QtQuickTimelineBlendTrees/%%FULLVER%%/QtQuickTimelineBlendTrees/private/qtquicktimelineblendtreesglobal_p.h %%QT_INCDIR%%/QtQuickTimelineBlendTrees/QtQuickTimelineBlendTrees %%QT_INCDIR%%/QtQuickTimelineBlendTrees/QtQuickTimelineBlendTreesDepends @@ -41,6 +39,7 @@ lib/cmake/Qt6QuickTimeline/Qt6QuickTimelineConfigVersionImpl.cmake lib/cmake/Qt6QuickTimeline/Qt6QuickTimelineDependencies.cmake lib/cmake/Qt6QuickTimeline/Qt6QuickTimelineTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6QuickTimeline/Qt6QuickTimelineTargets.cmake +lib/cmake/Qt6QuickTimeline/Qt6QuickTimelineVersionlessAliasTargets.cmake lib/cmake/Qt6QuickTimeline/Qt6QuickTimelineVersionlessTargets.cmake lib/cmake/Qt6QuickTimelineBlendTrees/Qt6QuickTimelineBlendTreesAdditionalTargetInfo.cmake lib/cmake/Qt6QuickTimelineBlendTrees/Qt6QuickTimelineBlendTreesConfig.cmake @@ -49,6 +48,7 @@ lib/cmake/Qt6QuickTimelineBlendTrees/Qt6QuickTimelineBlendTreesConfigVersionImpl lib/cmake/Qt6QuickTimelineBlendTrees/Qt6QuickTimelineBlendTreesDependencies.cmake lib/cmake/Qt6QuickTimelineBlendTrees/Qt6QuickTimelineBlendTreesTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6QuickTimelineBlendTrees/Qt6QuickTimelineBlendTreesTargets.cmake +lib/cmake/Qt6QuickTimelineBlendTrees/Qt6QuickTimelineBlendTreesVersionlessAliasTargets.cmake lib/cmake/Qt6QuickTimelineBlendTrees/Qt6QuickTimelineBlendTreesVersionlessTargets.cmake %%QT_LIBDIR%%/libQt6QuickTimeline.prl %%QT_LIBDIR%%/libQt6QuickTimeline.so @@ -70,6 +70,7 @@ lib/cmake/Qt6QuickTimelineBlendTrees/Qt6QuickTimelineBlendTreesVersionlessTarget %%QT_QMLDIR%%/QtQuick/Timeline/libqtquicktimelineplugin.so %%QT_QMLDIR%%/QtQuick/Timeline/plugins.qmltypes %%QT_QMLDIR%%/QtQuick/Timeline/qmldir +%%QT_SBOMDIR%%/qtquicktimeline-%%FULLVER%%.spdx libdata/pkgconfig/Qt6QuickTimeline.pc libdata/pkgconfig/Qt6QuickTimelineBlendTrees.pc %%QT_DATADIR%%/modules/QuickTimeline.json diff --git a/x11-toolkits/qt6-shadertools/distinfo b/x11-toolkits/qt6-shadertools/distinfo index 18bd6782f0db..52402edf21a9 100644 --- a/x11-toolkits/qt6-shadertools/distinfo +++ b/x11-toolkits/qt6-shadertools/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1727500706 -SHA256 (KDE/Qt/6.7.3/qtshadertools-everywhere-src-6.7.3.tar.xz) = 74e512798c7ddbda354a2d8d975211454bbabb47afb7e598892067a5828c0995 -SIZE (KDE/Qt/6.7.3/qtshadertools-everywhere-src-6.7.3.tar.xz) = 1111640 +TIMESTAMP = 1733205816 +SHA256 (KDE/Qt/6.8.1/qtshadertools-everywhere-src-6.8.1.tar.xz) = 55b70cd632473a8043c74ba89310f7ba9c5041d253bc60e7ae1fa789169c4846 +SIZE (KDE/Qt/6.8.1/qtshadertools-everywhere-src-6.8.1.tar.xz) = 1138644 diff --git a/x11-toolkits/qt6-shadertools/pkg-plist b/x11-toolkits/qt6-shadertools/pkg-plist index d4511b6bbf2e..38ca0e6aca4b 100644 --- a/x11-toolkits/qt6-shadertools/pkg-plist +++ b/x11-toolkits/qt6-shadertools/pkg-plist @@ -2,7 +2,6 @@ %%QT_INCDIR%%/QtShaderTools/%%FULLVER%%/QtShaderTools/private/qspirvcompiler_p.h %%QT_INCDIR%%/QtShaderTools/%%FULLVER%%/QtShaderTools/private/qspirvshader_p.h %%QT_INCDIR%%/QtShaderTools/%%FULLVER%%/QtShaderTools/private/qspirvshaderremap_p.h -%%QT_INCDIR%%/QtShaderTools/%%FULLVER%%/QtShaderTools/private/qtshadertoolsexports_p.h %%QT_INCDIR%%/QtShaderTools/%%FULLVER%%/QtShaderTools/private/qtshadertoolsglobal_p.h %%QT_INCDIR%%/QtShaderTools/%%FULLVER%%/QtShaderTools/rhi/qshaderbaker.h %%QT_INCDIR%%/QtShaderTools/QtShaderTools @@ -19,6 +18,7 @@ lib/cmake/Qt6ShaderTools/Qt6ShaderToolsConfigVersionImpl.cmake lib/cmake/Qt6ShaderTools/Qt6ShaderToolsDependencies.cmake 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/Qt6ShaderToolsTools/Qt6ShaderToolsMacros.cmake lib/cmake/Qt6ShaderToolsTools/Qt6ShaderToolsToolsAdditionalTargetInfo.cmake @@ -37,5 +37,6 @@ lib/cmake/Qt6ShaderToolsTools/Qt6ShaderToolsToolsVersionlessTargets.cmake %%QT_LIBDIR%%/metatypes/qt6shadertools_%%CMAKE_BUILD_TYPE%%_metatypes.json %%QT_MKSPECDIR%%/modules/qt_lib_shadertools.pri %%QT_MKSPECDIR%%/modules/qt_lib_shadertools_private.pri +%%QT_SBOMDIR%%/qtshadertools-%%FULLVER%%.spdx libdata/pkgconfig/Qt6ShaderTools.pc %%QT_DATADIR%%/modules/ShaderTools.json diff --git a/x11-toolkits/qt6-virtualkeyboard/distinfo b/x11-toolkits/qt6-virtualkeyboard/distinfo index 5b1801165c05..435f39ee9247 100644 --- a/x11-toolkits/qt6-virtualkeyboard/distinfo +++ b/x11-toolkits/qt6-virtualkeyboard/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1727500707 -SHA256 (KDE/Qt/6.7.3/qtvirtualkeyboard-everywhere-src-6.7.3.tar.xz) = 1a872104e212c048ada47d28ea8bb2e0ab0637663a3b085989349e249f1423d9 -SIZE (KDE/Qt/6.7.3/qtvirtualkeyboard-everywhere-src-6.7.3.tar.xz) = 3720000 +TIMESTAMP = 1733205819 +SHA256 (KDE/Qt/6.8.1/qtvirtualkeyboard-everywhere-src-6.8.1.tar.xz) = 1022a3bc4093ec732e85b659158c8a70a31eecbd0dfef4e4f6c67f474f89a264 +SIZE (KDE/Qt/6.8.1/qtvirtualkeyboard-everywhere-src-6.8.1.tar.xz) = 3264444 diff --git a/x11-toolkits/qt6-virtualkeyboard/pkg-plist b/x11-toolkits/qt6-virtualkeyboard/pkg-plist index 94fb167e617c..3a63fc9b2aa1 100644 --- a/x11-toolkits/qt6-virtualkeyboard/pkg-plist +++ b/x11-toolkits/qt6-virtualkeyboard/pkg-plist @@ -2,7 +2,6 @@ %%QT_INCDIR%%/QtHunspellInputMethod/%%FULLVER%%/QtHunspellInputMethod/private/hunspellinputmethod_p_p.h %%QT_INCDIR%%/QtHunspellInputMethod/%%FULLVER%%/QtHunspellInputMethod/private/hunspellwordlist_p.h %%QT_INCDIR%%/QtHunspellInputMethod/%%FULLVER%%/QtHunspellInputMethod/private/hunspellworker_p.h -%%QT_INCDIR%%/QtHunspellInputMethod/%%FULLVER%%/QtHunspellInputMethod/private/qthunspellinputmethodexports_p.h %%QT_INCDIR%%/QtHunspellInputMethod/QtHunspellInputMethod %%QT_INCDIR%%/QtHunspellInputMethod/QtHunspellInputMethodDepends %%QT_INCDIR%%/QtHunspellInputMethod/QtHunspellInputMethodVersion @@ -25,7 +24,6 @@ %%QT_INCDIR%%/QtVirtualKeyboard/%%FULLVER%%/QtVirtualKeyboard/private/plaininputmethod_p.h %%QT_INCDIR%%/QtVirtualKeyboard/%%FULLVER%%/QtVirtualKeyboard/private/platforminputcontext_p.h %%QT_INCDIR%%/QtVirtualKeyboard/%%FULLVER%%/QtVirtualKeyboard/private/qtvirtualkeyboard-config_p.h -%%QT_INCDIR%%/QtVirtualKeyboard/%%FULLVER%%/QtVirtualKeyboard/private/qtvirtualkeyboardexports_p.h %%QT_INCDIR%%/QtVirtualKeyboard/%%FULLVER%%/QtVirtualKeyboard/private/qvirtualkeyboard_global_p.h %%QT_INCDIR%%/QtVirtualKeyboard/%%FULLVER%%/QtVirtualKeyboard/private/qvirtualkeyboardabstractinputmethod_p.h %%QT_INCDIR%%/QtVirtualKeyboard/%%FULLVER%%/QtVirtualKeyboard/private/qvirtualkeyboardfeatures_namespace_p.h @@ -88,6 +86,7 @@ lib/cmake/Qt6HunspellInputMethod/Qt6HunspellInputMethodConfigVersionImpl.cmake lib/cmake/Qt6HunspellInputMethod/Qt6HunspellInputMethodDependencies.cmake lib/cmake/Qt6HunspellInputMethod/Qt6HunspellInputMethodTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6HunspellInputMethod/Qt6HunspellInputMethodTargets.cmake +lib/cmake/Qt6HunspellInputMethod/Qt6HunspellInputMethodVersionlessAliasTargets.cmake lib/cmake/Qt6HunspellInputMethod/Qt6HunspellInputMethodVersionlessTargets.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6qtvkbbuiltinstylespluginAdditionalTargetInfo.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6qtvkbbuiltinstylespluginConfig.cmake @@ -174,6 +173,7 @@ lib/cmake/Qt6VirtualKeyboard/Qt6VirtualKeyboardConfigVersionImpl.cmake lib/cmake/Qt6VirtualKeyboard/Qt6VirtualKeyboardDependencies.cmake lib/cmake/Qt6VirtualKeyboard/Qt6VirtualKeyboardTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6VirtualKeyboard/Qt6VirtualKeyboardTargets.cmake +lib/cmake/Qt6VirtualKeyboard/Qt6VirtualKeyboardVersionlessAliasTargets.cmake lib/cmake/Qt6VirtualKeyboard/Qt6VirtualKeyboardVersionlessTargets.cmake lib/cmake/Qt6VirtualKeyboardSettings/Qt6VirtualKeyboardSettingsAdditionalTargetInfo.cmake lib/cmake/Qt6VirtualKeyboardSettings/Qt6VirtualKeyboardSettingsConfig.cmake @@ -182,6 +182,7 @@ lib/cmake/Qt6VirtualKeyboardSettings/Qt6VirtualKeyboardSettingsConfigVersionImpl lib/cmake/Qt6VirtualKeyboardSettings/Qt6VirtualKeyboardSettingsDependencies.cmake lib/cmake/Qt6VirtualKeyboardSettings/Qt6VirtualKeyboardSettingsTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6VirtualKeyboardSettings/Qt6VirtualKeyboardSettingsTargets.cmake +lib/cmake/Qt6VirtualKeyboardSettings/Qt6VirtualKeyboardSettingsVersionlessAliasTargets.cmake lib/cmake/Qt6VirtualKeyboardSettings/Qt6VirtualKeyboardSettingsVersionlessTargets.cmake %%QT_LIBDIR%%/libQt6HunspellInputMethod.prl %%QT_LIBDIR%%/libQt6HunspellInputMethod.so @@ -285,6 +286,7 @@ lib/cmake/Qt6VirtualKeyboardSettings/Qt6VirtualKeyboardSettingsVersionlessTarget %%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/Qt6VirtualKeyboardSettings.pc -- 2.47.0