From nobody Mon Mar 06 04:34:02 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PVQhC65R2z3wNLS; Mon, 6 Mar 2023 04:34:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PVQhC3v2jz3PR8; Mon, 6 Mar 2023 04:34:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678077243; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tserPzenkfTZNQ/i7c1P8eKlCieodtvmf4DCsgA2Dos=; b=iUDrmI5gqFnF09cPMvjbm6Uoih/PVcuewyRVIjhx48mP+UXd1GnieC1vAkJWWOM6V/vUb8 7vYgKYXLsgF2/wvQ4u5NzDiq24wp76Earv/63odvvZaZ3yYKf2mCepcUdLLGKQIYl0Extg T41OgrVOJ3w0ytEbjJIeXUqMd+WDe73GRcM8TUDl7UzSmeu2DQ2RMoIkzEt9GXxW4x9M7q JLSeYaRHZEi9rT+FN5VdD1t+lSrcpBBuKr+a/GAMrf6PnV05QNbRKl81Fmf+nkuCBRip+Y ypC9TyhfPPjJOiEFqmGRCmv1vCHZXS1/cGEkdlJ1D0FPbWfZtdUC+7uwxKreZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678077243; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tserPzenkfTZNQ/i7c1P8eKlCieodtvmf4DCsgA2Dos=; b=b1GjQSkGILYvcy01pOwxa/xrmc/gPQrJjk25gV457/Qhwvb+MZImQt7njS6TdWbclQK6d3 kOimsb+hf4rQS+pSBHIpsx43ojWsxr67kPJE1tKhXjP5XJ3RIqH357xekMbkFXA0+wNuvy Uz416rnccmhWOdg0xwUSSOl7kjXj0B5vf2Dx7HPAsGa/M2OA3YQZ2uK9q8ox2r/zh0Lf3y RP/b/TY3S+9IGwy7h8agaXCPaxscx1YWlwdcA6wKG7MagGU10Vz60yv2xv4sEpjmFGqQzN Ja7ruKAWOF/lugCHHUeWbeT763Otz6QBhBVNYfzqJ73YPLTNLgQU+IoMb99uFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678077243; a=rsa-sha256; cv=none; b=CvbPAaNzGkaZ8/CorT7P30n2eQ3fsmH+xDwwM6BjbFepN3JZLA9mzlbkbpXhPVcXU683Ts 06JeiijtafDwwXH/Ec6ySQS0RJhJG3GM2tYwTEvQJyCiIw3pEh4OrL+yLZdmN6NkdkObcE a7FD5uSXuvg4PmI4A9PSMQO18jRPLWc/OFmtqIOzRz+4JIhbcnitmYbPPdMSiyOC2qqcGn cYXDg0VtVehgpJzisgp5voCrXWzPWuNWQWAGJ1RxmVWjXJwQ6Zage2rYy/e/4+d7PD+TgX dJawBwIFx+H9wxnLsT1GLmL3bAK2h46kMc2hR2seqqY8CLAiZWrQjWNwnfPg+Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PVQhC25dnzpLt; Mon, 6 Mar 2023 04:34:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 3264Y31i042068; Mon, 6 Mar 2023 04:34:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3264Y2HA042067; Mon, 6 Mar 2023 04:34:02 GMT (envelope-from git) Date: Mon, 6 Mar 2023 04:34:02 GMT Message-Id: <202303060434.3264Y2HA042067@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Kai Knoblich Subject: git: 8067206f03a2 - main - www/qt5-webengine: Update to 5.15.8 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kai X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8067206f03a28c8eb926d07550d94220d7aacfbd Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kai: URL: https://cgit.FreeBSD.org/ports/commit/?id=8067206f03a28c8eb926d07550d94220d7aacfbd commit 8067206f03a28c8eb926d07550d94220d7aacfbd Author: Kai Knoblich AuthorDate: 2023-03-06 04:26:17 +0000 Commit: Kai Knoblich CommitDate: 2023-03-06 04:33:32 +0000 www/qt5-webengine: Update to 5.15.8 * Under the hood runs Chromium 87.0.4280.144 with security fixes up to version 96.0.4664.110 and patches were taken from of www/chromium 87.0.4280.141 (391acded85d8). * Prune some unneeded patches (mostly from the headless and unittest areas) and try to align the unbundling of dependencies similar to qt6-webengine for consistency. * Adjust Mk/Uses/qt-dist.mk accordingly as the naming of the distfiles has changed since Qt 5.15.3. Tested by: tcberner Differential Revision: https://reviews.freebsd.org/D38165 --- Mk/Uses/qt-dist.mk | 4 + www/qt5-webengine/Makefile | 31 +++-- www/qt5-webengine/distinfo | 6 +- .../files/extra-patch-no-mempcpy-nasm | 11 ++ www/qt5-webengine/files/freebsd.pri | 5 - www/qt5-webengine/files/patch-clang | 40 ------ .../files/patch-mkspecs_features_functions.prf | 8 +- .../files/patch-src_3rdparty_chromium_BUILD.gn | 43 +++--- .../patch-src_3rdparty_chromium_base_BUILD.gn | 97 ++++++-------- ...arty_chromium_base_allocator_allocator__shim.cc | 11 -- ...llocator__shim__default__dispatch__to__glibc.cc | 10 +- ...ium_base_allocator_allocator__shim__unittest.cc | 45 ------- ...__allocator_page__allocator__internals__posix.h | 12 +- ...ocator_partition__allocator_partition__alloc.cc | 12 ++ ...ch-src_3rdparty_chromium_base_base__switches.cc | 16 +-- ...tch-src_3rdparty_chromium_base_base__switches.h | 16 +-- .../files/patch-src_3rdparty_chromium_base_cpu.cc | 46 ++++--- .../files/patch-src_3rdparty_chromium_base_cpu.h | 20 +++ ...3rdparty_chromium_base_debug_debugger__posix.cc | 6 +- ...src_3rdparty_chromium_base_debug_elf__reader.cc | 12 +- ...dparty_chromium_base_debug_proc__maps__linux.cc | 24 ++-- ...rc_3rdparty_chromium_base_debug_stack__trace.cc | 8 +- ...arty_chromium_base_debug_stack__trace__posix.cc | 6 +- ...arty_chromium_base_files_file__path__watcher.cc | 15 --- ...ium_base_files_file__path__watcher__unittest.cc | 11 -- ...h-src_3rdparty_chromium_base_files_file__util.h | 25 +++- ...dparty_chromium_base_files_file__util__posix.cc | 59 ++++++++- ...rc_3rdparty_chromium_base_files_scoped__file.cc | 8 +- ...ch-src_3rdparty_chromium_base_i18n_icu__util.cc | 16 +-- ...patch-src_3rdparty_chromium_base_linux__util.cc | 30 ++++- ...src_3rdparty_chromium_base_logging__unittest.cc | 15 --- ...rty_chromium_base_memory_discardable__memory.cc | 34 ++--- ...ium_base_memory_discardable__memory__internal.h | 10 +- ...emory_madv__free__discardable__memory__posix.cc | 8 +- ..._base_memory_platform__shared__memory__region.h | 20 +-- ...mory_platform__shared__memory__region__posix.cc | 26 ++-- ...ase_memory_shared__memory__mapping__unittest.cc | 39 ------ ...omium_base_message__loop_message__pump__glib.cc | 28 ++++ ...romium_base_metrics_bucket__ranges__unittest.cc | 32 ----- ...arty_chromium_base_native__library__unittest.cc | 11 -- ...romium_base_numerics_safe__math__shared__impl.h | 4 +- ...rty_chromium_base_posix_unix__domain__socket.cc | 18 +-- ...um_base_posix_unix__domain__socket__unittest.cc | 12 -- ...dparty_chromium_base_process_internal__linux.cc | 18 +-- ...rdparty_chromium_base_process_internal__linux.h | 12 +- ...patch-src_3rdparty_chromium_base_process_kill.h | 13 +- ...c_3rdparty_chromium_base_process_kill__posix.cc | 17 ++- ...ch-src_3rdparty_chromium_base_process_launch.cc | 8 +- ...tch-src_3rdparty_chromium_base_process_launch.h | 31 +++-- ...3rdparty_chromium_base_process_launch__posix.cc | 33 ++++- ...ch-src_3rdparty_chromium_base_process_memory.cc | 14 +- ...tch-src_3rdparty_chromium_base_process_memory.h | 10 +- ...party_chromium_base_process_memory__unittest.cc | 18 --- ...dparty_chromium_base_process_process__handle.cc | 12 +- ...rdparty_chromium_base_process_process__handle.h | 12 +- ...rdparty_chromium_base_process_process__linux.cc | 39 ++++-- ...party_chromium_base_process_process__metrics.cc | 32 ++--- ...dparty_chromium_base_process_process__metrics.h | 146 +++++++++++++-------- ...omium_base_process_process__metrics__freebsd.cc | 11 +- ...hromium_base_process_process__metrics__posix.cc | 8 +- ...arty_chromium_base_profiler_register__context.h | 10 +- ...e_profiler_sampling__profiler__thread__token.cc | 8 +- ...se_profiler_sampling__profiler__thread__token.h | 12 +- ...chromium_base_profiler_stack__copier__signal.cc | 8 +- ...filer_stack__sampling__profiler__test__util.cc} | 10 +- ...romium_base_profiler_thread__delegate__posix.cc | 16 +-- ...ing__heap__profiler_sampling__heap__profiler.cc | 12 +- ...rc_3rdparty_chromium_base_security__unittest.cc | 11 -- ...arty_chromium_base_synchronization_lock__impl.h | 11 +- ...h-src_3rdparty_chromium_base_syslog__logging.cc | 18 +-- ...-src_3rdparty_chromium_base_system_sys__info.cc | 10 +- ...h-src_3rdparty_chromium_base_system_sys__info.h | 14 +- ...arty_chromium_base_system_sys__info__freebsd.cc | 51 ++++--- ...dparty_chromium_base_system_sys__info__posix.cc | 4 +- .../patch-src_3rdparty_chromium_base_test_BUILD.gn | 15 +++ ...y_chromium_base_test_test__file__util__posix.cc | 11 ++ ...-src_3rdparty_chromium_base_test_test__suite.cc | 37 ++++++ ...ty_chromium_base_third__party_libevent_BUILD.gn | 8 +- ...arty_chromium_base_threading_platform__thread.h | 12 +- ...e_threading_platform__thread__internal__posix.h | 18 +++ ...omium_base_threading_platform__thread__linux.cc | 8 +- ...omium_base_threading_platform__thread__posix.cc | 63 +++++++-- ..._base_threading_thread__task__runner__handle.cc | 12 +- ...ium_base_trace__event_malloc__dump__provider.cc | 4 +- ...mium_base_trace__event_process__memory__dump.cc | 8 +- ...pressure_system__memory__pressure__evaluator.cc | 20 +++ ...tch-src_3rdparty_chromium_build_config_BUILD.gn | 18 +-- ...c_3rdparty_chromium_build_config_BUILDCONFIG.gn | 16 +-- ...rdparty_chromium_build_config_compiler_BUILD.gn | 62 ++++----- ...rty_chromium_build_config_compiler_compiler.gni | 13 +- ...src_3rdparty_chromium_build_config_features.gni | 8 +- ...rty_chromium_build_config_freetype_freetype.gni | 11 ++ ...c_3rdparty_chromium_build_detect__host__arch.py | 4 +- ...-src_3rdparty_chromium_build_gn__run__binary.py | 4 +- ...rty_chromium_build_toolchain_gcc__toolchain.gni | 8 +- ...omium_build_toolchain_get__concurrent__links.py | 4 +- ...rome_browser_devtools_devtools__eye__dropper.cc | 8 +- ...ser_extensions_api_input__ime_input__ime__api.h | 11 -- ...extensions_api_settings__private_prefs__util.cc | 16 +-- ...er_media_webrtc_webrtc__event__log__uploader.cc | 11 ++ ...e_browser_media_webrtc_webrtc__log__uploader.cc | 11 ++ ...ser_media_webrtc_webrtc__logging__controller.cc | 33 +++++ ...wser_media_webrtc_webrtc__logging__controller.h | 36 +++++ ...y_chromium_chrome_browser_ui_webui_about__ui.cc | 18 +-- ...i_webui_chrome__web__ui__controller__factory.cc | 45 ++++--- ...ch-src_3rdparty_chromium_chrome_common_BUILD.gn | 13 -- ...rdparty_chromium_chrome_common_chrome__paths.cc | 80 +++++------ ...3rdparty_chromium_chrome_common_chrome__paths.h | 33 ++--- ...hromium_chrome_common_chrome__paths__internal.h | 8 +- ...arty_chromium_chrome_common_chrome__switches.cc | 10 +- ...party_chromium_chrome_common_chrome__switches.h | 10 +- ...chromium_chrome_common_webui__url__constants.cc | 44 ++++--- ..._chromium_chrome_common_webui__url__constants.h | 29 ++-- ...derer_pepper_pepper__flash__font__file__host.cc | 14 +- ...nderer_pepper_pepper__flash__font__file__host.h | 10 +- ...t_renderer_password__form__conversion__utils.cc | 6 +- ...ngs_core_browser_website__settings__registry.cc | 4 +- ...omponents_cookie__config_cookie__store__util.cc | 22 ++-- ...omium_components_crash_content_browser_BUILD.gn | 10 +- ..._chromium_components_crash_core_common_BUILD.gn | 39 +++--- ...mponents_download_internal_common_base__file.cc | 23 +++- ...hromium_components_feedback_anonymizer__tool.cc | 14 -- ...y_chromium_components_flags__ui_flags__state.cc | 6 +- ...ed__service_core_dependency__graph__unittest.cc | 14 -- ...c_3rdparty_chromium_components_metrics_BUILD.gn | 6 +- ...rty_chromium_components_metrics_metrics__log.cc | 4 +- ...trics_system__memory__stats__recorder__linux.cc | 18 --- ...omium_components_neterror_resources_neterror.js | 4 +- ...rator_browser_network__session__configurator.cc | 4 +- ...party_chromium_components_os__crypt_os__crypt.h | 12 +- ...ium_components_os__crypt_os__crypt__unittest.cc | 11 -- ...y_chromium_components_storage__monitor_BUILD.gn | 16 --- ...torage__monitor_removable__device__constants.cc | 11 -- ...storage__monitor_removable__device__constants.h | 11 -- ...s_storage__monitor_storage__monitor__freebsd.cc | 57 -------- ...ts_storage__monitor_storage__monitor__freebsd.h | 48 ------- ...ponents_update__client_update__query__params.cc | 4 +- ..._components_url__matcher_regex__set__matcher.cc | 4 +- ..._3rdparty_chromium_content_app_content__main.cc | 11 ++ ...mium_content_app_content__main__runner__impl.cc | 82 ++++++------ ...-src_3rdparty_chromium_content_browser_BUILD.gn | 22 ++-- ...chromium_content_browser_browser__main__loop.cc | 44 ++++--- ...wser_child__process__launcher__helper__linux.cc | 49 +++---- ..._compositor_viz__process__transport__factory.cc | 4 +- ...wser_devtools_protocol_system__info__handler.cc | 14 +- ...browser_font__access_font__enumeration__cache.h | 11 ++ ...hromium_content_browser_gpu_compositor__util.cc | 16 +++ ...omium_content_browser_gpu_gpu__process__host.cc | 10 +- ...omium_content_browser_media_media__internals.cc | 11 -- ...content_browser_ppapi__plugin__process__host.cc | 10 +- ...i__plugin__process__host__receiver__bindings.cc | 12 +- ...rowser_renderer__host_delegated__frame__host.cc | 11 ++ ...__host_input_input__device__change__observer.cc | 20 +-- ...renderer__host_pepper_pepper__file__io__host.cc | 14 +- ...owser_renderer__host_render__message__filter.cc | 24 ++-- ...rowser_renderer__host_render__message__filter.h | 16 +-- ...r_renderer__host_render__process__host__impl.cc | 45 ++++--- ...er_renderer__host_render__process__host__impl.h | 15 --- ...wser_renderer__host_render__view__host__impl.cc | 12 +- ...derer__host_render__widget__host__view__aura.cc | 26 +++- ...t_render__widget__host__view__event__handler.cc | 8 +- ...cheduler_responsiveness_jank__monitor__impl.cc} | 6 +- ...duler_responsiveness_native__event__observer.cc | 14 +- ...eduler_responsiveness_native__event__observer.h | 26 ++-- ...ent_browser_scheduler_responsiveness_watcher.cc | 20 --- ...omium_content_browser_utility__process__host.cc | 10 +- ...r_utility__process__host__receiver__bindings.cc | 18 +-- ...chromium_content_browser_v8__snapshot__files.cc | 10 +- ...wser_web__contents_web__contents__view__aura.cc | 11 ++ ...rowser_webui_shared__resources__data__source.cc | 15 ++- ...wser_zygote__host_zygote__host__impl__linux.cc} | 22 ++-- ...owser_zygote__host_zygote__host__impl__linux.h} | 6 +- ...ch-src_3rdparty_chromium_content_child_BUILD.gn | 16 --- ...dparty_chromium_content_child_child__process.cc | 11 ++ ...h-src_3rdparty_chromium_content_common_BUILD.gn | 16 ++- ..._content_common_mojo__core__library__support.cc | 11 ++ ...3rdparty_chromium_content_common_user__agent.cc | 6 +- ...atch-src_3rdparty_chromium_content_gpu_BUILD.gn | 20 --- ...-src_3rdparty_chromium_content_gpu_gpu__main.cc | 62 ++------- ...romium_content_gpu_gpu__sandbox__hook__linux.cc | 47 ++++--- ...t_ppapi__plugin_ppapi__blink__platform__impl.cc | 20 +-- ...nt_ppapi__plugin_ppapi__blink__platform__impl.h | 18 +-- ...m_content_public_app_content__main__delegate.cc | 15 +-- ...um_content_public_app_content__main__delegate.h | 14 +- ...lic_browser_zygote__host_zygote__host__linux.h} | 8 +- ...rdparty_chromium_content_public_common_BUILD.gn | 11 -- ...um_content_public_common_child__process__host.h | 8 +- ...t_public_common_common__param__traits__macros.h | 12 +- ...ium_content_public_common_content__constants.cc | 12 +- ...mium_content_public_common_content__constants.h | 12 +- ...mium_content_public_common_content__features.cc | 18 +-- ...mium_content_public_common_content__switches.cc | 15 ++- ...omium_content_public_common_content__switches.h | 15 ++- ...nt_public_common_use__zoom__for__dsf__policy.cc | 8 +- ...mium_content_public_common_zygote_features.gni} | 4 +- ...src_3rdparty_chromium_content_renderer_BUILD.gn | 18 --- ...omium_content_renderer_render__process__impl.cc | 16 +-- ...romium_content_renderer_render__thread__impl.cc | 50 +------ ...ent_renderer_renderer__blink__platform__impl.cc | 40 +++--- ...tent_renderer_renderer__blink__platform__impl.h | 22 ++-- ...er_renderer__main__platform__delegate__linux.cc | 6 +- ...ch-src_3rdparty_chromium_content_shell_BUILD.gn | 49 ++++--- ...tch-src_3rdparty_chromium_content_test_BUILD.gn | 28 ++++ ...-src_3rdparty_chromium_content_utility_BUILD.gn | 11 -- ...link__platform__with__sandbox__support__impl.cc | 20 +-- ...blink__platform__with__sandbox__support__impl.h | 16 +-- ...dparty_chromium_content_zygote_zygote__linux.cc | 16 +++ ...chromium_content_zygote_zygote__main__linux.cc} | 22 ++-- ...ty_chromium_device_gamepad_gamepad__provider.cc | 10 +- ...sions_browser_api_messaging_message__service.cc | 31 ++--- ..._browser__context__keyed__service__factories.cc | 16 +-- ...m_extensions_shell_app_shell__main__delegate.cc | 16 +-- ...__buffer_common_gpu__memory__buffer__support.cc | 16 +-- ..._command__buffer_service_external__semaphore.cc | 11 ++ ..._buffer_service_external__vk__image__backing.cc | 76 +++-------- ...__buffer_service_external__vk__image__backing.h | 11 -- ...vice_external__vk__image__gl__representation.cc | 11 -- ...gpu_command__buffer_service_program__manager.cc | 8 +- ...party_chromium_gpu_config_gpu__control__list.cc | 12 +- ...dparty_chromium_gpu_config_gpu__test__config.cc | 4 +- ..._gpu_ipc_common_gpu__memory__buffer__support.cc | 29 ++-- ...m_gpu_ipc_common_gpu__memory__buffer__support.h | 16 +-- ..._3rdparty_chromium_gpu_ipc_service_gpu__init.cc | 108 +++++---------- ...gpu_ipc_service_gpu__memory__buffer__factory.cc | 10 +- ...romium_gpu_ipc_service_gpu__watchdog__thread.cc | 18 +-- ...hromium_gpu_ipc_service_gpu__watchdog__thread.h | 8 +- ...romium_gpu_vulkan_vulkan__function__pointers.cc | 36 ++--- ...hromium_gpu_vulkan_vulkan__function__pointers.h | 105 +++++++++------ .../patch-src_3rdparty_chromium_headless_BUILD.gn | 56 -------- ...b_browser_headless__content__browser__client.cc | 29 ---- ...ib_browser_headless__content__browser__client.h | 11 -- ..._browser_headless__request__context__manager.cc | 29 ---- ...adless_lib_headless__content__main__delegate.cc | 38 ------ ...eadless_lib_headless__content__main__delegate.h | 11 -- ...dparty_chromium_headless_lib_headless__macros.h | 13 -- .../patch-src_3rdparty_chromium_ipc_ipc__channel.h | 8 +- ...c_3rdparty_chromium_ipc_ipc__channel__common.cc | 12 +- ...src_3rdparty_chromium_ipc_ipc__channel__mojo.cc | 14 +- ...rc_3rdparty_chromium_ipc_ipc__message__utils.cc | 10 +- ...src_3rdparty_chromium_ipc_ipc__message__utils.h | 10 +- ...atch-src_3rdparty_chromium_media_audio_BUILD.gn | 21 ++- ...romium_media_audio_alsa_audio__manager__alsa.cc | 22 ++-- ...rdparty_chromium_media_audio_audio__features.cc | 10 +- ...ty_chromium_media_audio_audio__input__device.cc | 14 +- ...3rdparty_chromium_media_audio_audio__manager.cc | 22 ++-- ..._3rdparty_chromium_media_audio_audio__manager.h | 14 +- ..._3rdparty_chromium_media_base_audio__latency.cc | 10 +- ...3rdparty_chromium_media_base_media__switches.cc | 15 ++- ...3rdparty_chromium_media_base_scopedfd__helper.h | 18 +-- ...atch-src_3rdparty_chromium_media_base_status.cc | 4 +- ...rc_3rdparty_chromium_media_base_video__frame.cc | 59 +++++---- ...src_3rdparty_chromium_media_base_video__frame.h | 38 +++--- ...ty_chromium_media_blink_webmediaplayer__impl.cc | 15 --- ...ideo_create__video__capture__device__factory.cc | 8 +- ..._video_fake__video__capture__device__factory.cc | 18 +-- ..._video_file__video__capture__device__factory.cc | 18 +-- ..._capture_video_linux_v4l2__capture__delegate.cc | 11 +- ...ure_video_video__capture__buffer__pool__impl.cc | 6 +- ...capture_video_video__capture__device__client.cc | 8 +- ...ium_media_formats_common_offset__byte__queue.cc | 4 +- ...chromium_media_formats_mp2t_es__parser__adts.cc | 6 +- ...dparty_chromium_media_gpu_buffer__validation.cc | 26 ++-- ...-src_3rdparty_chromium_media_media__options.gni | 6 +- ...ojo_clients_mojo__video__encode__accelerator.cc | 10 +- ...media_mojo_mojom_video__frame__mojom__traits.cc | 26 ++-- ...media_mojo_services_gpu__mojo__media__client.cc | 14 +- ...romium_media_video_fake__gpu__memory__buffer.cc | 48 +++---- ...ideo_gpu__memory__buffer__video__frame__pool.cc | 8 +- ...party_chromium_media_webrtc_webrtc__switches.cc | 18 --- ...rdparty_chromium_mojo_public_c_system_thunks.cc | 45 +++---- ...um_mojo_public_js_mojo__bindings__resources.grd | 12 +- .../files/patch-src_3rdparty_chromium_net_BUILD.gn | 29 ++-- ...ty_chromium_net_base_address__tracker__linux.cc | 63 ++++----- ...m_net_base_address__tracker__linux__unittest.cc | 14 -- ...atch-src_3rdparty_chromium_net_base_features.cc | 11 -- ..._chromium_net_base_network__change__notifier.cc | 14 +- ...rc_3rdparty_chromium_net_cert_cert__verifier.cc | 11 ++ ...rdparty_chromium_net_cert_cert__verify__proc.cc | 11 ++ ...3rdparty_chromium_net_cert_cert__verify__proc.h | 11 ++ ..._3rdparty_chromium_net_cert_test__root__certs.h | 26 ++++ ...romium_net_disk__cache_blockfile_disk__format.h | 12 ++ ...arty_chromium_net_dns_address__sorter__posix.cc | 6 +- ...et_dns_dns__config__service__posix__unittest.cc | 11 -- ...-src_3rdparty_chromium_net_dns_dns__reloader.cc | 4 +- ...atch-src_3rdparty_chromium_net_dns_dns__util.cc | 4 +- ...dparty_chromium_net_dns_host__resolver__proc.cc | 12 +- .../patch-src_3rdparty_chromium_net_features.gni | 11 -- ..._chromium_net_http_http__auth__gssapi__posix.cc | 8 +- ...chromium_net_nqe_network__quality__estimator.cc | 10 +- ...ution_configured__proxy__resolution__service.cc | 12 +- ...xy__resolution_proxy__config__service__linux.cc | 8 +- ...c_3rdparty_chromium_net_socket_socket__posix.cc | 8 +- ...y_chromium_net_socket_socks5__client__socket.cc | 4 +- ...party_chromium_net_socket_udp__socket__posix.cc | 109 ++++++--------- ...dparty_chromium_net_socket_udp__socket__posix.h | 8 +- ...t_socket_unix__domain__client__socket__posix.cc | 8 +- ..._tools_cert__verify__tool_cert__verify__tool.cc | 25 ++-- ...um_net_tools_quic_quic__http__proxy__backend.cc | 8 +- ...ffic__annotation_network__traffic__annotation.h | 6 +- ...party_chromium_net_url__request_url__fetcher.cc | 8 +- ...dparty_chromium_net_url__request_url__fetcher.h | 4 +- ...omium_net_url__request_url__request__context.cc | 4 +- ...romium_net_url__request_url__request__context.h | 4 +- ..._url__request_url__request__context__builder.cc | 14 +- ..._3rdparty_chromium_pdf_pdfium_pdfium__engine.cc | 44 +++---- ...rdparty_chromium_ppapi_proxy_flash__resource.cc | 6 +- .../patch-src_3rdparty_chromium_sandbox_BUILD.gn | 11 ++ ...atch-src_3rdparty_chromium_sandbox_features.gni | 6 +- ...ch-src_3rdparty_chromium_sandbox_linux_BUILD.gn | 33 +---- ...ium_sandbox_linux_services_libc__interceptor.cc | 4 +- ...h-src_3rdparty_chromium_sandbox_policy_BUILD.gn | 11 ++ ...rc_3rdparty_chromium_sandbox_policy_switches.cc | 11 ++ ...src_3rdparty_chromium_sandbox_policy_switches.h | 11 ++ ...h-src_3rdparty_chromium_services_audio_BUILD.gn | 10 +- ...ices_device_geolocation_location__arbitrator.cc | 8 +- ..._3rdparty_chromium_services_device_hid_BUILD.gn | 16 --- ...dparty_chromium_services_device_serial_BUILD.gn | 12 +- ...ces_device_serial_serial__device__enumerator.cc | 20 +++ ...ces_device_serial_serial__io__handler__posix.cc | 19 ++- ...src_3rdparty_chromium_services_network_BUILD.gn | 19 ++- ...y_chromium_services_network_network__context.cc | 4 +- ...rvices_network_network__sandbox__hook__linux.cc | 12 +- ...y_chromium_services_network_network__service.cc | 6 +- ...ty_chromium_services_network_network__service.h | 10 +- ..._cpp_cert__verifier_cert__verifier__creation.cc | 11 ++ ..._instrumentation_queued__request__dispatcher.cc | 14 +- ...ublic_cpp_memory__instrumentation_os__metrics.h | 30 ++--- ...p_memory__instrumentation_os__metrics__linux.cc | 63 +++++++-- ...rty_chromium_services_service__manager_BUILD.gn | 11 ++ ...mium_services_service__manager_embedder_main.cc | 11 -- ...__manager_embedder_set__process__title__linux.h | 20 --- ...manager_public_cpp_service__executable_BUILD.gn | 21 ++- ...mium_services_service__manager_sandbox_BUILD.gn | 11 -- ...r_sandbox_linux_bpf__renderer__policy__linux.cc | 14 -- ...rvices_service__manager_zygote_zygote__linux.cc | 15 --- ...rvices_video__capture_broadcasting__receiver.cc | 14 +- ...hromium_skia_ext_image__operations__unittest.cc | 59 --------- ...c_3rdparty_chromium_third__party_angle_BUILD.gn | 40 +++++- ...y_angle_src_gpu__info__util_SystemInfo__x11.cpp | 7 +- ...ium_third__party_angle_src_libANGLE_Display.cpp | 38 +++--- ...y_angle_src_libANGLE_renderer_driver__utils.cpp | 12 +- ...rty_angle_src_libANGLE_renderer_driver__utils.h | 4 +- ...e_src_libANGLE_renderer_vulkan_DisplayVk__api.h | 10 +- ..._third__party_vulkan-loader_src_loader_loader.c | 4 +- ...y_chromium_third__party_blink_renderer_BUILD.gn | 8 +- ...blink_renderer_controller_blink__initializer.cc | 30 ++--- ...rer_controller_memory__usage__monitor__posix.cc | 6 +- ...erer_controller_memory__usage__monitor__posix.h | 24 ++-- ...nk_renderer_core_clipboard_system__clipboard.cc | 15 +++ ...link_renderer_core_editing_editing__behavior.cc | 8 +- ...link_renderer_core_exported_web__frame__test.cc | 20 +++ ...ore_html_canvas_canvas__async__blob__creator.cc | 12 +- ...nderer_core_html_forms_internal__popup__menu.cc | 8 +- ...erer_core_inspector_inspector__memory__agent.cc | 8 +- ...arty_blink_renderer_core_layout_layout__view.cc | 8 +- ...party_blink_renderer_core_paint_paint__layer.cc | 8 +- ..._renderer_core_scroll_scrollbar__theme__aura.cc | 10 +- ...les_media_audio_web__audio__device__factory.cc} | 8 +- ..._mediastream_processed__local__audio__source.cc | 6 +- ...peerconnection_webrtc__audio__renderer__test.cc | 11 ++ ...odules_webaudio_audio__worklet__thread__test.cc | 13 ++ ...m_third__party_blink_renderer_platform_BUILD.gn | 4 +- ...ty_blink_renderer_platform_fonts_font__cache.cc | 10 +- ...rty_blink_renderer_platform_fonts_font__cache.h | 30 ++--- ...nk_renderer_platform_fonts_font__description.cc | 10 +- ..._blink_renderer_platform_fonts_font__metrics.cc | 26 ++-- ...er_platform_fonts_font__unique__name__lookup.cc | 12 +- ...latform_fonts_shaping_harfbuzz__shaper__test.cc | 11 ++ ...nderer_platform_fonts_skia_font__cache__skia.cc | 26 ++-- ...tform_graphics_image__frame__generator__test.cc | 19 +++ ...er_platform_graphics_video__frame__submitter.cc | 10 +- ..._renderer_platform_wtf_container__annotations.h | 20 +-- ...arty_blink_renderer_platform_wtf_stack__util.cc | 4 +- ...nk_renderer_platform_wtf_threading__pthreads.cc | 12 +- ...dparty_chromium_third__party_boringssl_BUILD.gn | 46 ------- ..._party_boringssl_src_crypto_cpu-aarch64-linux.c | 8 +- ...ty_boringssl_src_third__party_fiat_curve25519.c | 19 --- ...ashpad_crashpad_build_crashpad__buildconfig.gni | 11 -- ..._third__party_crashpad_crashpad_client_BUILD.gn | 4 +- ...hpad_crashpad_client_crashpad__client__posix.cc | 5 +- ...ty_crashpad_crashpad_util_misc_address__types.h | 20 --- ..._crashpad_crashpad_util_misc_capture__context.h | 20 --- ...d__party_crashpad_crashpad_util_misc_metrics.cc | 11 -- ...hird__party_crashpad_crashpad_util_misc_uuid.cc | 11 -- ...crashpad_crashpad_util_posix_close__multiple.cc | 61 +++++---- ...rashpad_crashpad_util_posix_drop__privileges.cc | 11 -- ...__party_crashpad_crashpad_util_posix_signals.cc | 29 +--- ...ashpad_util_posix_symbolic__constants__posix.cc | 20 --- ...ium_third__party_leveldatabase_env__chromium.cc | 14 ++ ...hird__party_leveldatabase_port_port__chromium.h | 15 --- ...hird__party_pdfium_core_fxcrt_cfx__datetime.cpp | 8 +- ...ium_third__party_pdfium_core_fxcrt_fx__system.h | 11 -- ...ird__party_pdfium_core_fxge_cfx__fontmapper.cpp | 18 +++ ...third__party_pdfium_core_fxge_fx__ge__linux.cpp | 39 ++++-- ...third__party_pdfium_fxjs_cjs__publicmethods.cpp | 8 +- ..._third__party_pdfium_fxjs_fx__date__helpers.cpp | 10 +- ...rtition__allocator_page__allocator__constants.h | 11 -- ...__allocator_page__allocator__internals__posix.h | 11 -- ...ium_xfa_fgas_font_cfx__fontsourceenum__file.cpp | 14 -- ..._perfetto_include_perfetto_base_build__config.h | 54 ++++---- ..._perfetto_include_perfetto_base_thread__utils.h | 10 +- ...rd__party_perfetto_include_perfetto_base_time.h | 6 +- ...tto_include_perfetto_ext_base_circular__queue.h | 22 ---- ...fetto_include_perfetto_ext_base_thread__utils.h | 12 ++ ...um_third__party_perfetto_src_base_subprocess.cc | 6 +- ...party_perfetto_src_base_thread__task__runner.cc | 15 +-- ..._third__party_perfetto_src_base_unix__socket.cc | 8 +- ...etto_src_tracing_core_tracing__service__impl.cc | 12 +- ...y_chromium_third__party_skia_src_core_SkCpu.cpp | 31 ++--- ..._third__party_skia_src_images_SkJpegEncoder.cpp | 16 +-- ...um_third__party_skia_src_opts_SkBlitRow__opts.h | 13 -- ...third__party_skia_src_ports_SkOSFile__stdio.cpp | 4 +- ...hromium_third__party_skia_src_sksl_SkSLString.h | 6 +- ...chromium_third__party_skia_src_utils_SkJSON.cpp | 22 ---- ...y_chromium_third__party_skia_src_utils_SkJSON.h | 51 ------- ..._vulkanmemoryallocator_include_vk__mem__alloc.h | 11 -- ..._3rdparty_chromium_third__party_sqlite_BUILD.gn | 8 +- ...3rdparty_chromium_third__party_usrsctp_BUILD.gn | 22 ++-- ..._3rdparty_chromium_third__party_webrtc_BUILD.gn | 6 +- ...rd__party_webrtc_modules_audio__device_BUILD.gn | 8 +- ...ebrtc_modules_desktop__capture_differ__block.cc | 26 ---- ..._rtp__rtcp_source_forward__error__correction.cc | 8 +- ...rd__party_webrtc_rtc__base_ifaddrs__converter.h | 4 +- ...romium_third__party_webrtc_rtc__base_network.cc | 4 +- ...hromium_third__party_webrtc_rtc__base_network.h | 8 +- ...ty_webrtc_rtc__base_physical__socket__server.cc | 12 +- ...rty_webrtc_rtc__base_platform__thread__types.cc | 12 +- ...m_third__party_webrtc_system__wrappers_BUILD.gn | 8 +- ...rc_3rdparty_chromium_third__party_zlib_BUILD.gn | 20 --- ...arty_chromium_third__party_zlib_cpu__features.c | 22 +--- ...ols_json__schema__compiler_feature__compiler.py | 18 +-- ..._chromium_tools_json__schema__compiler_model.py | 6 +- ...um_tools_perf_chrome__telemetry__build_BUILD.gn | 14 +- ...ty_chromium_ui_aura_test_ui__controls__ozone.cc | 11 ++ ...omium_ui_base_clipboard_clipboard__constants.cc | 16 +++ ...romium_ui_base_clipboard_clipboard__constants.h | 19 +++ ...m_ui_base_clipboard_clipboard__data__endpoint.h | 14 ++ ..._chromium_ui_base_clipboard_clipboard__ozone.cc | 11 ++ ...agdrop_os__exchange__data__provider__factory.cc | 32 ++--- ..._ui_base_ime_init_input__method__initializer.cc | 14 +- ...y_chromium_ui_base_resource_resource__bundle.cc | 16 +-- ...3rdparty_chromium_ui_base_ui__base__features.cc | 31 +++-- ..._3rdparty_chromium_ui_base_ui__base__features.h | 21 +-- ...rdparty_chromium_ui_base_webui_web__ui__util.cc | 23 +++- ...rty_chromium_ui_base_x_x11__shm__image__pool.cc | 22 +--- ...c_3rdparty_chromium_ui_compositor_compositor.cc | 6 +- ...rc_3rdparty_chromium_ui_compositor_compositor.h | 8 +- ...y_chromium_ui_compositor_compositor__observer.h | 6 +- ...vents_devices_x11_device__data__manager__x11.cc | 15 ++- .../patch-src_3rdparty_chromium_ui_events_event.cc | 11 ++ ..._3rdparty_chromium_ui_events_event__switches.cc | 8 +- ...c_3rdparty_chromium_ui_events_event__switches.h | 10 +- ...um_ui_events_keycodes_dom_keycode__converter.cc | 8 +- ...romium_ui_events_ozone_keyboard__hook__ozone.cc | 11 ++ .../patch-src_3rdparty_chromium_ui_gfx_BUILD.gn | 10 +- ...ch-src_3rdparty_chromium_ui_gfx_canvas__skia.cc | 8 +- ...c_3rdparty_chromium_ui_gfx_codec_jpeg__codec.cc | 6 +- ...y_chromium_ui_gfx_codec_png__codec__unittest.cc | 11 -- ...src_3rdparty_chromium_ui_gfx_color__analysis.cc | 87 ------------ ...dparty_chromium_ui_gfx_font__fallback__linux.cc | 10 +- ...atch-src_3rdparty_chromium_ui_gfx_font__list.cc | 8 +- ...rdparty_chromium_ui_gfx_font__names__testing.cc | 29 ++++ ...3rdparty_chromium_ui_gfx_font__render__params.h | 20 +-- ...atch-src_3rdparty_chromium_ui_gfx_font__util.cc | 14 +- ...3rdparty_chromium_ui_gfx_gpu__memory__buffer.cc | 12 +- ..._3rdparty_chromium_ui_gfx_gpu__memory__buffer.h | 14 +- ...hromium_ui_gfx_ipc_gfx__param__traits__macros.h | 30 ++--- ..._ui_gfx_linux_client__native__pixmap__dmabuf.cc | 8 +- ...um_ui_gfx_mojom_buffer__types__mojom__traits.cc | 10 +- ...x_mojom_native__handle__types__mojom__traits.cc | 32 ++--- ...fx_mojom_native__handle__types__mojom__traits.h | 18 +-- ...party_chromium_ui_gfx_native__pixmap__handle.cc | 37 ++++-- ...dparty_chromium_ui_gfx_native__pixmap__handle.h | 18 +-- ...rdparty_chromium_ui_gfx_native__widget__types.h | 20 +++ ...ch-src_3rdparty_chromium_ui_gfx_render__text.cc | 4 +- ...romium_ui_gfx_skbitmap__operations__unittest.cc | 11 -- .../patch-src_3rdparty_chromium_ui_gl_BUILD.gn | 6 +- ...c_3rdparty_chromium_ui_gl_generate__bindings.py | 4 +- ...hromium_ui_gl_gl__bindings__api__autogen__glx.h | 4 +- ...ty_chromium_ui_gl_gl__bindings__autogen__glx.cc | 6 +- ...tch-src_3rdparty_chromium_ui_gl_gl__features.cc | 11 ++ .../patch-src_3rdparty_chromium_ui_gl_gl__fence.cc | 6 +- ...hromium_ui_gl_sync__control__vsync__provider.cc | 26 ++-- ...chromium_ui_gl_sync__control__vsync__provider.h | 18 +-- ..._chromium_ui_gtk_printing_print__dialog__gtk.cc | 11 ++ ..._center_public_cpp_message__center__constants.h | 11 -- ...i_message__center_views_message__popup__view.cc | 4 +- ...party_chromium_ui_native__theme_native__theme.h | 4 +- ...hromium_ui_native__theme_native__theme__base.cc | 10 +- .../patch-src_3rdparty_chromium_ui_ozone_ozone.gni | 12 ++ ...rm__window_platform__window__init__properties.h | 12 +- ...y_chromium_ui_strings_app__locale__settings.grd | 4 +- ..._views_bubble_bubble__dialog__delegate__view.cc | 8 +- ...rc_3rdparty_chromium_ui_views_controls_label.cc | 8 +- ...romium_ui_views_controls_textfield_textfield.cc | 30 ++--- ...party_chromium_ui_views_corewm_tooltip__aura.cc | 4 +- ...y_chromium_ui_views_examples_widget__example.cc | 18 +-- ...party_chromium_ui_views_focus_focus__manager.cc | 20 +++ ...arty_chromium_ui_views_selection__controller.cc | 4 +- ...arty_chromium_ui_views_style_platform__style.cc | 12 +- ...c_3rdparty_chromium_ui_views_views__delegate.cc | 10 +- ...rc_3rdparty_chromium_ui_views_views__delegate.h | 10 +- ..._widget_desktop__aura_desktop__screen__ozone.cc | 11 ++ ...__aura_desktop__window__tree__host__platform.cc | 8 +- ...hromium_ui_views_widget_native__widget__aura.cc | 32 +++-- ...chromium_ui_views_window_custom__frame__view.cc | 4 +- ...ty_chromium_ui_views_window_dialog__delegate.cc | 10 +- ...y_chromium_ui_views_window_frame__background.cc | 10 +- ...3rdparty_chromium_ui_webui_resources_js_icon.js | 11 -- .../files/patch-src_3rdparty_chromium_v8_BUILD.gn | 41 ++---- ...tch-src_3rdparty_chromium_v8_include_v8config.h | 4 +- .../patch-src_3rdparty_chromium_v8_src_api_api.cc | 4 +- .../patch-src_3rdparty_chromium_v8_src_base_cpu.cc | 6 +- ...romium_v8_src_base_platform_platform-freebsd.cc | 12 +- ...chromium_v8_src_base_platform_platform-posix.cc | 6 +- .../files/patch-src_core_core__module.pro | 14 +- www/qt5-webengine/files/sndio_input.cc | 2 +- 517 files changed, 4326 insertions(+), 4745 deletions(-) diff --git a/Mk/Uses/qt-dist.mk b/Mk/Uses/qt-dist.mk index d63794857ac3..de81ae118073 100644 --- a/Mk/Uses/qt-dist.mk +++ b/Mk/Uses/qt-dist.mk @@ -85,7 +85,11 @@ _QT6_MASTER_SITES= ${MASTER_SITE_QT} _QT6_MASTER_SITE_SUBDIR= official_releases/qt/${_QT_VERSION:R}/${_QT_VERSION}/submodules \ official_releases/additional_libraries/${_QT_VERSION:R}/${_QT_VERSION}/ # Qt5 specific distnames +. if ${_QT_DIST} == webengine +_QT5_DISTNAME= ${_QT_DIST:S,^,qt,:S,$,-everywhere-opensource-src-${DISTVERSION},} +. else _QT5_DISTNAME= ${_QT_DIST:S,^,qt,:S,$,-everywhere-src-${DISTVERSION},} +. endif _QT5_DISTNAME_kde= ${_QT_DIST:S,^,kde-qt,:S,$,-${DISTVERSION},} # Qt6 specific distnames _QT6_DISTNAME= ${_QT_DIST:S,^,qt,:S,$,-everywhere-src-${DISTVERSION},} diff --git a/www/qt5-webengine/Makefile b/www/qt5-webengine/Makefile index 780c8d924d23..1868b13c8b96 100644 --- a/www/qt5-webengine/Makefile +++ b/www/qt5-webengine/Makefile @@ -16,7 +16,7 @@ PORTNAME= webengine DISTVERSION= ${QT5_VERSION} -PORTREVISION= 8 +PORTREVISION= 0 CATEGORIES= www PKGNAMEPREFIX= qt5- @@ -24,7 +24,6 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt 5 library to render web content BUILD_DEPENDS= bison:devel/bison \ - yasm:devel/yasm \ ${LOCALBASE}/include/linux/input.h:devel/evdev-proto \ ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ @@ -38,6 +37,7 @@ LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ liblcms2.so:graphics/lcms2 \ libnspr4.so:devel/nspr \ libnss3.so:security/nss \ + libopenh264.so:multimedia/openh264 \ libopus.so:audio/opus \ libpci.so:devel/libpci \ libpng.so:graphics/png \ @@ -47,7 +47,16 @@ LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ libwebp.so:graphics/webp DISTINFO_FILE= ${.CURDIR}/distinfo -QT5_VERSION= 5.15.2 +QT5_VERSION= 5.15.8 + +# Add extra-patch-no-mempcpy-nasm only when there's no mempcpy() in base. +# Nested variable expansion avoids executing the test when not needed for +# expanding EXTRA_PATCHES. +# mempcpy was introduced in ee37f64cf875255338f917a9da76c643cf59786c +EXTRA_PATCHES+= ${"${:!${GREP} mempcpy ${CROSS_SYSROOT}/usr/include/string.h \ + || ${TRUE}!}" == "":?${PATCHDIR}/extra-patch-no-mempcpy-nasm:} + +WRKSRC= ${WRKDIR}/qtwebengine-everywhere-src-${DISTVERSION} OPTIONS_SINGLE= AUDIO OPTIONS_SINGLE_AUDIO= ALSA PULSEAUDIO SNDIO @@ -71,15 +80,16 @@ SNDIO_VARS_OFF= QMAKE_CONFIGURE_ARGS+=-no-sndio # We pass `norecursive' to USES=qmake because src/plugins/plugins.pro checks # whether webenginewidgets is available, which fails when qmake processes all # .pro files at once. -USES= gl gnome gperf jpeg ninja:build pkgconfig python:2.7,build \ - qmake:norecursive,outsource qt-dist:5,webengine shebangfix xorg +USES= gl gnome gperf jpeg minizip ninja:build nodejs:build,lts \ + pkgconfig python:2.7,build qmake:norecursive,outsource \ + qt-dist:5,webengine shebangfix xorg USE_GL= gl USE_GNOME= glib20 libxml2 libxslt USE_QT= core declarative gui location network printsupport \ webchannel widgets \ buildtools:build designer:build qmake:build -USE_XORG= x11 xcb xcomposite xcursor xdamage xext xfixes xi xorgproto \ - xrandr xrender xscrnsaver xtst +USE_XORG= x11 xcb xcomposite xcursor xdamage xext xfixes xi xkbfile \ + xorgproto xrandr xrender xscrnsaver xtst QMAKE_CONFIGURE_ARGS= -proprietary-codecs -system-ffmpeg @@ -132,10 +142,10 @@ post-extract-SNDIO-on: post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ ${WRKSRC}/src/3rdparty/chromium/base/linux_util.cc \ + ${WRKSRC}/src/3rdparty/chromium/base/test/BUILD.gn \ ${WRKSRC}/src/3rdparty/chromium/build/toolchain/gcc_toolchain.gni \ ${WRKSRC}/src/3rdparty/chromium/chrome/common/chrome_paths.cc \ ${WRKSRC}/src/3rdparty/chromium/third_party/pdfium/core/fxge/fx_ge_linux.cpp \ - ${WRKSRC}/src/3rdparty/chromium/third_party/pdfium/xfa/fgas/font/cfx_fontsourceenum_file.cpp \ ${WRKSRC}/src/3rdparty/gn/build/gen.py .if ${ARCH:Mmips*} || ${ARCH:Mpowerpc*} || ${ARCH} == sparc64 @@ -149,8 +159,9 @@ pre-configure: # $LOCALBASE/bin/python being python3 if the default versions is set to 3.x. ${MKDIR} ${CONFIGURE_WRKSRC}/bin && ${LN} -s ${PYTHON_CMD} ${CONFIGURE_WRKSRC}/bin/python # Unbundle a few dependencies. - ${PYTHON_CMD} ${WRKSRC}/src/3rdparty/chromium/build/linux/unbundle/replace_gn_files.py \ - --system-libraries libwebp libxml libxslt yasm + cd ${WRKSRC}/src/3rdparty/chromium && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \ + ./build/linux/unbundle/replace_gn_files.py --system-libraries\ + fontconfig freetype harfbuzz-ng libdrm libevent libpng libwebp libxml libxslt openh264 opus || ${FALSE} # Rerun syncqt.pl -- otherwise the resulting package misses some forwarding headers. cd ${WRKSRC} && ${QT_BINDIR}/syncqt.pl -version ${QT5_VERSION} diff --git a/www/qt5-webengine/distinfo b/www/qt5-webengine/distinfo index d08fca4450e8..40537861d0f6 100644 --- a/www/qt5-webengine/distinfo +++ b/www/qt5-webengine/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1606050276 -SHA256 (KDE/Qt/5.15.2/qtwebengine-everywhere-src-5.15.2.tar.xz) = c8afca0e43d84f7bd595436fbe4d13a5bbdb81ec5104d605085d07545b6f91e0 -SIZE (KDE/Qt/5.15.2/qtwebengine-everywhere-src-5.15.2.tar.xz) = 280142544 +TIMESTAMP = 1673702204 +SHA256 (KDE/Qt/5.15.8/qtwebengine-everywhere-opensource-src-5.15.8.tar.xz) = 4f56dcab592a8e44c93951fb9d4840b5f73fd80ec2776979d38e42abca2b61e3 +SIZE (KDE/Qt/5.15.8/qtwebengine-everywhere-opensource-src-5.15.8.tar.xz) = 316379144 diff --git a/www/qt5-webengine/files/extra-patch-no-mempcpy-nasm b/www/qt5-webengine/files/extra-patch-no-mempcpy-nasm new file mode 100644 index 000000000000..b9b39c0d846a --- /dev/null +++ b/www/qt5-webengine/files/extra-patch-no-mempcpy-nasm @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/third_party/nasm/config/config-linux.h.orig 2022-06-08 06:40:31 UTC ++++ src/3rdparty/chromium/third_party/nasm/config/config-linux.h +@@ -336,7 +336,7 @@ + #define HAVE_MEMORY_H 1 + + /* Define to 1 if you have the `mempcpy' function. */ +-#define HAVE_MEMPCPY 1 ++/* #undef HAVE_MEMPCPY */ + + /* Define to 1 if you have a working `mmap' system call. */ + #define HAVE_MMAP 1 diff --git a/www/qt5-webengine/files/freebsd.pri b/www/qt5-webengine/files/freebsd.pri index 873da96cd3f5..2cbfe4735b5a 100644 --- a/www/qt5-webengine/files/freebsd.pri +++ b/www/qt5-webengine/files/freebsd.pri @@ -4,8 +4,3 @@ gn_args += enable_basic_printing=true \ enable_print_preview=true \ use_dbus=true \ use_udev=false - -# Once the port works better, we can think about readding the diverse `use_system_` -# for bundled libraries. -# For now, only add very few system libraries. -gn_args += use_system_yasm=true diff --git a/www/qt5-webengine/files/patch-clang b/www/qt5-webengine/files/patch-clang deleted file mode 100644 index 6d3310806100..000000000000 --- a/www/qt5-webengine/files/patch-clang +++ /dev/null @@ -1,40 +0,0 @@ ---- src/3rdparty/chromium/base/strings/safe_sprintf_unittest.cc.orig 2018-11-13 18:25:11 UTC -+++ src/3rdparty/chromium/base/strings/safe_sprintf_unittest.cc -@@ -730,6 +730,7 @@ TEST(SafeSPrintfTest, EmbeddedNul) { - } - - TEST(SafeSPrintfTest, EmitNULL) { -+/* Avoid compiler error: http://pastebin.com/1edWUE84 - char buf[40]; - #if defined(__GNUC__) - #pragma GCC diagnostic push -@@ -741,6 +742,7 @@ TEST(SafeSPrintfTest, EmitNULL) { - EXPECT_EQ("0x0", std::string(buf)); - EXPECT_EQ(6, SafeSPrintf(buf, "%s", NULL)); - EXPECT_EQ("", std::string(buf)); -+*/ - #if defined(__GCC__) - #pragma GCC diagnostic pop - #endif ---- src/3rdparty/chromium/base/threading/thread_local_storage_unittest.cc.orig 2018-11-13 18:25:11 UTC -+++ src/3rdparty/chromium/base/threading/thread_local_storage_unittest.cc -@@ -86,7 +86,7 @@ class ThreadLocalStorageRunner : public DelegateSimple - void ThreadLocalStorageCleanup(void *value) { - int *ptr = reinterpret_cast(value); - // Destructors should never be called with a NULL. -- ASSERT_NE(reinterpret_cast(NULL), ptr); -+ ASSERT_NE(static_cast(NULL), ptr); - if (*ptr == kFinalTlsValue) - return; // We've been called enough times. - ASSERT_LT(kFinalTlsValue, *ptr); ---- src/3rdparty/chromium/media/audio/audio_output_proxy_unittest.cc.orig 2018-11-13 18:25:11 UTC -+++ src/3rdparty/chromium/media/audio/audio_output_proxy_unittest.cc -@@ -410,7 +410,7 @@ class AudioOutputProxyTest : public testing::Test { - // |stream| is closed at this point. Start() should reopen it again. - EXPECT_CALL(manager(), MakeAudioOutputStream(_, _, _)) - .Times(2) -- .WillRepeatedly(Return(reinterpret_cast(NULL))); -+ .WillRepeatedly(Return(static_cast(NULL))); - - EXPECT_CALL(callback_, OnError()).Times(2); - diff --git a/www/qt5-webengine/files/patch-mkspecs_features_functions.prf b/www/qt5-webengine/files/patch-mkspecs_features_functions.prf index d8a05ec83133..7410d6d6af83 100644 --- a/www/qt5-webengine/files/patch-mkspecs_features_functions.prf +++ b/www/qt5-webengine/files/patch-mkspecs_features_functions.prf @@ -1,4 +1,4 @@ ---- mkspecs/features/functions.prf.orig 2020-11-07 01:22:36 UTC +--- mkspecs/features/functions.prf.orig 2021-12-15 16:12:54 UTC +++ mkspecs/features/functions.prf @@ -84,6 +84,10 @@ defineReplace(gnWebEngineArgs) { include($$QTWEBENGINE_ROOT/src/buildtools/config/windows.pri) @@ -19,15 +19,15 @@ include($$QTWEBENGINE_ROOT/src/pdf/config/common.pri) isEmpty(gn_args): error(No gn_args found please make sure you have valid configuration.) return($$gn_args) -@@ -106,6 +111,7 @@ defineReplace(gnArch) { - contains(qtArch, "arm64"): return(arm64) +@@ -107,6 +112,7 @@ defineReplace(gnArch) { contains(qtArch, "mips"): return(mipsel) contains(qtArch, "mips64"): return(mips64el) + contains(qtArch, "mips64el"): return(mips64el) + contains(qtArch, "power64"): return(ppc64) return(unknown) } -@@ -113,6 +119,7 @@ defineReplace(gnOS) { +@@ -114,6 +120,7 @@ defineReplace(gnOS) { macos: return(mac) win32: return(win) linux: return(linux) diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_BUILD.gn b/www/qt5-webengine/files/patch-src_3rdparty_chromium_BUILD.gn index d0328ec408a0..be4c4ae2a7fb 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_BUILD.gn +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_BUILD.gn @@ -1,15 +1,15 @@ ---- src/3rdparty/chromium/BUILD.gn.orig 2020-11-07 01:22:36 UTC +--- src/3rdparty/chromium/BUILD.gn.orig 2021-12-15 16:12:54 UTC +++ src/3rdparty/chromium/BUILD.gn -@@ -419,7 +419,7 @@ group("gn_all") { +@@ -423,7 +423,7 @@ group("gn_all") { ] } -- if (is_linux || is_android) { -+ if ((is_linux && !is_bsd) || is_android) { +- if (is_linux || is_chromeos || is_android) { ++ if ((is_linux && !is_bsd) || is_chromeos || is_android) { deps += [ "//third_party/breakpad:breakpad_unittests", "//third_party/breakpad:core-2-minidump", -@@ -460,8 +460,6 @@ group("gn_all") { +@@ -464,8 +464,6 @@ group("gn_all") { "//net:disk_cache_memory_test", "//net:quic_client", "//net:quic_server", @@ -18,7 +18,7 @@ "//testing:empty_main", ] -@@ -516,10 +514,6 @@ group("gn_all") { +@@ -520,10 +518,6 @@ group("gn_all") { "//chrome/test:load_library_perf_tests", "//chrome/test:sync_performance_tests", "//chrome/test/chromedriver:chromedriver", @@ -29,7 +29,7 @@ "//media/cast:generate_barcode_video", "//media/cast:generate_timecode_audio", "//net:crash_cache", -@@ -592,10 +586,6 @@ group("gn_all") { +@@ -595,10 +589,6 @@ group("gn_all") { "//mojo:mojo_perftests", "//services/service_manager/public/cpp", "//testing/gmock:gmock_main", @@ -40,7 +40,7 @@ ] if (!is_android) { -@@ -669,7 +659,7 @@ group("gn_all") { +@@ -676,7 +666,7 @@ group("gn_all") { host_os == "win" && !use_qt) { deps += [ "//chrome/test/mini_installer:mini_installer_tests" ] } @@ -49,16 +49,25 @@ deps += [ "//third_party/breakpad:symupload($host_toolchain)" ] } -@@ -802,7 +792,6 @@ group("gn_all") { +@@ -691,7 +681,7 @@ group("gn_all") { + } + } + +- if (is_mac || is_win || is_android || (is_linux && !is_chromeos)) { ++ if (is_mac || is_win || is_android || (is_linux && !is_chromeos && !is_bsd)) { + deps += [ + "//third_party/crashpad/crashpad:crashpad_tests", + "//third_party/crashpad/crashpad/handler:crashpad_handler", +@@ -810,7 +800,6 @@ group("gn_all") { "//chrome/browser/vr:vr_common_perftests", "//chrome/browser/vr:vr_common_unittests", "//chrome/browser/vr:vr_pixeltests", - "//tools/perf/contrib/vr_benchmarks:vr_perf_tests", ] - if (is_desktop_linux && use_ozone) { - deps += [ "//chrome/browser/vr/testapp:vr_testapp" ] -@@ -1085,7 +1074,7 @@ if (!is_ios && !use_qt) { - ] + if (is_android) { + deps += [ "//chrome/browser/android/vr:vr_android_unittests" ] +@@ -1103,7 +1092,7 @@ if (!is_ios && !use_qt) { + data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ] } - if (!is_win && !is_android) { @@ -66,16 +75,16 @@ data_deps += [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ] } -@@ -1094,7 +1083,7 @@ if (!is_ios && !use_qt) { +@@ -1112,7 +1101,7 @@ if (!is_ios && !use_qt) { data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } -- if (is_linux) { -+ if (is_linux && !is_bsd) { +- if (is_linux || is_chromeos) { ++ if ((is_linux && !is_bsd) || is_chromeos) { data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } -@@ -1286,9 +1275,6 @@ group("chromium_builder_perf") { +@@ -1308,9 +1297,6 @@ group("chromium_builder_perf") { if (is_win) { data_deps += [ "//chrome/installer/mini_installer:mini_installer" ] diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_BUILD.gn b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_BUILD.gn index 552ca411ae1d..166ea3ca28e4 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_BUILD.gn +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_BUILD.gn @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/BUILD.gn.orig 2020-11-07 01:22:36 UTC +--- src/3rdparty/chromium/base/BUILD.gn.orig 2021-12-15 16:12:54 UTC +++ src/3rdparty/chromium/base/BUILD.gn -@@ -59,7 +59,7 @@ declare_args() { +@@ -54,7 +54,7 @@ declare_args() { # replacement base::Location::Current(). On by default in non-official builds # for testing purposes. # TODO(https://crbug.com/974061): remove this eventually. @@ -9,20 +9,19 @@ # Unsafe developer build. Has developer-friendly features that may weaken or # disable security measures like sandboxing or ASLR. -@@ -929,7 +929,7 @@ jumbo_component("base") { +@@ -886,7 +886,7 @@ jumbo_component("base") { "timer/hi_res_timer_manager_posix.cc", ] -- if (!is_nacl && !is_mac && !is_ios) { -+ if (!is_nacl && !is_mac && !is_ios && !is_bsd) { +- if (!is_nacl && !is_apple) { ++ if (!is_nacl && !is_apple && !is_bsd) { sources += [ - "profiler/stack_copier_signal.cc", - "profiler/stack_copier_signal.h", -@@ -938,6 +938,12 @@ jumbo_component("base") { + "cpu_affinity_posix.cc", + "cpu_affinity_posix.h", +@@ -897,6 +897,11 @@ jumbo_component("base") { "profiler/thread_delegate_posix.h", ] } -+ + if (is_bsd) { + sources += [ + "profiler/stack_sampler_posix.cc", @@ -30,41 +29,34 @@ + } } - jumbo_excluded_sources = [] -@@ -1239,7 +1245,13 @@ jumbo_component("base") { + jumbo_excluded_sources = [ +@@ -1213,7 +1218,6 @@ jumbo_component("base") { "process/process_metrics_linux.cc", "threading/platform_thread_linux.cc", ] - jumbo_excluded_sources += [ "process/memory_linux.cc" ] -+ # Omit this because it will be excluded via "is_bsd" further down in -+ # this file -+ # jumbo_excluded_sources += [ "process/memory_linux.cc" ] -+ # ...but remove the following files from jumbo merge otherwise it will -+ # emit errors of redefined variables -+ jumbo_excluded_sources += [ "metrics/histogram.cc" ] -+ jumbo_excluded_sources += [ "metrics/sparse_histogram.cc" ] } if (!is_nacl) { -@@ -1324,7 +1336,7 @@ 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. -- if (!use_sysroot && (is_android || (is_linux && !is_chromecast && !use_qt)) && -+ if (!use_sysroot && (is_android || (is_linux && !is_chromecast && !use_qt) && !is_clang) && - host_toolchain != "//build/toolchain/cros:host") { - libs += [ "atomic" ] - } -@@ -1350,7 +1362,7 @@ jumbo_component("base") { - "allocator/allocator_shim_override_glibc_weak_symbols.h", - ] - deps += [ "//base/allocator:tcmalloc" ] -- } else if (is_linux && use_allocator == "none") { -+ } else if ((is_linux && !is_bsd) && use_allocator == "none") { - sources += [ "allocator/allocator_shim_default_dispatch_to_glibc.cc" ] - } else if (is_android && use_allocator == "none") { - sources += [ -@@ -1947,6 +1959,33 @@ jumbo_component("base") { +@@ -1355,7 +1359,7 @@ jumbo_component("base") { + "allocator/allocator_shim_default_dispatch_to_mac_zoned_malloc.cc", + ] + } +- if (is_chromeos || is_linux) { ++ if ((is_chromeos || is_linux) && !is_bsd) { + sources += [ "allocator/allocator_shim_default_dispatch_to_glibc.cc" ] + } + if (is_win) { +@@ -1826,7 +1830,7 @@ jumbo_component("base") { + ] + } + +- if (is_linux || is_chromeos || is_android) { ++ if ((is_linux || is_chromeos || is_android) && !is_bsd) { + sources += [ + "allocator/partition_allocator/spinning_futex_linux.cc", + "allocator/partition_allocator/spinning_futex_linux.h", +@@ -1982,6 +1986,34 @@ jumbo_component("base") { } } @@ -94,29 +86,26 @@ + "util" # process_metrics_freebsd + ] + } ++ + # iOS if (is_ios) { sources -= [ -@@ -2903,7 +2942,7 @@ test("base_unittests") { - "posix/unix_domain_socket_unittest.cc", *** 16348 LINES SKIPPED ***