pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/x11/qt5-qtwebengine
Module Name: pkgsrc
Committed By: markd
Date: Thu Jun 8 20:38:06 UTC 2023
Modified Files:
pkgsrc/x11/qt5-qtwebengine: Makefile distinfo
pkgsrc/x11/qt5-qtwebengine/patches: patch-configure.pri
patch-mkspecs_features_functions.prf
patch-src_3rdparty_chromium_BUILD.gn
patch-src_3rdparty_chromium_chrome_test_BUILD.gn
patch-src_3rdparty_chromium_content_browser_BUILD.gn
patch-src_3rdparty_chromium_content_shell_BUILD.gn
patch-src_3rdparty_chromium_headless_BUILD.gn
patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_bind__gen_style__format.py
patch-src_3rdparty_chromium_third__party_webrtc_test_BUILD.gn
patch-src_3rdparty_chromium_tools_binary__size_BUILD.gn
patch-src_3rdparty_chromium_tools_perf_chrome__telemetry__build_BUILD.gn
patch-src_3rdparty_chromium_weblayer_shell_BUILD.gn
patch-src_buildtools_config_support.pri
patch-src_buildtools_configure.json
Added Files:
pkgsrc/x11/qt5-qtwebengine/patches:
patch-src_3rdparty_chromium_build_print__python__deps.py
patch-src_3rdparty_chromium_chrome_chrome__paks.gni
patch-src_3rdparty_chromium_components_resources_protobufs_binary__proto__generator.py
patch-src_3rdparty_chromium_content_browser_tracing_BUILD.gn
patch-src_3rdparty_chromium_content_browser_tracing_generate__trace__viewer__grd.py
patch-src_3rdparty_chromium_content_browser_tracing_tracing__ui.cc
patch-src_3rdparty_chromium_fuchsia_engine_BUILD.gn
patch-src_3rdparty_chromium_media_ffmpeg_ffmpeg__common.h
patch-src_3rdparty_chromium_media_filters_audio__file__reader.cc
patch-src_3rdparty_chromium_media_filters_ffmpeg__audio__decoder.cc
patch-src_3rdparty_chromium_media_filters_ffmpeg__demuxer.cc
patch-src_3rdparty_chromium_media_filters_ffmpeg__glue.cc
patch-src_3rdparty_chromium_media_filters_ffmpeg__video__decoder.cc
patch-src_3rdparty_chromium_media_filters_media__file__checker.cc
patch-src_3rdparty_chromium_mojo_public_tools_BUILD.gn
patch-src_3rdparty_chromium_mojo_public_tools_bindings_BUILD.gn
patch-src_3rdparty_chromium_mojo_public_tools_bindings_gen__data__files__list.py
patch-src_3rdparty_chromium_mojo_public_tools_bindings_generators_mojom__java__generator.py
patch-src_3rdparty_chromium_mojo_public_tools_mojom_mojom_generate_generator.py
patch-src_3rdparty_chromium_mojo_public_tools_mojom_mojom_generate_module.py
patch-src_3rdparty_chromium_mojo_public_tools_mojom_mojom_generate_template__expander.py
patch-src_3rdparty_chromium_testing_BUILD.gn
patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_bind__gen_blink__v8__bridge.py
patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_bind__gen_callback__interface.py
patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_bind__gen_code__node.py
patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_bind__gen_codegen__expr.py
patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_bind__gen_codegen__format.py
patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_bind__gen_codegen__utils.py
patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_bind__gen_dictionary.py
patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_bind__gen_interface.py
patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_bind__gen_mako__renderer.py
patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_bind__gen_task__queue.py
patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_code__generator.py
patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_generate__origin__trial__features.py
patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_idl__definitions.py
patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_idl__reader.py
patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_idl__types.py
patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_utilities.py
patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_v8__interface.py
patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_v8__methods.py
patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_v8__utilities.py
patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_web__idl_callback__interface.py
patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_web__idl_database.py
patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_web__idl_exposure.py
patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_web__idl_function__like.py
patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_web__idl_idl__compiler.py
patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_web__idl_interface.py
patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_web__idl_ir__builder.py
patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_web__idl_make__copy.py
patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_web__idl_namespace.py
patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_templates_dictionary__v8.cc.tmpl
patch-src_3rdparty_chromium_third__party_blink_renderer_build_scripts_core_css_make__style__shorthands.py
patch-src_3rdparty_chromium_third__party_blink_renderer_build_scripts_core_css_properties_make__css__property__instances.py
patch-src_3rdparty_chromium_third__party_blink_renderer_build_scripts_gperf.py
patch-src_3rdparty_chromium_third__party_blink_renderer_build_scripts_in__file.py
patch-src_3rdparty_chromium_third__party_blink_renderer_build_scripts_in__generator.py
patch-src_3rdparty_chromium_third__party_blink_renderer_build_scripts_make__runtime__features.py
patch-src_3rdparty_chromium_third__party_blink_renderer_build_scripts_templates_element__factory.cc.tmpl
patch-src_3rdparty_chromium_third__party_blink_renderer_build_scripts_templates_element__type__helpers.cc.tmpl
patch-src_3rdparty_chromium_third__party_blink_renderer_build_scripts_templates_element__type__helpers.h.tmpl
patch-src_3rdparty_chromium_third__party_blink_renderer_build_scripts_templates_macros.tmpl
patch-src_3rdparty_chromium_third__party_blink_renderer_build_scripts_templates_make__qualified__names.h.tmpl
patch-src_3rdparty_chromium_third__party_dawn_generator_generator__lib.py
patch-src_3rdparty_chromium_third__party_devtools-frontend_src_BUILD.gn
patch-src_3rdparty_chromium_third__party_devtools-frontend_src_scripts_build_build__inspector__overlay.py
patch-src_3rdparty_chromium_third__party_devtools-frontend_src_scripts_build_build__release__applications.py
patch-src_3rdparty_chromium_third__party_devtools-frontend_src_scripts_build_generate__devtools__grd.py
patch-src_3rdparty_chromium_third__party_devtools-frontend_src_scripts_build_modular__build.py
patch-src_3rdparty_chromium_third__party_jinja2_tests.py
patch-src_3rdparty_chromium_third__party_webrtc_modules_video__coding_codecs_h264_h264__decoder__impl.cc
patch-src_3rdparty_chromium_tools_grit_BUILD.gn
patch-src_3rdparty_chromium_tools_grit_grit_util.py
patch-src_3rdparty_chromium_tools_gritsettings_resource__ids.spec
patch-src_3rdparty_chromium_tools_metrics_BUILD.gn
patch-src_3rdparty_chromium_tools_metrics_ukm_gen__builders.py
patch-src_3rdparty_chromium_tools_metrics_ukm_ukm__model.py
patch-src_3rdparty_chromium_tools_perf_core_perfetto__binary__roller_BUILD.gn
patch-src_3rdparty_chromium_tools_polymer_BUILD.gn
patch-src_3rdparty_chromium_ui_ozone_generate__constructor__list.py
patch-src_3rdparty_chromium_ui_ozone_generate__ozone__platform__list.py
patch-src_3rdparty_chromium_v8_tools_BUILD.gn
patch-src_core_qtwebengine__resources.gni
Log Message:
qt5-qtwebengine: patches for ffmpeg>=5 and for python3 - via ArchLinux
To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 pkgsrc/x11/qt5-qtwebengine/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/x11/qt5-qtwebengine/distinfo
cvs rdiff -u -r1.1 -r1.2 \
pkgsrc/x11/qt5-qtwebengine/patches/patch-configure.pri \
pkgsrc/x11/qt5-qtwebengine/patches/patch-mkspecs_features_functions.prf \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_headless_BUILD.gn \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_bind__gen_style__format.py
cvs rdiff -u -r1.2 -r1.3 \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_BUILD.gn \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_chrome_test_BUILD.gn \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_content_browser_BUILD.gn \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_content_shell_BUILD.gn \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_webrtc_test_BUILD.gn \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_tools_binary__size_BUILD.gn \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_tools_perf_chrome__telemetry__build_BUILD.gn \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_weblayer_shell_BUILD.gn \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_buildtools_config_support.pri \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_buildtools_configure.json
cvs rdiff -u -r0 -r1.1 \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_build_print__python__deps.py \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_chrome_chrome__paks.gni \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_components_resources_protobufs_binary__proto__generator.py \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_content_browser_tracing_BUILD.gn \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_content_browser_tracing_generate__trace__viewer__grd.py \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_content_browser_tracing_tracing__ui.cc \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_fuchsia_engine_BUILD.gn \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_media_ffmpeg_ffmpeg__common.h \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_media_filters_audio__file__reader.cc \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_media_filters_ffmpeg__audio__decoder.cc \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_media_filters_ffmpeg__demuxer.cc \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_media_filters_ffmpeg__glue.cc \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_media_filters_ffmpeg__video__decoder.cc \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_media_filters_media__file__checker.cc \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_mojo_public_tools_BUILD.gn \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_mojo_public_tools_bindings_BUILD.gn \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_mojo_public_tools_bindings_gen__data__files__list.py \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_mojo_public_tools_bindings_generators_mojom__java__generator.py \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_mojo_public_tools_mojom_mojom_generate_generator.py \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_mojo_public_tools_mojom_mojom_generate_module.py \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_mojo_public_tools_mojom_mojom_generate_template__expander.py \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_testing_BUILD.gn \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_bind__gen_blink__v8__bridge.py \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_bind__gen_callback__interface.py \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_bind__gen_code__node.py \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_bind__gen_codegen__expr.py \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_bind__gen_codegen__format.py \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_bind__gen_codegen__utils.py \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_bind__gen_dictionary.py \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_bind__gen_interface.py \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_bind__gen_mako__renderer.py \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_bind__gen_task__queue.py \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_code__generator.py \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_generate__origin__trial__features.py \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_idl__definitions.py \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_idl__reader.py \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_idl__types.py \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_utilities.py \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_v8__interface.py \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_v8__methods.py \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_v8__utilities.py \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_web__idl_callback__interface.py \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_web__idl_database.py \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_web__idl_exposure.py \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_web__idl_function__like.py \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_web__idl_idl__compiler.py \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_web__idl_interface.py \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_web__idl_ir__builder.py \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_web__idl_make__copy.py \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_web__idl_namespace.py \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_templates_dictionary__v8.cc.tmpl \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_build_scripts_core_css_make__style__shorthands.py \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_build_scripts_core_css_properties_make__css__property__instances.py \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_build_scripts_gperf.py \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_build_scripts_in__file.py \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_build_scripts_in__generator.py \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_build_scripts_make__runtime__features.py \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_build_scripts_templates_element__factory.cc.tmpl \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_build_scripts_templates_element__type__helpers.cc.tmpl \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_build_scripts_templates_element__type__helpers.h.tmpl \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_build_scripts_templates_macros.tmpl \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_build_scripts_templates_make__qualified__names.h.tmpl \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_dawn_generator_generator__lib.py \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_devtools-frontend_src_scripts_build_build__inspector__overlay.py \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_devtools-frontend_src_scripts_build_build__release__applications.py \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_devtools-frontend_src_scripts_build_generate__devtools__grd.py \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_devtools-frontend_src_scripts_build_modular__build.py \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_jinja2_tests.py \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_webrtc_modules_video__coding_codecs_h264_h264__decoder__impl.cc \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_tools_grit_BUILD.gn \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_tools_grit_grit_util.py \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_tools_gritsettings_resource__ids.spec \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_tools_metrics_BUILD.gn \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_tools_metrics_ukm_gen__builders.py \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_tools_metrics_ukm_ukm__model.py \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_tools_perf_core_perfetto__binary__roller_BUILD.gn \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_tools_polymer_BUILD.gn \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_ui_ozone_generate__constructor__list.py \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_ui_ozone_generate__ozone__platform__list.py \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_v8_tools_BUILD.gn \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_core_qtwebengine__resources.gni
cvs rdiff -u -r0 -r1.3 \
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_devtools-frontend_src_BUILD.gn
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/x11/qt5-qtwebengine/Makefile
diff -u pkgsrc/x11/qt5-qtwebengine/Makefile:1.45 pkgsrc/x11/qt5-qtwebengine/Makefile:1.46
--- pkgsrc/x11/qt5-qtwebengine/Makefile:1.45 Wed Jun 7 08:44:58 2023
+++ pkgsrc/x11/qt5-qtwebengine/Makefile Thu Jun 8 20:38:05 2023
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.45 2023/06/07 08:44:58 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2023/06/08 20:38:05 markd Exp $
DISTNAME= qtwebengine-everywhere-opensource-src-${QTVERSION}
PKGNAME= qt5-qtwebengine-${QTVERSION}
-PKGREVISION= 7
+PKGREVISION= 8
COMMENT= Chromium-based web engine for Qt5
MAKE_ENV+= QTDIR=${QTDIR}
@@ -99,11 +99,10 @@ MAKE_ENV+= OSX_VERSION=${OSX_VERSION}
#.include "../../mk/jpeg.buildlink3.mk"
.include "../../graphics/lcms2/buildlink3.mk"
.include "../../graphics/libwebp/buildlink3.mk"
-PYTHON_VERSIONS_ACCEPTED= 27
+#PYTHON_VERSIONS_ACCEPTED= 27
PYTHON_FOR_BUILD_ONLY= tool
.include "../../lang/python/tool.mk"
-# does not support ffmpeg5 as of 5.15.4
-.include "../../multimedia/ffmpeg4/buildlink3.mk"
+.include "../../multimedia/ffmpeg5/buildlink3.mk"
.include "../../multimedia/libvpx/buildlink3.mk"
.include "../../print/libcups/buildlink3.mk"
.include "../../print/poppler-cpp/buildlink3.mk"
Index: pkgsrc/x11/qt5-qtwebengine/distinfo
diff -u pkgsrc/x11/qt5-qtwebengine/distinfo:1.12 pkgsrc/x11/qt5-qtwebengine/distinfo:1.13
--- pkgsrc/x11/qt5-qtwebengine/distinfo:1.12 Wed Apr 12 19:24:06 2023
+++ pkgsrc/x11/qt5-qtwebengine/distinfo Thu Jun 8 20:38:05 2023
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.12 2023/04/12 19:24:06 adam Exp $
+$NetBSD: distinfo,v 1.13 2023/06/08 20:38:05 markd Exp $
BLAKE2s (qtwebengine-everywhere-opensource-src-5.15.9.tar.xz) = 0b239527cbe32a555bf4273188533c0912e45719038e619489d61cdf4060f0c5
SHA512 (qtwebengine-everywhere-opensource-src-5.15.9.tar.xz) = 7142ac2e59e4aa2bedbe35e6242c1359fc9c51bd7db9f31d89f01dc2843f38bf7f80869e603a57190791a97aef9ba1064eb0f90cf09e5293f61f250c455cb07a
Size (qtwebengine-everywhere-opensource-src-5.15.9.tar.xz) = 316318672 bytes
-SHA1 (patch-configure.pri) = b72a1b08402adf3167f8747e4d221210d5f1783d
-SHA1 (patch-mkspecs_features_functions.prf) = e9c7a9c348cc7b9d09232f4b03f0a8282e9bfeb5
-SHA1 (patch-src_3rdparty_chromium_BUILD.gn) = 97fbda3bd2dc44d4ae97b650240e61516cd108f4
+SHA1 (patch-configure.pri) = e9d971f18d0a7a8a58d635eb6688193fb92020f3
+SHA1 (patch-mkspecs_features_functions.prf) = 6bf237521df3d60649b603b7cb7d21f793df1386
+SHA1 (patch-src_3rdparty_chromium_BUILD.gn) = 228416b6472c48727df1a6c86ac97814fd5cb3b5
SHA1 (patch-src_3rdparty_chromium_base_BUILD.gn) = 839b97c34e0aaf1309c89af6c9f8e65ebf77a7e5
SHA1 (patch-src_3rdparty_chromium_base_allocator_BUILD.gn) = 1d1a911a3cbbce34c216c181dee8a899a6f92ea6
SHA1 (patch-src_3rdparty_chromium_base_allocator_allocator__shim__unittest.cc) = bf1f998f9c8c8868c520ca37acd9358e6ea7d944
@@ -107,6 +107,7 @@ SHA1 (patch-src_3rdparty_chromium_build_
SHA1 (patch-src_3rdparty_chromium_build_linux_libpci_BUILD.gn) = 1faa661a74959746bff8ffa1b84cabccb3082f5b
SHA1 (patch-src_3rdparty_chromium_build_linux_unbundle_fontconfig.gn) = a263f34e3c942bb512a29e65bcd07e619e128dd0
SHA1 (patch-src_3rdparty_chromium_build_mac_find__sdk.py) = d56a153fef94ed3283d2ab78564c5915693f00cd
+SHA1 (patch-src_3rdparty_chromium_build_print__python__deps.py) = 23f3a0c84b09b7788ff0b99caf8a16659e079a14
SHA1 (patch-src_3rdparty_chromium_build_toolchain_gcc__toolchain.gni) = 4f4ff37dece2f32b8b32b449a4059512b02a1080
SHA1 (patch-src_3rdparty_chromium_build_toolchain_netbsd_BUILD.gn) = 8c2abdb0bda5507930135287a098cb876e739a24
SHA1 (patch-src_3rdparty_chromium_chrome_BUILD.gn) = 8fc273605f5475301e63420755d77ea54c6a5889
@@ -143,6 +144,7 @@ SHA1 (patch-src_3rdparty_chromium_chrome
SHA1 (patch-src_3rdparty_chromium_chrome_browser_ui_webui_settings_appearance__handler.cc) = feb2fbba10ee63298acf632aaedbe2398f7903c7
SHA1 (patch-src_3rdparty_chromium_chrome_browser_ui_webui_settings_appearance__handler.h) = 52d6c9aa4401dff0fec72173f10e9659e0fa7737
SHA1 (patch-src_3rdparty_chromium_chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc) = cec218b2a2692eab55ae9e8fb8770b37f0973f48
+SHA1 (patch-src_3rdparty_chromium_chrome_chrome__paks.gni) = 8f9120afbc036f58d9f185fa9f357a5683054a41
SHA1 (patch-src_3rdparty_chromium_chrome_common_BUILD.gn) = c187f49147684de32d654d20c4522b4d9668cbd1
SHA1 (patch-src_3rdparty_chromium_chrome_common_channel__info.h) = e6d288b37fa27cfe0b703767a4d444c567fe5d14
SHA1 (patch-src_3rdparty_chromium_chrome_common_channel__info__posix.cc) = 2863fb2f7cd90f3a989129e13d0be22ed1c75587
@@ -166,7 +168,7 @@ SHA1 (patch-src_3rdparty_chromium_chrome
SHA1 (patch-src_3rdparty_chromium_chrome_renderer_BUILD.gn) = 31c284af2a079aafa36b97bc8e9290fd0fab38c4
SHA1 (patch-src_3rdparty_chromium_chrome_renderer_pepper_pepper__flash__font__file__host.cc) = 9194140174be931fb378a34517b834e115faf65a
SHA1 (patch-src_3rdparty_chromium_chrome_renderer_pepper_pepper__flash__font__file__host.h) = 5d46bb2e2bc4fedabda32ba4e33e152e7a907b66
-SHA1 (patch-src_3rdparty_chromium_chrome_test_BUILD.gn) = 46030ef1ec5ee547f759a50625adc41586c5b883
+SHA1 (patch-src_3rdparty_chromium_chrome_test_BUILD.gn) = 8851f599bcd19b884732e2c896264a590927902a
SHA1 (patch-src_3rdparty_chromium_chromecast_BUILD.gn) = a388eee79507d7c0b8491cf65cd50a31e0ec822d
SHA1 (patch-src_3rdparty_chromium_chromecast_bindings_BUILD.gn) = 63911f2563a7b78495d534fe37574a814a5cc9b7
SHA1 (patch-src_3rdparty_chromium_chromecast_browser_BUILD.gn) = 4c8e38d6e5d7727ac70cfd01cbeac331db071d9f
@@ -212,6 +214,7 @@ SHA1 (patch-src_3rdparty_chromium_compon
SHA1 (patch-src_3rdparty_chromium_components_policy_BUILD.gn) = 2a9179f10c5945591178a9abd4325372eaa753df
SHA1 (patch-src_3rdparty_chromium_components_policy_core_common_BUILD.gn) = 6a804c7fb13e3160e17969f239077b52698d7c90
SHA1 (patch-src_3rdparty_chromium_components_previews_core_previews__features.cc) = f1114ac9fd638b0d0e6627969993c25a46cfac31
+SHA1 (patch-src_3rdparty_chromium_components_resources_protobufs_binary__proto__generator.py) = 56765d64c3b8065c05c22880c4a61c08846dc32c
SHA1 (patch-src_3rdparty_chromium_components_safe__browsing_core_resources_BUILD.gn) = d875c7f3047351a3c6589fba39a80fec3527a88b
SHA1 (patch-src_3rdparty_chromium_components_safe__browsing_core_resources_gen__file__type__proto.py) = b2a0484c91eeb6598a2f6fa37c8a0482a66cb78c
SHA1 (patch-src_3rdparty_chromium_components_security__interstitials_content_captive__portal__blocking__page.cc) = 7ffa412fed374fe53bf3eb2e8591424843c11f8d
@@ -242,7 +245,7 @@ SHA1 (patch-src_3rdparty_chromium_compon
SHA1 (patch-src_3rdparty_chromium_components_webcrypto_algorithms_test__helpers.cc) = 208b91b7b2172baf9a984a384f86f868db63d3ae
SHA1 (patch-src_3rdparty_chromium_content_app_content__main.cc) = 598bc0a6abdfe3eff4581976915ff18f7b975638
SHA1 (patch-src_3rdparty_chromium_content_app_content__main__runner__impl.cc) = 6d4022d4cf4abc946224ee155d29eea019dc9262
-SHA1 (patch-src_3rdparty_chromium_content_browser_BUILD.gn) = 684718bd784bdfbc0e0caeb7a91f450af327d2dd
+SHA1 (patch-src_3rdparty_chromium_content_browser_BUILD.gn) = aabef87e186ec44ab5fa5767059104a13ab70cdc
SHA1 (patch-src_3rdparty_chromium_content_browser_browser__main__loop.cc) = 5ba18f78394bb5b777bff072a447e14a12824636
SHA1 (patch-src_3rdparty_chromium_content_browser_child__process__launcher__helper__linux.cc) = c7603af71fba00d148c575c7dad8125fa8eff438
SHA1 (patch-src_3rdparty_chromium_content_browser_compositor_viz__process__transport__factory.cc) = bded50a3060ac935616fcd66f94c0f6f2f5a7cdf
@@ -263,6 +266,9 @@ SHA1 (patch-src_3rdparty_chromium_conten
SHA1 (patch-src_3rdparty_chromium_content_browser_scheduler_responsiveness_jank__monitor_impl.cc) = b922ad9ea4afc915fb12c6864e9d2fa8b30be611
SHA1 (patch-src_3rdparty_chromium_content_browser_scheduler_responsiveness_native__event__observer.cc) = 2c52d3185a329de58f171cb6ee7f21ca4c2fd944
SHA1 (patch-src_3rdparty_chromium_content_browser_scheduler_responsiveness_native__event__observer.h) = e758b897e29d027d1321761cf8e509efdae85f1f
+SHA1 (patch-src_3rdparty_chromium_content_browser_tracing_BUILD.gn) = c2a4263e20e70edd2d1dbbe1755a5c5497d7cd09
+SHA1 (patch-src_3rdparty_chromium_content_browser_tracing_generate__trace__viewer__grd.py) = 63e7d017bf66d90252431be5eea94a2eba6f6f18
+SHA1 (patch-src_3rdparty_chromium_content_browser_tracing_tracing__ui.cc) = f8bb72948c229440ad1e0a0401a1a5882193aa91
SHA1 (patch-src_3rdparty_chromium_content_browser_utility__process__host.cc) = de7e38d89f6e3d6f3b9aa0e9100340a1f3d55899
SHA1 (patch-src_3rdparty_chromium_content_browser_utility__process__host__receiver__bindings.cc) = 03bbefffcece41e1ac491ac474545462603610fa
SHA1 (patch-src_3rdparty_chromium_content_browser_v8__snapshot__files.cc) = 7c53ec8f2fe3249c8cdb8b3df2638fc3f6ab3824
@@ -298,7 +304,7 @@ SHA1 (patch-src_3rdparty_chromium_conten
SHA1 (patch-src_3rdparty_chromium_content_renderer_renderer__blink__platform__impl.cc) = 6339a0f231d739925440ecf53a22c432c22e5dc3
SHA1 (patch-src_3rdparty_chromium_content_renderer_renderer__blink__platform__impl.h) = 85b29b71d9811331bb9e4c43f0155d9b481d806c
SHA1 (patch-src_3rdparty_chromium_content_renderer_renderer__main__platform__delegate__linux.cc) = 5fb01c90a332de0e1bd7d9a6311ab3b03f0af7ed
-SHA1 (patch-src_3rdparty_chromium_content_shell_BUILD.gn) = e6c4fe9723edaf28473c82a3c6a1fc3db801db73
+SHA1 (patch-src_3rdparty_chromium_content_shell_BUILD.gn) = bf4fa0d4000d6965f21586570785fc5a00325410
SHA1 (patch-src_3rdparty_chromium_content_test_BUILD.gn) = d2df0069a14ec4ba776ef75bf90315b63ca3eccd
SHA1 (patch-src_3rdparty_chromium_content_utility_BUILD.gn) = 3f18b6ccc519a543a0b871d5ca98269bc993819d
SHA1 (patch-src_3rdparty_chromium_content_utility_utility__blink__platform__with__sandbox__support__impl.cc) = 870d5b4a9864787c9c79e7c8e61dc087da931e6d
@@ -326,6 +332,7 @@ SHA1 (patch-src_3rdparty_chromium_extens
SHA1 (patch-src_3rdparty_chromium_extensions_shell_browser_api_runtime_shell__runtime__api__delegate.cc) = 75c84806e6f57bb4ea503036aa9747b2310cdb12
SHA1 (patch-src_3rdparty_chromium_extensions_shell_browser_shell__extensions__api__client.cc) = a79f405b48a2717a19059eb9cce834da459d5e5e
SHA1 (patch-src_3rdparty_chromium_extensions_shell_browser_shell__extensions__api__client.h) = 00792f2da87f7dbc6f46a71318b4f70948d19039
+SHA1 (patch-src_3rdparty_chromium_fuchsia_engine_BUILD.gn) = c8583229891ae8b67f7e4cb11791e5c5523b32ac
SHA1 (patch-src_3rdparty_chromium_google__apis_gcm_engine_heartbeat__manager.cc) = d52335d232272b027d570a223c5dbfa588b4fc78
SHA1 (patch-src_3rdparty_chromium_gpu_BUILD.gn) = b4c61888a412c0e6306f4c272083ef4f351355bd
SHA1 (patch-src_3rdparty_chromium_gpu_command__buffer_common_gpu__memory__buffer__support.cc) = 3cb06cfa9d08b78c207a6aecf536d602efc548c8
@@ -351,7 +358,7 @@ SHA1 (patch-src_3rdparty_chromium_gpu_to
SHA1 (patch-src_3rdparty_chromium_gpu_vulkan_features.gni) = 44b6814b7654d7221ff55bf5c7342fe1d34d1d06
SHA1 (patch-src_3rdparty_chromium_gpu_vulkan_vulkan__function__pointers.cc) = f2f51a1c283cc0ae6d9b28c5300e0307deb56bbf
SHA1 (patch-src_3rdparty_chromium_gpu_vulkan_vulkan__function__pointers.h) = 44b3d41e58e270eb9ed71224dec51d3ffc3bc8ae
-SHA1 (patch-src_3rdparty_chromium_headless_BUILD.gn) = 51a19d5613f74fd946a1f1822f797290dda46542
+SHA1 (patch-src_3rdparty_chromium_headless_BUILD.gn) = 0037dcc858c886cb780c48a175f744c7f4b19316
SHA1 (patch-src_3rdparty_chromium_headless_lib_browser_headless__content__browser__client.cc) = 0197f1eb8e607522cea17a58501493250c21982c
SHA1 (patch-src_3rdparty_chromium_headless_lib_browser_headless__content__browser__client.h) = 4570cc30ad9081f11080ab1d8de4b7fd5516ab6a
SHA1 (patch-src_3rdparty_chromium_headless_lib_browser_headless__request__context__manager.cc) = da75359b5be6eaca7e97194815194e1419eca5e5
@@ -390,6 +397,13 @@ SHA1 (patch-src_3rdparty_chromium_media_
SHA1 (patch-src_3rdparty_chromium_media_capture_video_video__capture__device__client.cc) = b6aeb47b19207e1ed5acea98f48b542ebb9e8a90
SHA1 (patch-src_3rdparty_chromium_media_cast_BUILD.gn) = 7bc23c70873b33a0448d21e9d6cbdb1c10f50e3b
SHA1 (patch-src_3rdparty_chromium_media_cdm_library__cdm_cdm__paths.gni) = e31702cd5c0683995223ff31e160349653a18089
+SHA1 (patch-src_3rdparty_chromium_media_ffmpeg_ffmpeg__common.h) = 4b1c536d5dea0372495b5d489eee99e8d9a80997
+SHA1 (patch-src_3rdparty_chromium_media_filters_audio__file__reader.cc) = b82c03c7c47dec2635d504defe66dbaeb9fa73e8
+SHA1 (patch-src_3rdparty_chromium_media_filters_ffmpeg__audio__decoder.cc) = 0565703006b19a4cf18ac4ae90cbc9056fcab985
+SHA1 (patch-src_3rdparty_chromium_media_filters_ffmpeg__demuxer.cc) = 8e6d4d820422b9c7485aa78ca0b1b79dd17e8be5
+SHA1 (patch-src_3rdparty_chromium_media_filters_ffmpeg__glue.cc) = 54070c3ffdc17760771d2ed14634260316fb561f
+SHA1 (patch-src_3rdparty_chromium_media_filters_ffmpeg__video__decoder.cc) = 1dd6826b2688dabeefc2df1e3453c9d5dccfcdd8
+SHA1 (patch-src_3rdparty_chromium_media_filters_media__file__checker.cc) = d11695a3fc7ac17c6312f78217742aa897dfe95b
SHA1 (patch-src_3rdparty_chromium_media_filters_vp9__parser.h) = 2be757561e22dd701e6a54d39c0749f7208c1203
SHA1 (patch-src_3rdparty_chromium_media_gpu_buffer__validation.cc) = 722d0ef90c6373d78b42fa14077fb14118c96e4b
SHA1 (patch-src_3rdparty_chromium_media_gpu_chromeos_BUILD.gn) = 3b40bfa3396df0e89adb0c82d50a50657e265a16
@@ -406,7 +420,14 @@ SHA1 (patch-src_3rdparty_chromium_mojo_p
SHA1 (patch-src_3rdparty_chromium_mojo_public_cpp_platform_named__platform__channel__posix.cc) = 863e9a47cad98a17eed822c830cdde5bf5d5301b
SHA1 (patch-src_3rdparty_chromium_mojo_public_cpp_platform_socket__utils__posix.cc) = 6f53b9dd80ea4d906eaadcd674609fd29f60c4b5
SHA1 (patch-src_3rdparty_chromium_mojo_public_js_mojo__bindings__resources.grd) = b4f89fe9363ec995a42ee1d5f8ebb41466fef550
+SHA1 (patch-src_3rdparty_chromium_mojo_public_tools_BUILD.gn) = 53ceb7f6108dda2beb1e09c1b703de6e41dc36b2
+SHA1 (patch-src_3rdparty_chromium_mojo_public_tools_bindings_BUILD.gn) = eebbb6de70d5eacc8eae738826a241a526c6a5eb
+SHA1 (patch-src_3rdparty_chromium_mojo_public_tools_bindings_gen__data__files__list.py) = 0a54a69130e3b0ff0902757e0d65c446a749c4c2
+SHA1 (patch-src_3rdparty_chromium_mojo_public_tools_bindings_generators_mojom__java__generator.py) = e147a92ea023ff8755710779526ba18f3f0e865c
SHA1 (patch-src_3rdparty_chromium_mojo_public_tools_bindings_mojom.gni) = 96e9948b3ed1d4c340476c8741fc83f11ec0e653
+SHA1 (patch-src_3rdparty_chromium_mojo_public_tools_mojom_mojom_generate_generator.py) = 58d7444b20c48c58a76292fee059d35061b34961
+SHA1 (patch-src_3rdparty_chromium_mojo_public_tools_mojom_mojom_generate_module.py) = 8ca62e50c64cfb32dffe57881c9f94ceb96845e3
+SHA1 (patch-src_3rdparty_chromium_mojo_public_tools_mojom_mojom_generate_template__expander.py) = ec409aef6ca849669d04e03dc51cef8bbdfdb540
SHA1 (patch-src_3rdparty_chromium_net_BUILD.gn) = 4a036ade442149bf589c64d61f6a9bc5963b10a8
SHA1 (patch-src_3rdparty_chromium_net_base_address__tracker__linux.cc) = 72afa160768b5f79b8bf54d61e012cb39995568d
SHA1 (patch-src_3rdparty_chromium_net_base_address__tracker__linux.h) = 1dc258c16a668e770e833cb74ae30eeff33b6d58
@@ -505,6 +526,7 @@ SHA1 (patch-src_3rdparty_chromium_servic
SHA1 (patch-src_3rdparty_chromium_skia_BUILD.gn) = b3443b865dd022a6034dfd2114840f1536270204
SHA1 (patch-src_3rdparty_chromium_skia_ext_SkMemory__new__handler.cpp) = 770915506c7dcd7211dff0d2533e354666042c3b
SHA1 (patch-src_3rdparty_chromium_skia_ext_platform__canvas.h) = 7952e387593655d13b23aefafc9ce23235bc411c
+SHA1 (patch-src_3rdparty_chromium_testing_BUILD.gn) = a2eefa78e3d7d186291b70c5e3c2723ee370dff5
SHA1 (patch-src_3rdparty_chromium_third__party_abseil-cpp_absl_base_config.h) = 678dd33fe04ccf5850f4eee1f34432c61bc9dff8
SHA1 (patch-src_3rdparty_chromium_third__party_abseil-cpp_absl_time_internal_cctz_src_time__zone__format.cc) = d9a955ba3be6643b5301a6234f7b1de7c0db2c1b
SHA1 (patch-src_3rdparty_chromium_third__party_angle_BUILD.gn) = 76c669faabc074c3a34c77856c335ced42f3c899
@@ -525,7 +547,47 @@ SHA1 (patch-src_3rdparty_chromium_third_
SHA1 (patch-src_3rdparty_chromium_third__party_angle_util_BUILD.gn) = 1480cae8f2e8bf604934cb259c414baafa7bc91a
SHA1 (patch-src_3rdparty_chromium_third__party_blink_public_mojom_BUILD.gn) = 5d8488a4f5fbd8054ab730ac3cc8b6f977a95457
SHA1 (patch-src_3rdparty_chromium_third__party_blink_renderer_BUILD.gn) = 763ba5ae90be98348082563be082664bb4d91ff8
-SHA1 (patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_bind__gen_style__format.py) = 3ce2a8822dcabf831aacddfeff9bde3e91b610f5
+SHA1 (patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_bind__gen_blink__v8__bridge.py) = 5e77e41463101276d501089cbb3cb62161574a2c
+SHA1 (patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_bind__gen_callback__interface.py) = 7aa1028b9d3952a5b406b9df779f80f527ab0ff1
+SHA1 (patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_bind__gen_code__node.py) = 80fc3552a05e96760a71db0352403fd66cb8b399
+SHA1 (patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_bind__gen_codegen__expr.py) = 4c50194e1eb1feeb8bd7ec18a3270a43f2700503
+SHA1 (patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_bind__gen_codegen__format.py) = 6401f0fb7b53c638af7a67a9846fddb109fd1b61
+SHA1 (patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_bind__gen_codegen__utils.py) = acf84028b770e06a328e7a47c04a0f811654ef68
+SHA1 (patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_bind__gen_dictionary.py) = 9eabf59ca043ab0cb72a0008415731a44561cce0
+SHA1 (patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_bind__gen_interface.py) = a5e87dd555bb31842b61b4979a675b8572cee202
+SHA1 (patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_bind__gen_mako__renderer.py) = addea7ce90a206823972b89027ef2341cc6a3216
+SHA1 (patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_bind__gen_style__format.py) = 70c7cd87f1604dd890a0d321c9a2d0114b99198f
+SHA1 (patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_bind__gen_task__queue.py) = 6d6fee777aac24f70acaa88c162d8036ee7edfd4
+SHA1 (patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_code__generator.py) = 9c4d6d02fd1f3f5d15c5ce99e077404dde25fe5a
+SHA1 (patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_generate__origin__trial__features.py) = 36d07145a2d8ba19f5ebff012f591a688c19835c
+SHA1 (patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_idl__definitions.py) = 3bf0a15c1ff8b03b49f3d1be2b607ecc0d3620f3
+SHA1 (patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_idl__reader.py) = 75f4ef2a5f2c2b1770a66c1cc08d34fded6b8489
+SHA1 (patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_idl__types.py) = 5dab791408a2a28665d8ae8d5b69c52cae2e1800
+SHA1 (patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_utilities.py) = 6213ad555d229d767f6e06b4ef6bdd685d34b632
+SHA1 (patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_v8__interface.py) = 33c3f80eafad3c10e3d02c202ed586a777b2c97f
+SHA1 (patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_v8__methods.py) = f4093dd207d6e4c0f2312dad2e3fa0d5c5b7eb88
+SHA1 (patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_v8__utilities.py) = 14acc593647dceda656113de55f5a09d7a54e860
+SHA1 (patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_web__idl_callback__interface.py) = a817765eed8f851ad7fb0c510ae1b0008a88ffbe
+SHA1 (patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_web__idl_database.py) = 3874c590295baa8ae657e5f1e3110ec7149144cb
+SHA1 (patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_web__idl_exposure.py) = 921e9071dde385c1d3e740292df44f6ac49e05f8
+SHA1 (patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_web__idl_function__like.py) = 1ff0d9ac3fb0eb977a633604d450dc7db0ebc88e
+SHA1 (patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_web__idl_idl__compiler.py) = 6469cce90d65f4c7015fc8b7dc812175df8b77f7
+SHA1 (patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_web__idl_interface.py) = 27aad1db8654daf218675c76c1ad6f19f5d2a6e0
+SHA1 (patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_web__idl_ir__builder.py) = 59fb01d0bfbff36e2bfb19cbbdbe3b4030d68ab0
+SHA1 (patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_web__idl_make__copy.py) = 990877ec58d811ddf5a4b6aef2b1cee9736a999f
+SHA1 (patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_web__idl_namespace.py) = 10385260194022e606034ffe754a49f1305462d4
+SHA1 (patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_templates_dictionary__v8.cc.tmpl) = 213fb79bbb7d0a4c66cad65e0dead0a376ad1ec3
+SHA1 (patch-src_3rdparty_chromium_third__party_blink_renderer_build_scripts_core_css_make__style__shorthands.py) = 1e814f44052f731852ef8fa7ba54ac802e3c5698
+SHA1 (patch-src_3rdparty_chromium_third__party_blink_renderer_build_scripts_core_css_properties_make__css__property__instances.py) = 4761e8f5941a7d31a42fd89ca54f483eb8ebdd5e
+SHA1 (patch-src_3rdparty_chromium_third__party_blink_renderer_build_scripts_gperf.py) = 0b9f86a945a2c221af063a3d253deb1b4bc5bffc
+SHA1 (patch-src_3rdparty_chromium_third__party_blink_renderer_build_scripts_in__file.py) = 3c3468e827928479d8e23d026bfae68c3b44e559
+SHA1 (patch-src_3rdparty_chromium_third__party_blink_renderer_build_scripts_in__generator.py) = 103a8fdabca3af01ee6574b05c1616aa3c5161d1
+SHA1 (patch-src_3rdparty_chromium_third__party_blink_renderer_build_scripts_make__runtime__features.py) = cb321d69e197e22a5482bd6cc3885fb15d4d1190
+SHA1 (patch-src_3rdparty_chromium_third__party_blink_renderer_build_scripts_templates_element__factory.cc.tmpl) = 85fc2e1fbc78f56bb82ce285dc6ba047edbabf5e
+SHA1 (patch-src_3rdparty_chromium_third__party_blink_renderer_build_scripts_templates_element__type__helpers.cc.tmpl) = 0cf12e5fe1407670160a7112bf0f821eb6c58103
+SHA1 (patch-src_3rdparty_chromium_third__party_blink_renderer_build_scripts_templates_element__type__helpers.h.tmpl) = 34f8bddfa59d27dfaa2cdb60fe0cce5b5cc29e04
+SHA1 (patch-src_3rdparty_chromium_third__party_blink_renderer_build_scripts_templates_macros.tmpl) = 301bee8d3421935a130e93fb23c6ed976ef0fb52
+SHA1 (patch-src_3rdparty_chromium_third__party_blink_renderer_build_scripts_templates_make__qualified__names.h.tmpl) = 7e24356a928441fda6a3c2cf91fd589d045c7a8b
SHA1 (patch-src_3rdparty_chromium_third__party_blink_renderer_controller_BUILD.gn) = 1fc0d131ab66ac7726cd6a1ccd2b251fcb502159
SHA1 (patch-src_3rdparty_chromium_third__party_blink_renderer_controller_blink__initializer.cc) = 653baf2fa90fd0a8cb3e2475039ab1f744c262c8
SHA1 (patch-src_3rdparty_chromium_third__party_blink_renderer_controller_memory__usage__monitor__posix.cc) = 3b50557e62c208eb7086f1f3d43338468cb84270
@@ -574,9 +636,15 @@ SHA1 (patch-src_3rdparty_chromium_third_
SHA1 (patch-src_3rdparty_chromium_third__party_crashpad_crashpad_util_posix_symbolic__constants__posix.cc) = 1bb6d34f2c5b4a0c0e3e30c0ee2c464e6fa3fbf1
SHA1 (patch-src_3rdparty_chromium_third__party_crc32c_BUILD.gn) = 80e5c5054294e73624d6b884f3cae04f3735fdaf
SHA1 (patch-src_3rdparty_chromium_third__party_dav1d_BUILD.gn) = f65f1a7ab8ad5b4ad2ff3ef92618b7d8aa390aad
+SHA1 (patch-src_3rdparty_chromium_third__party_dawn_generator_generator__lib.py) = 0505d63a7c70961e2d15820d5d378880abb664b0
SHA1 (patch-src_3rdparty_chromium_third__party_dawn_scripts_dawn__component.gni) = ee356269df97eb28b1f87ce2dab507000ec5249c
SHA1 (patch-src_3rdparty_chromium_third__party_dawn_scripts_dawn__features.gni) = 52ef88d16caf2cfe4e1d61a9d0c93d5fed4f0607
SHA1 (patch-src_3rdparty_chromium_third__party_dawn_src_common_BUILD.gn) = 784a15e6abbc555d117abdcff4d58c1fc55a15e9
+SHA1 (patch-src_3rdparty_chromium_third__party_devtools-frontend_src_BUILD.gn) = 46d9e446dc74d534472f8fe83460e9a66bef1d38
+SHA1 (patch-src_3rdparty_chromium_third__party_devtools-frontend_src_scripts_build_build__inspector__overlay.py) = 8da6b156298900bbbd765e0fd260037b7c7eb8cf
+SHA1 (patch-src_3rdparty_chromium_third__party_devtools-frontend_src_scripts_build_build__release__applications.py) = a938b3b0da847424ce9a77755dbf198ac2e76e70
+SHA1 (patch-src_3rdparty_chromium_third__party_devtools-frontend_src_scripts_build_generate__devtools__grd.py) = 055161ba508c034541e6293b578ba1688d6ab47c
+SHA1 (patch-src_3rdparty_chromium_third__party_devtools-frontend_src_scripts_build_modular__build.py) = 89d7f6002ffc0fb7e929e9116a08fb8082aa7838
SHA1 (patch-src_3rdparty_chromium_third__party_expat_BUILD.gn) = e45e78921ec4cea97b317e9ef59875015241b560
SHA1 (patch-src_3rdparty_chromium_third__party_ffmpeg_ffmpeg__generated.gni) = 8b0b82576846c69fe79a61dd1314a4d1554679a6
SHA1 (patch-src_3rdparty_chromium_third__party_ffmpeg_ffmpeg__options.gni) = 5f261d80ce71126e74e4f3e965fe1de648b69264
@@ -590,6 +658,7 @@ SHA1 (patch-src_3rdparty_chromium_third_
SHA1 (patch-src_3rdparty_chromium_third__party_icu_source_common_putil.cpp) = b35edb5d0d256bee92d08dbcdf47c19c2ab7bf70
SHA1 (patch-src_3rdparty_chromium_third__party_icu_source_common_umapfile.cpp) = 868021cc67d4d1efb53732cfcdb96fff3da32591
SHA1 (patch-src_3rdparty_chromium_third__party_ijar_BUILD.gn) = 0434860f3330d9f505b4101c20417ca706872f9b
+SHA1 (patch-src_3rdparty_chromium_third__party_jinja2_tests.py) = b7269ac5030b7ce2184acefac16a68898fbccdbe
SHA1 (patch-src_3rdparty_chromium_third__party_leveldatabase_env__chromium.cc) = d21a371057163c02a9e7fce9521f76c9dd06e1fd
SHA1 (patch-src_3rdparty_chromium_third__party_libXNVCtrl_NVCtrl.c) = 879c0c17628f7667be39139d918d44aa7e02bbf5
SHA1 (patch-src_3rdparty_chromium_third__party_libdrm_BUILD.gn) = fcd6dcd1392304b81c94f82af4ad098c024c5afd
@@ -704,6 +773,7 @@ SHA1 (patch-src_3rdparty_chromium_third_
SHA1 (patch-src_3rdparty_chromium_third__party_webrtc_modules_desktop__capture_BUILD.gn) = 1c7b9ed8743ac5ceb5da9624d449a138ca794390
SHA1 (patch-src_3rdparty_chromium_third__party_webrtc_modules_rtp__rtcp_source_forward__error__correction.cc) = a3adc166fbb005dd9030be0458c514bcd49c725e
SHA1 (patch-src_3rdparty_chromium_third__party_webrtc_modules_video__capture_BUILD.gn) = ae808be5a1aff1c990ab2c5de876e5b422193dd5
+SHA1 (patch-src_3rdparty_chromium_third__party_webrtc_modules_video__coding_codecs_h264_h264__decoder__impl.cc) = 6249c1c0162a23bc7a24f2be5154c7ca5bbd780f
SHA1 (patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_BUILD.gn) = 81639ce5decddaf57e07a000c6d71d3b40ac494c
SHA1 (patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_ifaddrs__converter.h) = 8d58afd2f8f932b302950cc5e36336afc34f076a
SHA1 (patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_ip__address.cc) = 9f0559d1f02a2c59b2e3ff5f9e9722d401770a35
@@ -715,16 +785,24 @@ SHA1 (patch-src_3rdparty_chromium_third_
SHA1 (patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_platform__thread__types.cc) = c186dbcaa5343dcec24cfb913e042935b68d7111
SHA1 (patch-src_3rdparty_chromium_third__party_webrtc_system__wrappers_BUILD.gn) = 973adbff318e287df5a1f3e0e2e68fa1b02a9a2e
SHA1 (patch-src_3rdparty_chromium_third__party_webrtc_system__wrappers_source_cpu__info.cc) = 34c8f11a2211fc64fae3bec08bf9bebcb25e960b
-SHA1 (patch-src_3rdparty_chromium_third__party_webrtc_test_BUILD.gn) = 2df93c3a99f46a7bdabe74be43e2be6c426de0a6
+SHA1 (patch-src_3rdparty_chromium_third__party_webrtc_test_BUILD.gn) = cf10aa3e5135639a9cbb09c8a74ef409519528ee
SHA1 (patch-src_3rdparty_chromium_third__party_webrtc_webrtc.gni) = 501ac49f4dd406057089ac65196a7c0eff2560c4
SHA1 (patch-src_3rdparty_chromium_third__party_zlib_BUILD.gn) = e841d76dc7417676844f5f089893275c906acbbf
SHA1 (patch-src_3rdparty_chromium_third__party_zlib_cpu__features.c) = 2ae5c09b935a94fc50c052f199a945875d3d9127
-SHA1 (patch-src_3rdparty_chromium_tools_binary__size_BUILD.gn) = bae129d1c4771a4349ffdc6cab36e2b250fc2bc7
+SHA1 (patch-src_3rdparty_chromium_tools_binary__size_BUILD.gn) = 1952774426515651e3f2797a296be102e9ef55b2
SHA1 (patch-src_3rdparty_chromium_tools_binary__size_libsupersize_caspian_BUILD.gn) = d5db9eae64c975ce7770b9e1f2b5578c7c4883b6
+SHA1 (patch-src_3rdparty_chromium_tools_grit_BUILD.gn) = 85172e974e874b8e2ab9f47619faa2578f84bdc4
+SHA1 (patch-src_3rdparty_chromium_tools_grit_grit_util.py) = 27d8f1a9bf5238d975137ffac7f35accc4dda158
+SHA1 (patch-src_3rdparty_chromium_tools_gritsettings_resource__ids.spec) = 878fcc66dbd39094612d4b26b035796c5417cb12
SHA1 (patch-src_3rdparty_chromium_tools_ipc__fuzzer_ipc__fuzzer.gni) = 1e103e5f176fdd02b4aff0ea3843db01bed0a567
SHA1 (patch-src_3rdparty_chromium_tools_json__schema__compiler_feature__compiler.py) = 97d90a919be042ab5948d4c17e04d40bcaf7aa67
SHA1 (patch-src_3rdparty_chromium_tools_json__schema__compiler_model.py) = acd1b4e250ff93bdcb3a106b27bc3de87274162a
-SHA1 (patch-src_3rdparty_chromium_tools_perf_chrome__telemetry__build_BUILD.gn) = 903d5a70acadfabb0515f1dbcc146f6c2a08d2f8
+SHA1 (patch-src_3rdparty_chromium_tools_metrics_BUILD.gn) = ad45a361df3fbc30d0c999290ef6e5f5f8560e3d
+SHA1 (patch-src_3rdparty_chromium_tools_metrics_ukm_gen__builders.py) = 40a8ca61ec8a7df3f82ed53cbd515f7989c0e18f
+SHA1 (patch-src_3rdparty_chromium_tools_metrics_ukm_ukm__model.py) = 7ba165a2774e000dd1b4a10d4c2eec990efc876e
+SHA1 (patch-src_3rdparty_chromium_tools_perf_chrome__telemetry__build_BUILD.gn) = 0814abee4aeecc574b6908bfccb70fcda19c658e
+SHA1 (patch-src_3rdparty_chromium_tools_perf_core_perfetto__binary__roller_BUILD.gn) = eb6a5c12b6ef6852121e7e2cdb50d84ea5170bba
+SHA1 (patch-src_3rdparty_chromium_tools_polymer_BUILD.gn) = 6ef99fcd6d57f020f8de3f73c8c1ec9aba611d98
SHA1 (patch-src_3rdparty_chromium_tools_variations_fieldtrial__to__struct.py) = 46eb596b71646a2390bc79f412d2ef54fec25542
SHA1 (patch-src_3rdparty_chromium_ui_aura_BUILD.gn) = 80b6b59ed6bc372d272c4608f0d828440798c136
SHA1 (patch-src_3rdparty_chromium_ui_base_BUILD.gn) = 7b78e9f5599cbda0365973b1cae0589693762b5c
@@ -783,6 +861,8 @@ SHA1 (patch-src_3rdparty_chromium_ui_gtk
SHA1 (patch-src_3rdparty_chromium_ui_message__center_views_message__popup__view.cc) = 03d3b2c4da0cd0904d58fa8397a5d06d62e5b7ca
SHA1 (patch-src_3rdparty_chromium_ui_native__theme_native__theme.h) = 3a3ab167ece4c6591453c4e2aec3a45e71c4cae4
SHA1 (patch-src_3rdparty_chromium_ui_native__theme_native__theme__base.cc) = 7ebfc36cbf686c88d2f9821f1bfe12b4fec114b1
+SHA1 (patch-src_3rdparty_chromium_ui_ozone_generate__constructor__list.py) = e6a2e3996f522598e8d38ff24427ede85fb2a214
+SHA1 (patch-src_3rdparty_chromium_ui_ozone_generate__ozone__platform__list.py) = 863e0f0cf68c5bdba94292a6d3cc678264e9ed99
SHA1 (patch-src_3rdparty_chromium_ui_ozone_platform_wayland_BUILD.gn) = b857d36e1afadcfa392c0d00d958997f1593b9fe
SHA1 (patch-src_3rdparty_chromium_ui_platform__window_BUILD.gn) = 1bc7b37f27dbfe5c972b712dbdaece78247dcf2e
SHA1 (patch-src_3rdparty_chromium_ui_platform__window_common_BUILD.gn) = dbb4c3445c03193e26daa5a6f28806bff27c554f
@@ -814,6 +894,7 @@ SHA1 (patch-src_3rdparty_chromium_v8_src
SHA1 (patch-src_3rdparty_chromium_v8_src_trap-handler_handler-inside-posix.cc) = 568877d1ebcaaee5782527f232a6fcc7f096066a
SHA1 (patch-src_3rdparty_chromium_v8_src_trap-handler_handler-inside-posix.h) = a64ca7574cca4cb804e0ca24dd3454507d3d556d
SHA1 (patch-src_3rdparty_chromium_v8_src_trap-handler_trap-handler.h) = d0b72fff980d5072d2221dd31b2e95526cd33875
+SHA1 (patch-src_3rdparty_chromium_v8_tools_BUILD.gn) = a87faf61f2641f981c1cdda1c1b0a95777df49df
SHA1 (patch-src_3rdparty_chromium_v8_tools_run-paxctl.py) = af4832a81cfeef6e4259bc72d21774ebe7ac3fed
SHA1 (patch-src_3rdparty_chromium_weblayer_BUILD.gn) = b8828005a2c87570516a3d3fbb937e6bc0144f42
SHA1 (patch-src_3rdparty_chromium_weblayer_app_content__main__delegate__impl.cc) = 6f35d398f818db24602bffc408f82658670f2e1d
@@ -822,7 +903,7 @@ SHA1 (patch-src_3rdparty_chromium_weblay
SHA1 (patch-src_3rdparty_chromium_weblayer_browser_content__browser__client__impl.h) = bb6d141e078279286fc15dc26180a1ad8a1f46a8
SHA1 (patch-src_3rdparty_chromium_weblayer_browser_system__network__context__manager.cc) = 11fbfc516c12fef8c9810094425441b12b5c3bde
SHA1 (patch-src_3rdparty_chromium_weblayer_common_weblayer__paths.cc) = 5b33ffc520bf69b903eb9d27eebcfb3563267db9
-SHA1 (patch-src_3rdparty_chromium_weblayer_shell_BUILD.gn) = d260dcaab218c1598ec56b92bfe82bf5adc519fc
+SHA1 (patch-src_3rdparty_chromium_weblayer_shell_BUILD.gn) = e93ffd1453bcb3676702198364df912203e36040
SHA1 (patch-src_3rdparty_gn_base_files_file_posix.cc) = 7de8add7601e15848a54eb3a3402f729204a3178
SHA1 (patch-src_3rdparty_gn_base_files_file_util.h) = 026b98ef395a08cffb554defabb834cb902d73db
SHA1 (patch-src_3rdparty_gn_base_files_file_util_posix.cc) = 49ffb3f29ad78bbe255badd08d45368ab9e0ddf1
@@ -836,8 +917,9 @@ SHA1 (patch-src_3rdparty_gn_tools_gn_qma
SHA1 (patch-src_3rdparty_gn_tools_gn_tool.h) = 9bf6c5101981dde11e89d5efb29add5092c47654
SHA1 (patch-src_buildtools_buildtools.pro) = 95d6195a43e14eb246d97787ffb39c45d16729f5
SHA1 (patch-src_buildtools_config_linking.pri) = c8b58ecc15e0ee3115745eb5abbbe187c832026a
-SHA1 (patch-src_buildtools_config_support.pri) = 9d8c631194fb506ea1b7b3d20c50f58626484445
-SHA1 (patch-src_buildtools_configure.json) = 0cbc619ce87aa66cf298857def0d12a71ff0c534
+SHA1 (patch-src_buildtools_config_support.pri) = c40b66756fe4bdf9436949c071e2f1eae843370f
+SHA1 (patch-src_buildtools_configure.json) = 0f3176896e6feaca721ae595e06780099e1a9290
SHA1 (patch-src_core_api_core_api.pro) = 06f074a11fc20b956c91d34dd5ce4a05599ee706
SHA1 (patch-src_core_config_linux.pri) = 482b06c2f8234a12c2d32946cb5596e344258cba
+SHA1 (patch-src_core_qtwebengine__resources.gni) = c62a7a414ff95046260a8bd5bd31072cb773d9f1
SHA1 (patch-src_tools_qwebengine_convert_dict_qwebengine_convert_dict.pro) = c6eab1be8c2687c1555fb09235fadea5b097e822
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-configure.pri
diff -u pkgsrc/x11/qt5-qtwebengine/patches/patch-configure.pri:1.1 pkgsrc/x11/qt5-qtwebengine/patches/patch-configure.pri:1.2
--- pkgsrc/x11/qt5-qtwebengine/patches/patch-configure.pri:1.1 Wed Apr 12 19:24:06 2023
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-configure.pri Thu Jun 8 20:38:05 2023
@@ -1,10 +1,61 @@
-$NetBSD: patch-configure.pri,v 1.1 2023/04/12 19:24:06 adam Exp $
+$NetBSD: patch-configure.pri,v 1.2 2023/06/08 20:38:05 markd Exp $
Always build on Darwin.
+Build with python 3
---- configure.pri.orig 2023-04-11 08:13:33.000000000 +0000
+--- configure.pri.orig 2022-03-30 09:48:18.000000000 +0000
+++ configure.pri
-@@ -446,24 +446,6 @@ defineTest(qtwebengine_isWindowsPlatform
+@@ -7,20 +7,7 @@ QTWEBENGINE_SOURCE_TREE = $$PWD
+ equals(QMAKE_HOST.os, Windows): EXE_SUFFIX = .exe
+
+ defineTest(isPythonVersionSupported) {
+- python = $$system_quote($$system_path($$1))
+- python_version = $$system('$$python -c "import sys; print(sys.version_info[0:3])"')
+- python_version ~= s/[()]//g
+- python_version = $$split(python_version, ',')
+- python_major_version = $$first(python_version)
+- greaterThan(python_major_version, 2) {
+- qtLog("Python version 3 is not supported by Chromium.")
+- return(false)
+- }
+- python_minor_version = $$member(python_version, 1)
+- python_patch_version = $$member(python_version, 2)
+- greaterThan(python_major_version, 1): greaterThan(python_minor_version, 6): greaterThan(python_patch_version, 4): return(true)
+- qtLog("Unsupported python version: $${python_major_version}.$${python_minor_version}.$${python_patch_version}.")
+- return(false)
++ return(true)
+ }
+
+ defineTest(qtConfTest_detectJumboBuild) {
+@@ -52,10 +39,10 @@ defineTest(qtConfReport_jumboBuild) {
+ qtConfReportPadded($${1}, $$mergeLimit)
+ }
+
+-defineTest(qtConfTest_detectPython2) {
+- python = $$qtConfFindInPath("python2$$EXE_SUFFIX")
++defineTest(qtConfTest_detectPython) {
++ python = $$qtConfFindInPath("python$$EXE_SUFFIX")
+ isEmpty(python) {
+- qtLog("'python2$$EXE_SUFFIX' not found in PATH. Checking for 'python$$EXE_SUFFIX'.")
++ qtLog("'python$$EXE_SUFFIX' not found in PATH. Checking for 'python$$EXE_SUFFIX'.")
+ python = $$qtConfFindInPath("python$$EXE_SUFFIX")
+ }
+ isEmpty(python) {
+@@ -63,11 +50,11 @@ defineTest(qtConfTest_detectPython2) {
+ return(false)
+ }
+ !isPythonVersionSupported($$python) {
+- qtLog("A suitable Python 2 executable could not be located.")
++ qtLog("A suitable Python executable could not be located.")
+ return(false)
+ }
+
+- # Make tests.python2.location available in configure.json.
++ # Make tests.python.location available in configure.json.
+ $${1}.location = $$clean_path($$python)
+ export($${1}.location)
+ $${1}.cache += location
+@@ -446,24 +433,6 @@ defineTest(qtwebengine_isWindowsPlatform
}
defineTest(qtwebengine_isMacOsPlatformSupported) {
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-mkspecs_features_functions.prf
diff -u pkgsrc/x11/qt5-qtwebengine/patches/patch-mkspecs_features_functions.prf:1.1 pkgsrc/x11/qt5-qtwebengine/patches/patch-mkspecs_features_functions.prf:1.2
--- pkgsrc/x11/qt5-qtwebengine/patches/patch-mkspecs_features_functions.prf:1.1 Tue Aug 3 21:04:34 2021
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-mkspecs_features_functions.prf Thu Jun 8 20:38:05 2023
@@ -1,9 +1,25 @@
-$NetBSD: patch-mkspecs_features_functions.prf,v 1.1 2021/08/03 21:04:34 markd Exp $
+$NetBSD: patch-mkspecs_features_functions.prf,v 1.2 2023/06/08 20:38:05 markd Exp $
teach about openbsd and netbsd
+build with python3
---- mkspecs/features/functions.prf.orig 2020-11-07 01:22:36.000000000 +0000
+--- mkspecs/features/functions.prf.orig 2022-03-30 09:48:18.000000000 +0000
+++ mkspecs/features/functions.prf
+@@ -39,11 +39,11 @@ defineReplace(which) {
+
+ # Returns the unquoted path to the python executable.
+ defineReplace(pythonPath) {
+- isEmpty(QMAKE_PYTHON2) {
++ isEmpty(QMAKE_PYTHON) {
+ # Fallback for building QtWebEngine with Qt < 5.8
+- QMAKE_PYTHON2 = python
++ QMAKE_PYTHON = python
+ }
+- return($$QMAKE_PYTHON2)
++ return($$QMAKE_PYTHON)
+ }
+
+ # Returns the python executable for use with shell / make targets.
@@ -84,6 +84,14 @@ defineReplace(gnWebEngineArgs) {
include($$QTWEBENGINE_ROOT/src/buildtools/config/windows.pri)
include($$QTWEBENGINE_ROOT/src/core/config/windows.pri)
@@ -28,7 +44,7 @@ teach about openbsd and netbsd
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)
-@@ -113,6 +123,8 @@ defineReplace(gnOS) {
+@@ -114,6 +124,8 @@ defineReplace(gnOS) {
macos: return(mac)
win32: return(win)
linux: return(linux)
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_headless_BUILD.gn
diff -u pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_headless_BUILD.gn:1.1 pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_headless_BUILD.gn:1.2
--- pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_headless_BUILD.gn:1.1 Tue Aug 3 21:04:35 2021
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_headless_BUILD.gn Thu Jun 8 20:38:06 2023
@@ -1,8 +1,27 @@
-$NetBSD: patch-src_3rdparty_chromium_headless_BUILD.gn,v 1.1 2021/08/03 21:04:35 markd Exp $
+$NetBSD: patch-src_3rdparty_chromium_headless_BUILD.gn,v 1.2 2023/06/08 20:38:06 markd Exp $
---- src/3rdparty/chromium/headless/BUILD.gn.orig 2020-06-25 09:32:39.000000000 +0000
+support bsd
+build with python3 (remove catapult)
+
+--- src/3rdparty/chromium/headless/BUILD.gn.orig 2020-06-25 09:32:39.000000000 +0000
+++ src/3rdparty/chromium/headless/BUILD.gn
-@@ -264,7 +264,7 @@ source_set("headless_shared_sources") {
+@@ -37,7 +37,6 @@ repack("pak") {
+ "$root_gen_dir/components/components_resources.pak",
+ "$root_gen_dir/components/strings/components_strings_en-US.pak",
+ "$root_gen_dir/content/app/resources/content_resources_100_percent.pak",
+- "$root_gen_dir/content/browser/tracing/tracing_resources.pak",
+ "$root_gen_dir/content/content_resources.pak",
+ "$root_gen_dir/content/dev_ui_content_resources.pak",
+ "$root_gen_dir/headless/headless_lib_resources.pak",
+@@ -65,7 +64,6 @@ repack("pak") {
+ "//content:content_resources",
+ "//content:dev_ui_content_resources",
+ "//content/app/resources",
+- "//content/browser/tracing:resources",
+ "//mojo/public/js:resources",
+ "//net:net_resources",
+ "//third_party/blink/public:resources",
+@@ -275,7 +273,7 @@ source_set("headless_shared_sources") {
sources += generated_devtools_api
sources += get_target_outputs(":protocol_sources")
@@ -11,7 +30,7 @@ $NetBSD: patch-src_3rdparty_chromium_hea
sources += [
"lib/headless_crash_reporter_client.cc",
"lib/headless_crash_reporter_client.h",
-@@ -284,7 +284,7 @@ source_set("headless_shared_sources") {
+@@ -295,7 +293,7 @@ source_set("headless_shared_sources") {
"//url",
]
@@ -20,7 +39,7 @@ $NetBSD: patch-src_3rdparty_chromium_hea
deps += [ "//components/crash/content/browser" ]
}
if (is_component_build && is_win) {
-@@ -437,7 +437,7 @@ component("headless_non_renderer") {
+@@ -448,7 +446,7 @@ component("headless_non_renderer") {
"//v8",
]
@@ -29,7 +48,7 @@ $NetBSD: patch-src_3rdparty_chromium_hea
deps += [ "//components/crash/content/browser" ]
}
if (is_win) {
-@@ -717,7 +717,7 @@ static_library("headless_shell_lib") {
+@@ -732,7 +730,7 @@ static_library("headless_shell_lib") {
public_deps += [ ":headless_non_renderer" ]
}
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_bind__gen_style__format.py
diff -u pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_bind__gen_style__format.py:1.1
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_bind__gen_style__format.py:1.2
--- pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_bind__gen_style__format.py:1.1 Tue Aug 3 21:04:35 2021
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_bind__gen_style__format.py Thu Jun 8 20:38:06 2023
@@ -1,6 +1,9 @@
-$NetBSD: patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_bind__gen_style__format.py,v 1.1 2021/08/03 21:04:35 markd Exp $
+$NetBSD: patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_bind__gen_style__format.py,v 1.2 2023/06/08 20:38:06 markd Exp $
---- src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/style_format.py.orig 2020-07-15 18:56:02.000000000 +0000
+support freebsd openbsd netbsd
+build with python3
+
+--- src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/style_format.py.orig 2022-03-30 09:48:18.000000000 +0000
+++ src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/style_format.py
@@ -29,6 +29,15 @@ def init(root_src_dir):
elif sys.platform.startswith(("cygwin", "win")):
@@ -26,3 +29,19 @@ $NetBSD: patch-src_3rdparty_chromium_thi
# //buildtools/<platform>/gn
_gn_command_path = os.path.join(buildtools_platform_dir,
+@@ -70,8 +80,13 @@ def gn_format(contents, filename=None):
+
+
+ def _invoke_format_command(command_line, filename, contents):
+- proc = subprocess.Popen(
+- command_line, stdin=subprocess.PIPE, stdout=subprocess.PIPE)
++ kwargs = {}
++ if sys.version_info.major != 2:
++ kwargs['encoding'] = 'utf-8'
++ proc = subprocess.Popen(command_line,
++ stdin=subprocess.PIPE,
++ stdout=subprocess.PIPE,
++ **kwargs)
+ stdout_output, stderr_output = proc.communicate(input=contents)
+ exit_code = proc.wait()
+
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_BUILD.gn
diff -u pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_BUILD.gn:1.2 pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_BUILD.gn:1.3
--- pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_BUILD.gn:1.2 Mon Apr 18 11:18:18 2022
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_BUILD.gn Thu Jun 8 20:38:05 2023
@@ -1,6 +1,9 @@
-$NetBSD: patch-src_3rdparty_chromium_BUILD.gn,v 1.2 2022/04/18 11:18:18 adam Exp $
+$NetBSD: patch-src_3rdparty_chromium_BUILD.gn,v 1.3 2023/06/08 20:38:05 markd Exp $
---- src/3rdparty/chromium/BUILD.gn.orig 2021-02-19 16:41:59.000000000 +0000
+support bsd
+build with python3 (remove catapult)
+
+--- src/3rdparty/chromium/BUILD.gn.orig 2022-03-30 09:48:18.000000000 +0000
+++ src/3rdparty/chromium/BUILD.gn
@@ -206,7 +206,7 @@ group("gn_all") {
]
@@ -11,7 +14,23 @@ $NetBSD: patch-src_3rdparty_chromium_BUI
deps += [
"//weblayer/shell:weblayer_shell",
"//weblayer/test:weblayer_browsertests",
-@@ -409,12 +409,12 @@ group("gn_all") {
+@@ -239,7 +239,6 @@ group("gn_all") {
+ "//media/capture:capture_unittests",
+ "//media/cast:cast_unittests",
+ "//third_party/angle/src/tests:angle_white_box_tests",
+- "//third_party/catapult/telemetry:bitmaptools($host_toolchain)",
+ ]
+ } else if (is_ios && !use_qt) {
+ deps += [
+@@ -354,7 +353,6 @@ group("gn_all") {
+ "//net/android:net_junit_tests",
+ "//services:services_junit_tests",
+ "//testing/android/junit:junit_unit_tests",
+- "//third_party/catapult/devil",
+ "//third_party/smhasher:murmurhash3",
+ "//tools/android:android_tools",
+ "//tools/android:memconsumer",
+@@ -409,12 +407,12 @@ group("gn_all") {
# seems currently broken for this platform at the moment, and the
# corresponding code build and works on Linux unmodified.
# See instructions in the corresponding BUILD.gn.
@@ -26,7 +45,7 @@ $NetBSD: patch-src_3rdparty_chromium_BUI
# This is only used by ChromeOS, but we want maximal fuzzer coverage, so
# run it under linux too.
deps += [
-@@ -469,6 +469,15 @@ group("gn_all") {
+@@ -469,6 +467,15 @@ group("gn_all") {
"//testing:empty_main",
]
@@ -42,7 +61,7 @@ $NetBSD: patch-src_3rdparty_chromium_BUI
if (use_dbus) {
deps += [
"//dbus:dbus_test_server",
-@@ -482,7 +491,7 @@ group("gn_all") {
+@@ -482,7 +489,7 @@ group("gn_all") {
}
}
@@ -51,7 +70,7 @@ $NetBSD: patch-src_3rdparty_chromium_BUI
deps += [
"//base:base_i18n_perftests",
"//google_apis:google_apis_unittests",
-@@ -515,7 +524,7 @@ group("gn_all") {
+@@ -515,7 +522,7 @@ group("gn_all") {
"//ui/compositor:compositor_unittests",
]
@@ -60,7 +79,7 @@ $NetBSD: patch-src_3rdparty_chromium_BUI
deps += [
"//chrome/test:load_library_perf_tests",
"//chrome/test:sync_performance_tests",
-@@ -552,6 +561,27 @@ group("gn_all") {
+@@ -552,6 +559,27 @@ group("gn_all") {
}
}
@@ -88,7 +107,7 @@ $NetBSD: patch-src_3rdparty_chromium_BUI
if (is_android) {
deps += [ "//chrome/test/chromedriver:chromedriver($host_toolchain)" ]
}
-@@ -566,7 +596,7 @@ group("gn_all") {
+@@ -566,7 +594,7 @@ group("gn_all") {
if (enable_nacl) {
deps += [ "//components/nacl/loader:nacl_loader_unittests" ]
@@ -97,7 +116,7 @@ $NetBSD: patch-src_3rdparty_chromium_BUI
# TODO(dpranke): Figure out what platforms should actually have this.
deps += [ "//components/nacl/loader:nacl_helper" ]
-@@ -600,6 +630,17 @@ group("gn_all") {
+@@ -600,6 +628,17 @@ group("gn_all") {
"//third_party/breakpad:minidump_dump($host_toolchain)",
"//third_party/breakpad:minidump_stackwalk($host_toolchain)",
]
@@ -115,7 +134,7 @@ $NetBSD: patch-src_3rdparty_chromium_BUI
if (!is_android) {
deps += [
-@@ -676,7 +717,7 @@ group("gn_all") {
+@@ -676,7 +715,7 @@ group("gn_all") {
host_os == "win" && !use_qt) {
deps += [ "//chrome/test/mini_installer:mini_installer_tests" ]
}
@@ -124,7 +143,7 @@ $NetBSD: patch-src_3rdparty_chromium_BUI
deps += [ "//third_party/breakpad:symupload($host_toolchain)" ]
}
-@@ -691,7 +732,7 @@ group("gn_all") {
+@@ -691,7 +730,7 @@ group("gn_all") {
}
}
@@ -133,7 +152,7 @@ $NetBSD: patch-src_3rdparty_chromium_BUI
deps += [
"//third_party/crashpad/crashpad:crashpad_tests",
"//third_party/crashpad/crashpad/handler:crashpad_handler",
-@@ -715,19 +756,19 @@ group("gn_all") {
+@@ -715,19 +754,19 @@ group("gn_all") {
deps += [ "//content/browser/bluetooth/tools:bluetooth_metrics_hash" ]
}
@@ -157,7 +176,7 @@ $NetBSD: patch-src_3rdparty_chromium_BUI
# TODO(GYP): Figure out if any of these should be in gn_all
# and figure out how cross-platform they are
deps += [
-@@ -769,12 +810,12 @@ group("gn_all") {
+@@ -769,12 +808,12 @@ group("gn_all") {
}
deps += [ "//third_party/libjpeg_turbo:simd_asm" ]
}
@@ -172,7 +191,7 @@ $NetBSD: patch-src_3rdparty_chromium_BUI
(is_win && use_libfuzzer) || (use_libfuzzer && is_mac)) {
deps += [
"//chrome/services/ipp_parser/public/cpp:fuzzers",
-@@ -798,7 +839,7 @@ group("gn_all") {
+@@ -798,7 +837,7 @@ group("gn_all") {
deps += [ "//native_client_sdk/src:nacl_core_sdk" ]
}
@@ -181,7 +200,7 @@ $NetBSD: patch-src_3rdparty_chromium_BUI
deps += [
"//headless:headless_non_renderer",
"//headless:headless_tests",
-@@ -810,8 +851,12 @@ group("gn_all") {
+@@ -810,8 +849,12 @@ group("gn_all") {
"//chrome/browser/vr:vr_common_perftests",
"//chrome/browser/vr:vr_common_unittests",
"//chrome/browser/vr:vr_pixeltests",
@@ -194,7 +213,7 @@ $NetBSD: patch-src_3rdparty_chromium_BUI
if (is_android) {
deps += [ "//chrome/browser/android/vr:vr_android_unittests" ]
}
-@@ -851,7 +896,7 @@ group("gn_all") {
+@@ -851,7 +894,7 @@ group("gn_all") {
# ozone. We also need to figure out what to do with remoting_host that is set for
# use_x11 && is_linux. See remoting/remoting_options.gni. For now, just allow to
# enable remoting for is_linux && use_x11 && use_ozone.
@@ -203,7 +222,31 @@ $NetBSD: patch-src_3rdparty_chromium_BUI
(use_x11 || !use_ozone)) {
# This group is used for network annotation check test.
group("shipped_binaries") {
-@@ -1103,7 +1148,7 @@ if (!is_ios && !use_qt) {
+@@ -959,7 +1002,6 @@ if (is_chromeos) {
+ "//third_party/dawn/src/tests:dawn_unittests",
+
+ # Blocked on https://github.com/catapult-project/catapult/issues/2297
+- #"//third_party/catapult/telemetry:bitmaptools",
+ "//tools/perf/clear_system_cache",
+ "//ui/ozone/gl:ozone_gl_unittests",
+ ]
+@@ -1037,7 +1079,6 @@ if (!is_ios && !use_qt) {
+ data_deps = [
+ "//chrome:chrome",
+ "//chrome/test/chromedriver",
+- "//third_party/catapult/third_party/typ",
+ ]
+ if (is_win) {
+ data_deps += [ "//build/win:copy_cdb_to_output" ]
+@@ -1084,7 +1125,6 @@ if (!is_ios && !use_qt) {
+ "//third_party/blink/public:blink_devtools_inspector_resources",
+ "//third_party/blink/public/mojom:mojom_platform_js_data_deps",
+ "//third_party/blink/renderer/core/html:js_files_for_form_controls_web_tests",
+- "//third_party/catapult/third_party/typ",
+ "//third_party/mesa_headers",
+ "//tools/imagediff",
+ ]
+@@ -1103,7 +1143,7 @@ if (!is_ios && !use_qt) {
data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ]
}
@@ -212,7 +255,27 @@ $NetBSD: patch-src_3rdparty_chromium_BUI
data_deps +=
[ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ]
}
-@@ -1308,7 +1353,7 @@ group("chromium_builder_perf") {
+@@ -1152,7 +1192,6 @@ if (!is_ios && !use_qt) {
+
+ if (is_android) {
+ data += [
+- "//third_party/catapult/",
+ "//build/android/",
+ ]
+ }
+@@ -1259,11 +1298,6 @@ if (!is_ios && !use_qt) {
+ "//third_party/blink/web_tests/StaleTestExpectations",
+ "//third_party/blink/web_tests/TestExpectations",
+ "//third_party/blink/web_tests/VirtualTestSuites",
+- "//third_party/catapult/common/py_utils/",
+- "//third_party/catapult/devil/",
+- "//third_party/catapult/dependency_manager/",
+- "//third_party/catapult/third_party/zipfile/",
+- "//third_party/catapult/third_party/typ/",
+ "//third_party/depot_tools/pylint",
+ "//third_party/depot_tools/pylint-1.5",
+ "//third_party/depot_tools/pylint_main.py",
+@@ -1308,7 +1342,7 @@ group("chromium_builder_perf") {
if (is_win) {
data_deps += [ "//chrome/installer/mini_installer:mini_installer" ]
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_chrome_test_BUILD.gn
diff -u pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_chrome_test_BUILD.gn:1.2 pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_chrome_test_BUILD.gn:1.3
--- pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_chrome_test_BUILD.gn:1.2 Mon Apr 18 11:18:18 2022
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_chrome_test_BUILD.gn Thu Jun 8 20:38:06 2023
@@ -1,6 +1,9 @@
-$NetBSD: patch-src_3rdparty_chromium_chrome_test_BUILD.gn,v 1.2 2022/04/18 11:18:18 adam Exp $
+$NetBSD: patch-src_3rdparty_chromium_chrome_test_BUILD.gn,v 1.3 2023/06/08 20:38:06 markd Exp $
---- src/3rdparty/chromium/chrome/test/BUILD.gn.orig 2021-02-19 16:41:59.000000000 +0000
+support bsd
+build with python3 (remove catapult)
+
+--- src/3rdparty/chromium/chrome/test/BUILD.gn.orig 2022-03-30 09:48:18.000000000 +0000
+++ src/3rdparty/chromium/chrome/test/BUILD.gn
@@ -300,7 +300,7 @@ static_library("test_support") {
]
@@ -173,8 +176,12 @@ $NetBSD: patch-src_3rdparty_chromium_chr
data_deps += [ "//chrome:packed_resources" ]
}
-@@ -7107,7 +7107,7 @@ if (!is_fuchsia && !is_android) {
- "//third_party/catapult/web_page_replay_go/deterministic.js",
+@@ -7103,11 +7103,9 @@ if (!is_fuchsia && !is_android) {
+ "//chrome/test/data/password/captured_sites/",
+ "//chrome/test/data/web_page_replay_go_helper_scripts/automation_helper.js",
+ "//components/test/data/autofill/web_page_replay_support_files/",
+- "//third_party/catapult/telemetry/telemetry/bin/",
+- "//third_party/catapult/web_page_replay_go/deterministic.js",
]
- if (is_linux || is_chromeos || is_win) {
@@ -182,3 +189,35 @@ $NetBSD: patch-src_3rdparty_chromium_chr
data_deps = [ "//chrome:packed_resources" ]
}
+@@ -7141,7 +7139,6 @@ if (!is_fuchsia && !is_android) {
+
+ # TODO(uwyiming%chromium.org@localhost) create a gn target for Web Page Replay Go (WPR Go) and only WPR Go.
+ # So that test targets requiring WPR Go does not pull down the whole telemetry tool chain.
+- "//third_party/catapult:telemetry_chrome_test_support",
+ "//third_party/hunspell",
+ "//third_party/icu",
+ "//third_party/libpng",
+@@ -7171,7 +7168,6 @@ if (!is_fuchsia && !is_android) {
+ deps = [ "//tools/perf/chrome_telemetry_build:telemetry_chrome_test" ]
+
+ data = [
+- "//third_party/catapult/telemetry/telemetry/internal/bin/",
+ "//tools/perf/run_telemetry_tests",
+
+ # For isolate contract.
+@@ -7189,7 +7185,6 @@ if (!is_fuchsia && !is_android) {
+ group("telemetry_gpu_unittests") {
+ testonly = true
+ deps = [
+- "//third_party/catapult:telemetry_chrome_test_support",
+ "//tools/metrics:metrics_python_tests",
+ ]
+ data = [
+@@ -7313,7 +7308,6 @@ if (is_mac || is_win || is_android) {
+ "//testing/scripts",
+ "//testing/test_env.py",
+ "//testing/xvfb.py",
+- "//third_party/catapult",
+ "//tools",
+ ]
+ }
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_content_browser_BUILD.gn
diff -u pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_content_browser_BUILD.gn:1.2 pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_content_browser_BUILD.gn:1.3
--- pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_content_browser_BUILD.gn:1.2 Mon Apr 18 11:18:18 2022
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_content_browser_BUILD.gn Thu Jun 8 20:38:06 2023
@@ -1,6 +1,9 @@
-$NetBSD: patch-src_3rdparty_chromium_content_browser_BUILD.gn,v 1.2 2022/04/18 11:18:18 adam Exp $
+$NetBSD: patch-src_3rdparty_chromium_content_browser_BUILD.gn,v 1.3 2023/06/08 20:38:06 markd Exp $
---- src/3rdparty/chromium/content/browser/BUILD.gn.orig 2021-02-19 16:41:59.000000000 +0000
+support bsd
+build with python3 (remove catapult)
+
+--- src/3rdparty/chromium/content/browser/BUILD.gn.orig 2022-03-30 09:48:18.000000000 +0000
+++ src/3rdparty/chromium/content/browser/BUILD.gn
@@ -2067,7 +2067,7 @@ jumbo_static_library("browser") {
deps += [ "//ui/events" ]
@@ -20,7 +23,15 @@ $NetBSD: patch-src_3rdparty_chromium_con
sources += [
"tracing/cast_tracing_agent.cc",
"tracing/cast_tracing_agent.h",
-@@ -2417,7 +2417,7 @@ jumbo_static_library("browser") {
+@@ -2169,7 +2169,6 @@ jumbo_static_library("browser") {
+ if (!is_android) {
+ deps += [
+ "//components/vector_icons",
+- "//content/browser/tracing:resources",
+ ]
+ }
+
+@@ -2417,7 +2416,7 @@ jumbo_static_library("browser") {
sources += [ "renderer_host/pepper/pepper_truetype_font_list_pango.cc" ]
}
@@ -29,7 +40,7 @@ $NetBSD: patch-src_3rdparty_chromium_con
deps += [ "//components/services/font:ppapi_fontconfig_matching" ]
}
}
-@@ -2455,7 +2455,7 @@ jumbo_static_library("browser") {
+@@ -2455,7 +2454,7 @@ jumbo_static_library("browser") {
}
}
@@ -38,7 +49,7 @@ $NetBSD: patch-src_3rdparty_chromium_con
deps += [ "//third_party/fontconfig" ]
}
-@@ -2726,7 +2726,7 @@ jumbo_static_library("browser") {
+@@ -2726,7 +2725,7 @@ jumbo_static_library("browser") {
"web_contents/aura/gesture_nav_simple.h",
]
@@ -47,7 +58,7 @@ $NetBSD: patch-src_3rdparty_chromium_con
deps += [ "//ui/base/ime/linux" ]
}
} else { # Not aura.
-@@ -2807,7 +2807,7 @@ jumbo_static_library("browser") {
+@@ -2807,7 +2806,7 @@ jumbo_static_library("browser") {
]
}
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_content_shell_BUILD.gn
diff -u pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_content_shell_BUILD.gn:1.2 pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_content_shell_BUILD.gn:1.3
--- pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_content_shell_BUILD.gn:1.2 Mon Apr 18 11:18:19 2022
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_content_shell_BUILD.gn Thu Jun 8 20:38:06 2023
@@ -1,6 +1,9 @@
-$NetBSD: patch-src_3rdparty_chromium_content_shell_BUILD.gn,v 1.2 2022/04/18 11:18:19 adam Exp $
+$NetBSD: patch-src_3rdparty_chromium_content_shell_BUILD.gn,v 1.3 2023/06/08 20:38:06 markd Exp $
---- src/3rdparty/chromium/content/shell/BUILD.gn.orig 2021-02-19 16:41:59.000000000 +0000
+support bsd
+build with python3 (remove catapult)
+
+--- src/3rdparty/chromium/content/shell/BUILD.gn.orig 2022-03-30 09:48:18.000000000 +0000
+++ src/3rdparty/chromium/content/shell/BUILD.gn
@@ -94,7 +94,7 @@ static_library("content_shell_app") {
"//content/web_test:web_test_renderer",
@@ -33,7 +36,23 @@ $NetBSD: patch-src_3rdparty_chromium_con
deps += [ "//build/config/freetype" ]
}
-@@ -510,7 +516,7 @@ if (is_android) {
+@@ -390,7 +396,6 @@ repack("pak") {
+ sources = [
+ "$root_gen_dir/content/app/resources/content_resources_100_percent.pak",
+ "$root_gen_dir/content/browser/resources/media/media_internals_resources.pak",
+- "$root_gen_dir/content/browser/tracing/tracing_resources.pak",
+ "$root_gen_dir/content/browser/webrtc/resources/webrtc_internals_resources.pak",
+ "$root_gen_dir/content/content_resources.pak",
+ "$root_gen_dir/content/dev_ui_content_resources.pak",
+@@ -413,7 +418,6 @@ repack("pak") {
+ "//content:dev_ui_content_resources",
+ "//content/app/resources",
+ "//content/browser/resources/media:media_internals_resources",
+- "//content/browser/tracing:resources",
+ "//content/browser/webrtc/resources",
+ "//mojo/public/js:resources",
+ "//net:net_resources",
+@@ -510,7 +514,7 @@ if (is_android) {
[ "//third_party/crashpad/crashpad/handler:crashpad_handler" ]
}
@@ -42,7 +61,7 @@ $NetBSD: patch-src_3rdparty_chromium_con
# Set rpath to find our own libfreetype even in a non-component build.
configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ]
}
-@@ -800,7 +806,7 @@ group("content_shell_crash_test") {
+@@ -800,7 +804,7 @@ group("content_shell_crash_test") {
if (is_win) {
data_deps += [ "//build/win:copy_cdb_to_output" ]
}
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_webrtc_test_BUILD.gn
diff -u pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_webrtc_test_BUILD.gn:1.2
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_webrtc_test_BUILD.gn:1.3
--- pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_webrtc_test_BUILD.gn:1.2 Mon Apr 18 11:18:19 2022
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_webrtc_test_BUILD.gn Thu Jun 8 20:38:06 2023
@@ -1,8 +1,30 @@
-$NetBSD: patch-src_3rdparty_chromium_third__party_webrtc_test_BUILD.gn,v 1.2 2022/04/18 11:18:19 adam Exp $
+$NetBSD: patch-src_3rdparty_chromium_third__party_webrtc_test_BUILD.gn,v 1.3 2023/06/08 20:38:06 markd Exp $
---- src/3rdparty/chromium/third_party/webrtc/test/BUILD.gn.orig 2021-02-19 16:41:59.000000000 +0000
+support bsd
+build with python3 (remove catapult)
+
+--- src/3rdparty/chromium/third_party/webrtc/test/BUILD.gn.orig 2022-03-30 09:48:18.000000000 +0000
+++ src/3rdparty/chromium/third_party/webrtc/test/BUILD.gn
-@@ -969,17 +969,17 @@ rtc_library("test_renderer_generic") {
+@@ -258,10 +258,6 @@ rtc_library("perf_test") {
+ absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]
+ if (rtc_enable_protobuf) {
+ sources += [ "testsupport/perf_test_histogram_writer.cc" ]
+- deps += [
+- "//third_party/catapult/tracing/tracing:histogram",
+- "//third_party/catapult/tracing/tracing:reserved_infos",
+- ]
+ } else {
+ sources += [ "testsupport/perf_test_histogram_writer_no_protobuf.cc" ]
+ }
+@@ -566,7 +562,6 @@ if (rtc_include_tests) {
+
+ if (rtc_enable_protobuf) {
+ sources += [ "testsupport/perf_test_histogram_writer_unittest.cc" ]
+- deps += [ "//third_party/catapult/tracing/tracing:histogram" ]
+ }
+
+ data = test_support_unittests_resources
+@@ -969,17 +964,17 @@ rtc_library("test_renderer_generic") {
]
deps += [ "../api:scoped_refptr" ]
}
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_tools_binary__size_BUILD.gn
diff -u pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_tools_binary__size_BUILD.gn:1.2 pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_tools_binary__size_BUILD.gn:1.3
--- pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_tools_binary__size_BUILD.gn:1.2 Mon Apr 18 11:18:19 2022
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_tools_binary__size_BUILD.gn Thu Jun 8 20:38:06 2023
@@ -1,9 +1,15 @@
-$NetBSD: patch-src_3rdparty_chromium_tools_binary__size_BUILD.gn,v 1.2 2022/04/18 11:18:19 adam Exp $
+$NetBSD: patch-src_3rdparty_chromium_tools_binary__size_BUILD.gn,v 1.3 2023/06/08 20:38:06 markd Exp $
---- src/3rdparty/chromium/tools/binary_size/BUILD.gn.orig 2021-02-19 16:41:59.000000000 +0000
+support bsd
+build with python3 (remove catapult)
+
+--- src/3rdparty/chromium/tools/binary_size/BUILD.gn.orig 2022-03-30 09:48:18.000000000 +0000
+++ src/3rdparty/chromium/tools/binary_size/BUILD.gn
-@@ -21,7 +21,7 @@ python_library("sizes_py") {
- data_deps = [ "//third_party/catapult/tracing:convert_chart_json" ]
+@@ -18,10 +18,9 @@ python_library("binary_size_trybot_py")
+ python_library("sizes_py") {
+ testonly = true
+ pydeps_file = "sizes.pydeps"
+- data_deps = [ "//third_party/catapult/tracing:convert_chart_json" ]
}
-if (is_linux || is_chromeos) {
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_tools_perf_chrome__telemetry__build_BUILD.gn
diff -u pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_tools_perf_chrome__telemetry__build_BUILD.gn:1.2
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_tools_perf_chrome__telemetry__build_BUILD.gn:1.3
--- pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_tools_perf_chrome__telemetry__build_BUILD.gn:1.2 Mon Apr 18 11:18:19 2022
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_tools_perf_chrome__telemetry__build_BUILD.gn Thu Jun 8 20:38:06 2023
@@ -1,6 +1,9 @@
-$NetBSD: patch-src_3rdparty_chromium_tools_perf_chrome__telemetry__build_BUILD.gn,v 1.2 2022/04/18 11:18:19 adam Exp $
+$NetBSD: patch-src_3rdparty_chromium_tools_perf_chrome__telemetry__build_BUILD.gn,v 1.3 2023/06/08 20:38:06 markd Exp $
---- src/3rdparty/chromium/tools/perf/chrome_telemetry_build/BUILD.gn.orig 2021-02-19 16:41:59.000000000 +0000
+support bsd
+build with python3 (remove catapult)
+
+--- src/3rdparty/chromium/tools/perf/chrome_telemetry_build/BUILD.gn.orig 2022-03-30 09:48:18.000000000 +0000
+++ src/3rdparty/chromium/tools/perf/chrome_telemetry_build/BUILD.gn
@@ -43,7 +43,7 @@ group("telemetry_chrome_test") {
data_deps += [ "//chrome:reorder_imports" ]
@@ -11,3 +14,19 @@ $NetBSD: patch-src_3rdparty_chromium_too
data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
# CrOS currently has issues with the locally compiled version of
+@@ -107,7 +107,6 @@ group("telemetry_chrome_test_without_chr
+ "//tools/perf/core/", # chrome_telemetry_build/ depends on core/
+ ]
+ data_deps = [
+- "//third_party/catapult:telemetry_chrome_test_support",
+ "//tools/metrics:metrics_python_tests",
+ ]
+
+@@ -151,7 +150,5 @@ group("telemetry_chrome_test_without_chr
+ "//build/android:devil_chromium_py",
+ "//build/android:stack_tools",
+ ]
+- } else if (!is_fuchsia) {
+- data_deps += [ "//third_party/catapult/telemetry:bitmaptools" ]
+ }
+ }
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_weblayer_shell_BUILD.gn
diff -u pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_weblayer_shell_BUILD.gn:1.2 pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_weblayer_shell_BUILD.gn:1.3
--- pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_weblayer_shell_BUILD.gn:1.2 Mon Apr 18 11:18:19 2022
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_weblayer_shell_BUILD.gn Thu Jun 8 20:38:06 2023
@@ -1,6 +1,9 @@
-$NetBSD: patch-src_3rdparty_chromium_weblayer_shell_BUILD.gn,v 1.2 2022/04/18 11:18:19 adam Exp $
+$NetBSD: patch-src_3rdparty_chromium_weblayer_shell_BUILD.gn,v 1.3 2023/06/08 20:38:06 markd Exp $
---- src/3rdparty/chromium/weblayer/shell/BUILD.gn.orig 2021-02-19 16:41:59.000000000 +0000
+support bsd
+build with python3 (remove catapult)
+
+--- src/3rdparty/chromium/weblayer/shell/BUILD.gn.orig 2022-03-30 09:48:18.000000000 +0000
+++ src/3rdparty/chromium/weblayer/shell/BUILD.gn
@@ -68,7 +68,7 @@ static_library("weblayer_shell_lib") {
"//weblayer:resources",
@@ -20,7 +23,23 @@ $NetBSD: patch-src_3rdparty_chromium_web
deps += [ "//build/config/freetype" ]
}
}
-@@ -266,7 +266,7 @@ if (is_android) {
+@@ -161,7 +161,6 @@ repack("support_pak") {
+ "$root_gen_dir/components/strings/components_locale_settings_en-US.pak",
+ "$root_gen_dir/components/strings/components_strings_en-US.pak",
+ "$root_gen_dir/content/app/resources/content_resources_100_percent.pak",
+- "$root_gen_dir/content/browser/tracing/tracing_resources.pak",
+ "$root_gen_dir/content/content_resources.pak",
+ "$root_gen_dir/content/dev_ui_content_resources.pak",
+ "$root_gen_dir/mojo/public/js/mojo_bindings_resources.pak",
+@@ -182,7 +181,6 @@ repack("support_pak") {
+ "//content:content_resources",
+ "//content:dev_ui_content_resources",
+ "//content/app/resources",
+- "//content/browser/tracing:resources",
+ "//mojo/public/js:resources",
+ "//net:net_resources",
+ "//third_party/blink/public:resources",
+@@ -266,7 +264,7 @@ if (is_android) {
[ "//third_party/crashpad/crashpad/handler:crashpad_handler" ]
}
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_buildtools_config_support.pri
diff -u pkgsrc/x11/qt5-qtwebengine/patches/patch-src_buildtools_config_support.pri:1.2 pkgsrc/x11/qt5-qtwebengine/patches/patch-src_buildtools_config_support.pri:1.3
--- pkgsrc/x11/qt5-qtwebengine/patches/patch-src_buildtools_config_support.pri:1.2 Mon Apr 18 11:18:19 2022
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_buildtools_config_support.pri Thu Jun 8 20:38:06 2023
@@ -1,4 +1,7 @@
-$NetBSD: patch-src_buildtools_config_support.pri,v 1.2 2022/04/18 11:18:19 adam Exp $
+$NetBSD: patch-src_buildtools_config_support.pri,v 1.3 2023/06/08 20:38:06 markd Exp $
+
+support netbsd openbsd
+build with python3
--- src/buildtools/config/support.pri.orig
+++ src/buildtools/config/support.pri
@@ -11,7 +14,16 @@ $NetBSD: patch-src_buildtools_config_sup
qtwebengine_skipBuild("QtWebEngine can be built only on Linux, Windows or macOS.")
return(false)
}
-@@ -38,7 +38,7 @@ defineReplace(qtwebengine_checkWebEngineCoreError) {
+@@ -21,7 +21,7 @@ defineReplace(qtwebengine_checkWebEngine
+ !qtwebengine_checkForGperf(QtWebEngine):return(false)
+ !qtwebengine_checkForBison(QtWebEngine):return(false)
+ !qtwebengine_checkForFlex(QtWebEngine):return(false)
+- !qtwebengine_checkForPython2(QtWebEngine):return(false)
++ !qtwebengine_checkForPython(QtWebEngine):return(false)
+ !qtwebengine_checkForNodejs(QtWebEngine):return(false)
+ !qtwebengine_checkForSanitizer(QtWebEngine):return(false)
+ linux:!qtwebengine_checkForPkgCfg(QtWebEngine):return(false)
+@@ -39,7 +39,7 @@ defineReplace(qtwebengine_checkWebEngine
# this shuold match webengine-qtpdf-support
defineReplace(qtwebengine_checkPdfError) {
@@ -20,3 +32,26 @@ $NetBSD: patch-src_buildtools_config_sup
qtwebengine_skipBuild("QtPdf can be built only on Linux, Windows, macOS or iOS.")
return(false)
}
+@@ -51,7 +51,7 @@ defineReplace(qtwebengine_checkPdfError)
+ !qtwebengine_checkForGperf(QtPdf):return(false)
+ !qtwebengine_checkForBison(QtPdf):return(false)
+ !qtwebengine_checkForFlex(QtPdf):return(false)
+- !qtwebengine_checkForPython2(QtPdf):return(false)
++ !qtwebengine_checkForPython(QtPdf):return(false)
+ !qtwebengine_checkForSanitizer(QtPdf):return(false)
+ linux:!qtwebengine_checkForPkgCfg(QtPdf):return(false)
+ linux:!qtwebengine_checkForHostPkgCfg(QtPdf):return(false)
+@@ -147,10 +147,10 @@ defineTest(qtwebengine_checkForFlex) {
+ return(true)
+ }
+
+-defineTest(qtwebengine_checkForPython2) {
++defineTest(qtwebengine_checkForPython) {
+ module = $$1
+- !qtConfig(webengine-python2) {
+- qtwebengine_skipBuild("Python version 2 (2.7.5 or later) is required to build $${module}.")
++ !qtConfig(webengine-python) {
++ qtwebengine_skipBuild("Python is required to build $${module}.")
+ return(false)
+ }
+ return(true)
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_buildtools_configure.json
diff -u pkgsrc/x11/qt5-qtwebengine/patches/patch-src_buildtools_configure.json:1.2 pkgsrc/x11/qt5-qtwebengine/patches/patch-src_buildtools_configure.json:1.3
--- pkgsrc/x11/qt5-qtwebengine/patches/patch-src_buildtools_configure.json:1.2 Mon Apr 18 11:18:19 2022
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_buildtools_configure.json Thu Jun 8 20:38:06 2023
@@ -1,8 +1,24 @@
-$NetBSD: patch-src_buildtools_configure.json,v 1.2 2022/04/18 11:18:19 adam Exp $
+$NetBSD: patch-src_buildtools_configure.json,v 1.3 2023/06/08 20:38:06 markd Exp $
+
+support netbsd openbsd
+build with python3
--- src/buildtools/configure.json.orig
+++ src/buildtools/configure.json
-@@ -362,7 +362,7 @@
+@@ -295,9 +295,9 @@
+ "label": "system ninja",
+ "type": "detectNinja"
+ },
+- "webengine-python2": {
+- "label": "python2",
+- "type": "detectPython2",
++ "webengine-python": {
++ "label": "python",
++ "type": "detectPython",
+ "log": "location"
+ },
+ "webengine-winversion": {
+@@ -364,7 +364,7 @@
"features": {
"webengine-core-support": {
"label": "Support Qt WebEngine Core",
@@ -11,7 +27,16 @@ $NetBSD: patch-src_buildtools_configure.
&& !config.static
&& module.gui
&& features.webengine-submodule
-@@ -388,7 +388,7 @@
+@@ -374,7 +374,7 @@
+ && features.webengine-gperf
+ && features.webengine-bison
+ && features.webengine-flex
+- && features.webengine-python2
++ && features.webengine-python
+ && features.webengine-nodejs
+ && (!config.sanitizer || features.webengine-sanitizer)
+ && (!config.linux || features.pkg-config)
+@@ -391,7 +391,7 @@
},
"webengine-qtpdf-support": {
"label": "Support Qt Pdf",
@@ -20,7 +45,33 @@ $NetBSD: patch-src_buildtools_configure.
&& module.gui
&& features.webengine-submodule
&& features.webengine-nowhitespace
-@@ -548,6 +548,7 @@
+@@ -400,7 +400,7 @@
+ && features.webengine-gperf
+ && features.webengine-bison
+ && features.webengine-flex
+- && features.webengine-python2
++ && features.webengine-python
+ && (!config.sanitizer || features.webengine-sanitizer)
+ && (!config.linux || features.pkg-config)
+ && (!config.linux || features.webengine-host-pkg-config)
+@@ -423,12 +423,12 @@
+ "autoDetect": "features.private_tests",
+ "output": [ "privateFeature" ]
+ },
+- "webengine-python2": {
+- "label": "python2",
+- "condition": "tests.webengine-python2",
++ "webengine-python": {
++ "label": "python",
++ "condition": "tests.webengine-python",
+ "output": [
+ "privateFeature",
+- { "type": "varAssign", "name": "QMAKE_PYTHON2", "value": "tests.webengine-python2.location" }
++ { "type": "varAssign", "name": "QMAKE_PYTHON", "value": "tests.webengine-python.location" }
+ ]
+ },
+ "webengine-gperf": {
+@@ -578,6 +578,7 @@
},
"webengine-system-minizip" : {
"label": "minizip",
@@ -28,7 +79,7 @@ $NetBSD: patch-src_buildtools_configure.
"condition": "config.unix && libs.webengine-minizip",
"output": [ "privateFeature" ]
},
-@@ -604,7 +605,7 @@
+@@ -639,7 +640,7 @@
},
"webengine-system-ffmpeg": {
"label": "ffmpeg",
Added files:
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_build_print__python__deps.py
diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_build_print__python__deps.py:1.1
--- /dev/null Thu Jun 8 20:38:06 2023
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_build_print__python__deps.py Thu Jun 8 20:38:06 2023
@@ -0,0 +1,29 @@
+$NetBSD: patch-src_3rdparty_chromium_build_print__python__deps.py,v 1.1 2023/06/08 20:38:06 markd Exp $
+
+build with python3
+
+--- src/3rdparty/chromium/build/print_python_deps.py.orig 2022-03-30 09:48:18.000000000 +0000
++++ src/3rdparty/chromium/build/print_python_deps.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python2.7
++#!/usr/bin/python
+ # 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.
+@@ -80,7 +80,6 @@ def _GetTargetPythonVersion(module):
+ if shebang.startswith('#!'):
+ # Examples:
+ # '#!/usr/bin/python'
+- # '#!/usr/bin/python2.7'
+ # '#!/usr/bin/python3'
+ # '#!/usr/bin/env python3'
+ # '#!/usr/bin/env vpython'
+@@ -152,7 +151,7 @@ def main():
+
+ # Trybots run with vpython as default Python, but with a different config
+ # from //.vpython. To make the is_vpython test work, and to match the behavior
+- # of dev machines, the shebang line must be run with python2.7.
++ # of dev machines, the shebang line must be run with python.
+ #
+ # E.g. $HOME/.vpython-root/dd50d3/bin/python
+ # E.g. /b/s/w/ir/cache/vpython/ab5c79/bin/python
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_chrome_chrome__paks.gni
diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_chrome_chrome__paks.gni:1.1
--- /dev/null Thu Jun 8 20:38:06 2023
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_chrome_chrome__paks.gni Thu Jun 8 20:38:06 2023
@@ -0,0 +1,22 @@
+$NetBSD: patch-src_3rdparty_chromium_chrome_chrome__paks.gni,v 1.1 2023/06/08 20:38:06 markd Exp $
+
+build with python3 (remove catapult)
+
+--- src/3rdparty/chromium/chrome/chrome_paks.gni.orig 2022-03-30 09:48:18.000000000 +0000
++++ src/3rdparty/chromium/chrome/chrome_paks.gni
+@@ -94,7 +94,6 @@ template("chrome_extra_paks") {
+ "$root_gen_dir/chrome/common_resources.pak",
+ "$root_gen_dir/components/autofill/core/browser/autofill_address_rewriter_resources.pak",
+ "$root_gen_dir/components/components_resources.pak",
+- "$root_gen_dir/content/browser/tracing/tracing_resources.pak",
+ "$root_gen_dir/content/content_resources.pak",
+ "$root_gen_dir/mojo/public/js/mojo_bindings_resources.pak",
+ "$root_gen_dir/net/net_resources.pak",
+@@ -110,7 +109,6 @@ template("chrome_extra_paks") {
+ "//components/autofill/core/browser:autofill_address_rewriter_resources",
+ "//components/resources",
+ "//content:content_resources",
+- "//content/browser/tracing:resources",
+ "//mojo/public/js:resources",
+ "//net:net_resources",
+ "//skia:skia_resources",
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_components_resources_protobufs_binary__proto__generator.py
diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_components_resources_protobufs_binary__proto__generator.py:1.1
--- /dev/null Thu Jun 8 20:38:06 2023
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_components_resources_protobufs_binary__proto__generator.py Thu Jun 8 20:38:06 2023
@@ -0,0 +1,30 @@
+$NetBSD: patch-src_3rdparty_chromium_components_resources_protobufs_binary__proto__generator.py,v 1.1 2023/06/08 20:38:06 markd Exp $
+
+build with python3
+
+--- src/3rdparty/chromium/components/resources/protobufs/binary_proto_generator.py.orig 2022-03-30 09:48:18.000000000 +0000
++++ src/3rdparty/chromium/components/resources/protobufs/binary_proto_generator.py
+@@ -8,6 +8,7 @@
+
+ """
+
++from __future__ import print_function
+ import abc
+ import imp
+ import optparse
+@@ -196,12 +197,12 @@ class BinaryProtoGenerator:
+ self._ImportProtoModules(opts.path)
+
+ if not self.VerifyArgs(opts):
+- print "Wrong arguments"
++ print("Wrong arguments")
+ return 1
+
+ try:
+ self._GenerateBinaryProtos(opts)
+ except Exception as e:
+- print "ERROR: Failed to render binary version of %s:\n %s\n%s" % (
+- opts.infile, str(e), traceback.format_exc())
++ print("ERROR: Failed to render binary version of %s:\n %s\n%s" % (
++ opts.infile, str(e), traceback.format_exc()))
+ return 1
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_content_browser_tracing_BUILD.gn
diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_content_browser_tracing_BUILD.gn:1.1
--- /dev/null Thu Jun 8 20:38:06 2023
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_content_browser_tracing_BUILD.gn Thu Jun 8 20:38:06 2023
@@ -0,0 +1,58 @@
+$NetBSD: patch-src_3rdparty_chromium_content_browser_tracing_BUILD.gn,v 1.1 2023/06/08 20:38:06 markd Exp $
+
+build with python3 (remove catapult)
+
+--- src/3rdparty/chromium/content/browser/tracing/BUILD.gn.orig 2022-03-30 09:48:18.000000000 +0000
++++ src/3rdparty/chromium/content/browser/tracing/BUILD.gn
+@@ -1,51 +0,0 @@
+-# Copyright 2014 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.
+-
+-import("//tools/grit/grit_rule.gni")
+-
+-# generate_about_tracing puts its files in this directory
+-tracing_gen_dir = "$root_gen_dir/content/browser/tracing"
+-
+-# The script just writes filename with no dirs to the .grd, so we always need
+-# this file to be in the same directory as the inputs.
+-tracing_grd = "$tracing_gen_dir/tracing_resources.grd"
+-
+-action("generate_tracing_grd") {
+- visibility = [ ":*" ] # Depend on ":resources" to get this.
+- script = "generate_trace_viewer_grd.py"
+-
+- input_pages = [
+- "$tracing_gen_dir/about_tracing.html",
+- "$tracing_gen_dir/about_tracing.js",
+- ]
+- inputs = input_pages
+- outputs = [ tracing_grd ]
+-
+- args = rebase_path(input_pages, target_gen_dir) + [
+- "--output",
+- rebase_path(tracing_grd, root_build_dir),
+- ]
+-
+- deps = [ "//third_party/catapult/tracing:generate_about_tracing" ]
+-}
+-
+-grit("resources") {
+- source = tracing_grd
+-
+- # Required because the .grd is generated.
+- enable_input_discovery_for_gn_analyze = false
+-
+- outputs = [
+- "grit/tracing_resources.h",
+- "tracing_resources.pak",
+- ]
+-
+- # resource_ids has an entry for our .grd file that looks like:
+- # "<(SHARED_INTERMEDIATE_DIR)/content/browser/tracing/tracing_resources.grd"
+- # and what we pass here should make that resolve to our .grd file.
+- defines =
+- [ "SHARED_INTERMEDIATE_DIR=" + rebase_path(root_gen_dir, root_build_dir) ]
+-
+- deps = [ ":generate_tracing_grd" ]
+-}
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_content_browser_tracing_generate__trace__viewer__grd.py
diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_content_browser_tracing_generate__trace__viewer__grd.py:1.1
--- /dev/null Thu Jun 8 20:38:06 2023
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_content_browser_tracing_generate__trace__viewer__grd.py Thu Jun 8 20:38:06 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_3rdparty_chromium_content_browser_tracing_generate__trace__viewer__grd.py,v 1.1 2023/06/08 20:38:06 markd Exp $
+
+build with python3
+
+--- src/3rdparty/chromium/content/browser/tracing/generate_trace_viewer_grd.py.orig 2022-03-30 09:48:18.000000000 +0000
++++ src/3rdparty/chromium/content/browser/tracing/generate_trace_viewer_grd.py
+@@ -74,7 +74,7 @@ def main(argv):
+ for filename in parsed_args.source_files:
+ add_file_to_grd(doc, os.path.basename(filename))
+
+- with open(parsed_args.output_filename, 'w') as output_file:
++ with open(parsed_args.output_filename, 'wb') as output_file:
+ output_file.write(doc.toxml(encoding='UTF-8'))
+
+
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_content_browser_tracing_tracing__ui.cc
diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_content_browser_tracing_tracing__ui.cc:1.1
--- /dev/null Thu Jun 8 20:38:06 2023
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_content_browser_tracing_tracing__ui.cc Thu Jun 8 20:38:06 2023
@@ -0,0 +1,23 @@
+$NetBSD: patch-src_3rdparty_chromium_content_browser_tracing_tracing__ui.cc,v 1.1 2023/06/08 20:38:06 markd Exp $
+
+build with python3 (remove catapult)
+
+--- src/3rdparty/chromium/content/browser/tracing/tracing_ui.cc.orig 2022-03-30 09:48:18.000000000 +0000
++++ src/3rdparty/chromium/content/browser/tracing/tracing_ui.cc
+@@ -27,7 +27,6 @@
+ #include "base/strings/stringprintf.h"
+ #include "base/trace_event/trace_event.h"
+ #include "base/values.h"
+-#include "content/browser/tracing/grit/tracing_resources.h"
+ #include "content/browser/tracing/tracing_controller_impl.h"
+ #include "content/public/browser/browser_context.h"
+ #include "content/public/browser/browser_thread.h"
+@@ -242,8 +241,6 @@ TracingUI::TracingUI(WebUI* web_ui)
+ WebUIDataSource* source = WebUIDataSource::Create(kChromeUITracingHost);
+ source->DisableTrustedTypesCSP();
+ source->UseStringsJs();
+- source->SetDefaultResource(IDR_TRACING_HTML);
+- source->AddResourcePath("tracing.js", IDR_TRACING_JS);
+ source->SetRequestFilter(base::BindRepeating(OnShouldHandleRequest),
+ base::BindRepeating(OnTracingRequest));
+ WebUIDataSource::Add(browser_context, source);
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_fuchsia_engine_BUILD.gn
diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_fuchsia_engine_BUILD.gn:1.1
--- /dev/null Thu Jun 8 20:38:06 2023
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_fuchsia_engine_BUILD.gn Thu Jun 8 20:38:06 2023
@@ -0,0 +1,22 @@
+$NetBSD: patch-src_3rdparty_chromium_fuchsia_engine_BUILD.gn,v 1.1 2023/06/08 20:38:06 markd Exp $
+
+build with python3 (remove catapult)
+
+--- src/3rdparty/chromium/fuchsia/engine/BUILD.gn.orig 2022-03-30 09:48:18.000000000 +0000
++++ src/3rdparty/chromium/fuchsia/engine/BUILD.gn
+@@ -43,7 +43,6 @@ repack("web_engine_pak") {
+ "$root_gen_dir/components/components_resources.pak",
+ "$root_gen_dir/components/strings/components_strings_en-US.pak",
+ "$root_gen_dir/content/app/resources/content_resources_100_percent.pak",
+- "$root_gen_dir/content/browser/tracing/tracing_resources.pak",
+ "$root_gen_dir/content/content_resources.pak",
+ "$root_gen_dir/content/dev_ui_content_resources.pak",
+ "$root_gen_dir/mojo/public/js/mojo_bindings_resources.pak",
+@@ -66,7 +65,6 @@ repack("web_engine_pak") {
+ "//content:content_resources",
+ "//content:dev_ui_content_resources",
+ "//content/app/resources",
+- "//content/browser/tracing:resources",
+ "//gpu/command_buffer/service",
+ "//mojo/public/js:resources",
+ "//net:net_resources",
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_media_ffmpeg_ffmpeg__common.h
diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_media_ffmpeg_ffmpeg__common.h:1.1
--- /dev/null Thu Jun 8 20:38:06 2023
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_media_ffmpeg_ffmpeg__common.h Thu Jun 8 20:38:06 2023
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_3rdparty_chromium_media_ffmpeg_ffmpeg__common.h,v 1.1 2023/06/08 20:38:06 markd Exp $
+
+build with ffmpeg5 - from archlinux
+
+--- src/3rdparty/chromium/media/ffmpeg/ffmpeg_common.h.orig 2022-03-30 09:48:18.000000000 +0000
++++ src/3rdparty/chromium/media/ffmpeg/ffmpeg_common.h
+@@ -29,6 +29,7 @@ extern "C" {
+ #include <libavformat/avformat.h>
+ #include <libavformat/avio.h>
+ #include <libavutil/avutil.h>
++#include <libavutil/channel_layout.h>
+ #include <libavutil/imgutils.h>
+ #include <libavutil/log.h>
+ #include <libavutil/mastering_display_metadata.h>
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_media_filters_audio__file__reader.cc
diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_media_filters_audio__file__reader.cc:1.1
--- /dev/null Thu Jun 8 20:38:06 2023
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_media_filters_audio__file__reader.cc Thu Jun 8 20:38:06 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_3rdparty_chromium_media_filters_audio__file__reader.cc,v 1.1 2023/06/08 20:38:06 markd Exp $
+
+build with ffmpeg5 - from archlinux
+
+--- src/3rdparty/chromium/media/filters/audio_file_reader.cc.orig 2022-03-30 09:48:18.000000000 +0000
++++ src/3rdparty/chromium/media/filters/audio_file_reader.cc
+@@ -85,7 +85,7 @@ bool AudioFileReader::OpenDemuxer() {
+ }
+
+ bool AudioFileReader::OpenDecoder() {
+- AVCodec* codec = avcodec_find_decoder(codec_context_->codec_id);
++ const AVCodec* codec = avcodec_find_decoder(codec_context_->codec_id);
+ if (codec) {
+ // MP3 decodes to S16P which we don't support, tell it to use S16 instead.
+ if (codec_context_->sample_fmt == AV_SAMPLE_FMT_S16P)
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_media_filters_ffmpeg__audio__decoder.cc
diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_media_filters_ffmpeg__audio__decoder.cc:1.1
--- /dev/null Thu Jun 8 20:38:06 2023
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_media_filters_ffmpeg__audio__decoder.cc Thu Jun 8 20:38:06 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_3rdparty_chromium_media_filters_ffmpeg__audio__decoder.cc,v 1.1 2023/06/08 20:38:06 markd Exp $
+
+build with ffmpeg5 - from archlinux
+
+--- src/3rdparty/chromium/media/filters/ffmpeg_audio_decoder.cc.orig 2022-03-30 09:48:18.000000000 +0000
++++ src/3rdparty/chromium/media/filters/ffmpeg_audio_decoder.cc
+@@ -329,7 +329,7 @@ bool FFmpegAudioDecoder::ConfigureDecode
+ }
+ }
+
+- AVCodec* codec = avcodec_find_decoder(codec_context_->codec_id);
++ const AVCodec* codec = avcodec_find_decoder(codec_context_->codec_id);
+ if (!codec ||
+ avcodec_open2(codec_context_.get(), codec, &codec_options) < 0) {
+ DLOG(ERROR) << "Could not initialize audio decoder: "
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_media_filters_ffmpeg__demuxer.cc
diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_media_filters_ffmpeg__demuxer.cc:1.1
--- /dev/null Thu Jun 8 20:38:06 2023
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_media_filters_ffmpeg__demuxer.cc Thu Jun 8 20:38:06 2023
@@ -0,0 +1,53 @@
+$NetBSD: patch-src_3rdparty_chromium_media_filters_ffmpeg__demuxer.cc,v 1.1 2023/06/08 20:38:06 markd Exp $
+
+build with ffmpeg5 - from archlinux
+
+--- src/3rdparty/chromium/media/filters/ffmpeg_demuxer.cc.orig 2022-03-30 09:48:18.000000000 +0000
++++ src/3rdparty/chromium/media/filters/ffmpeg_demuxer.cc
+@@ -98,12 +98,12 @@ static base::TimeDelta ExtractStartTime(
+
+ // Next try to use the first DTS value, for codecs where we know PTS == DTS
+ // (excludes all H26x codecs). The start time must be returned in PTS.
+- if (stream->first_dts != kNoFFmpegTimestamp &&
++ if (av_stream_get_first_dts(stream) != kNoFFmpegTimestamp &&
+ stream->codecpar->codec_id != AV_CODEC_ID_HEVC &&
+ stream->codecpar->codec_id != AV_CODEC_ID_H264 &&
+ stream->codecpar->codec_id != AV_CODEC_ID_MPEG4) {
+ const base::TimeDelta first_pts =
+- ConvertFromTimeBase(stream->time_base, stream->first_dts);
++ ConvertFromTimeBase(stream->time_base, av_stream_get_first_dts(stream));
+ if (first_pts < start_time)
+ start_time = first_pts;
+ }
+@@ -408,11 +408,11 @@ void FFmpegDemuxerStream::EnqueuePacket(
+ scoped_refptr<DecoderBuffer> buffer;
+
+ if (type() == DemuxerStream::TEXT) {
+- int id_size = 0;
++ size_t id_size = 0;
+ uint8_t* id_data = av_packet_get_side_data(
+ packet.get(), AV_PKT_DATA_WEBVTT_IDENTIFIER, &id_size);
+
+- int settings_size = 0;
++ size_t settings_size = 0;
+ uint8_t* settings_data = av_packet_get_side_data(
+ packet.get(), AV_PKT_DATA_WEBVTT_SETTINGS, &settings_size);
+
+@@ -424,7 +424,7 @@ void FFmpegDemuxerStream::EnqueuePacket(
+ buffer = DecoderBuffer::CopyFrom(packet->data, packet->size,
+ side_data.data(), side_data.size());
+ } else {
+- int side_data_size = 0;
++ size_t side_data_size = 0;
+ uint8_t* side_data = av_packet_get_side_data(
+ packet.get(), AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL, &side_data_size);
+
+@@ -485,7 +485,7 @@ void FFmpegDemuxerStream::EnqueuePacket(
+ packet->size - data_offset);
+ }
+
+- int skip_samples_size = 0;
++ size_t skip_samples_size = 0;
+ const uint32_t* skip_samples_ptr =
+ reinterpret_cast<const uint32_t*>(av_packet_get_side_data(
+ packet.get(), AV_PKT_DATA_SKIP_SAMPLES, &skip_samples_size));
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_media_filters_ffmpeg__glue.cc
diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_media_filters_ffmpeg__glue.cc:1.1
--- /dev/null Thu Jun 8 20:38:06 2023
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_media_filters_ffmpeg__glue.cc Thu Jun 8 20:38:06 2023
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_3rdparty_chromium_media_filters_ffmpeg__glue.cc,v 1.1 2023/06/08 20:38:06 markd Exp $
+
+build with ffmpeg5 - from archlinux
+
+--- src/3rdparty/chromium/media/filters/ffmpeg_glue.cc.orig 2022-03-30 09:48:18.000000000 +0000
++++ src/3rdparty/chromium/media/filters/ffmpeg_glue.cc
+@@ -59,7 +59,6 @@ static int64_t AVIOSeekOperation(void* o
+ }
+
+ void FFmpegGlue::InitializeFFmpeg() {
+- av_register_all();
+ }
+
+ static void LogContainer(bool is_local_file,
+@@ -95,9 +94,6 @@ FFmpegGlue::FFmpegGlue(FFmpegURLProtocol
+ // Enable fast, but inaccurate seeks for MP3.
+ format_context_->flags |= AVFMT_FLAG_FAST_SEEK;
+
+- // Ensures we can read out various metadata bits like vp8 alpha.
+- format_context_->flags |= AVFMT_FLAG_KEEP_SIDE_DATA;
+-
+ // Ensures format parsing errors will bail out. From an audit on 11/2017, all
+ // instances were real failures. Solves bugs like http://crbug.com/710791.
+ format_context_->error_recognition |= AV_EF_EXPLODE;
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_media_filters_ffmpeg__video__decoder.cc
diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_media_filters_ffmpeg__video__decoder.cc:1.1
--- /dev/null Thu Jun 8 20:38:06 2023
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_media_filters_ffmpeg__video__decoder.cc Thu Jun 8 20:38:06 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_3rdparty_chromium_media_filters_ffmpeg__video__decoder.cc,v 1.1 2023/06/08 20:38:06 markd Exp $
+
+build with ffmpeg5 from archlinux
+
+--- src/3rdparty/chromium/media/filters/ffmpeg_video_decoder.cc.orig 2022-03-30 09:48:18.000000000 +0000
++++ src/3rdparty/chromium/media/filters/ffmpeg_video_decoder.cc
+@@ -391,7 +391,7 @@ bool FFmpegVideoDecoder::ConfigureDecode
+ if (decode_nalus_)
+ codec_context_->flags2 |= AV_CODEC_FLAG2_CHUNKS;
+
+- AVCodec* codec = avcodec_find_decoder(codec_context_->codec_id);
++ const AVCodec* codec = avcodec_find_decoder(codec_context_->codec_id);
+ if (!codec || avcodec_open2(codec_context_.get(), codec, NULL) < 0) {
+ ReleaseFFmpegResources();
+ return false;
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_media_filters_media__file__checker.cc
diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_media_filters_media__file__checker.cc:1.1
--- /dev/null Thu Jun 8 20:38:06 2023
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_media_filters_media__file__checker.cc Thu Jun 8 20:38:06 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_3rdparty_chromium_media_filters_media__file__checker.cc,v 1.1 2023/06/08 20:38:06 markd Exp $
+
+build with ffmpeg5 from archlinux
+
+--- src/3rdparty/chromium/media/filters/media_file_checker.cc.orig 2022-03-30 09:48:18.000000000 +0000
++++ src/3rdparty/chromium/media/filters/media_file_checker.cc
+@@ -68,7 +68,7 @@ bool MediaFileChecker::Start(base::TimeD
+ auto context = AVStreamToAVCodecContext(format_context->streams[i]);
+ if (!context)
+ continue;
+- AVCodec* codec = avcodec_find_decoder(cp->codec_id);
++ const AVCodec* codec = avcodec_find_decoder(cp->codec_id);
+ if (codec && avcodec_open2(context.get(), codec, nullptr) >= 0) {
+ auto loop = std::make_unique<FFmpegDecodingLoop>(context.get());
+ stream_contexts[i] = {std::move(context), std::move(loop)};
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_mojo_public_tools_BUILD.gn
diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_mojo_public_tools_BUILD.gn:1.1
--- /dev/null Thu Jun 8 20:38:06 2023
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_mojo_public_tools_BUILD.gn Thu Jun 8 20:38:06 2023
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_3rdparty_chromium_mojo_public_tools_BUILD.gn,v 1.1 2023/06/08 20:38:06 markd Exp $
+
+build with python3 (remove catapult)
+
+--- src/3rdparty/chromium/mojo/public/tools/BUILD.gn.orig 2022-03-30 09:48:18.000000000 +0000
++++ src/3rdparty/chromium/mojo/public/tools/BUILD.gn
+@@ -14,5 +14,4 @@ group("mojo_python_unittests") {
+ "//testing/xvfb.py",
+ ]
+ deps = [ "//mojo/public/tools/mojom/mojom:tests" ]
+- data_deps = [ "//third_party/catapult/third_party/typ/" ]
+ }
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_mojo_public_tools_bindings_BUILD.gn
diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_mojo_public_tools_bindings_BUILD.gn:1.1
--- /dev/null Thu Jun 8 20:38:06 2023
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_mojo_public_tools_bindings_BUILD.gn Thu Jun 8 20:38:06 2023
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_3rdparty_chromium_mojo_public_tools_bindings_BUILD.gn,v 1.1 2023/06/08 20:38:06 markd Exp $
+
+build with python3
+
+--- src/3rdparty/chromium/mojo/public/tools/bindings/BUILD.gn.orig 2022-03-30 09:48:18.000000000 +0000
++++ src/3rdparty/chromium/mojo/public/tools/bindings/BUILD.gn
+@@ -2,9 +2,11 @@
+ # Use of this source code is governed by a BSD-style license that can be
+ # found in the LICENSE file.
+
++import("//build/config/python.gni")
+ import("//mojo/public/tools/bindings/mojom.gni")
+ import("//third_party/jinja2/jinja2.gni")
+
++# TODO(crbug.com/1194274): Investigate nondeterminism in Py3 builds.
+ action("precompile_templates") {
+ sources = mojom_generator_sources
+ sources += [
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_mojo_public_tools_bindings_gen__data__files__list.py
diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_mojo_public_tools_bindings_gen__data__files__list.py:1.1
--- /dev/null Thu Jun 8 20:38:06 2023
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_mojo_public_tools_bindings_gen__data__files__list.py Thu Jun 8 20:38:06 2023
@@ -0,0 +1,29 @@
+$NetBSD: patch-src_3rdparty_chromium_mojo_public_tools_bindings_gen__data__files__list.py,v 1.1 2023/06/08 20:38:06 markd Exp $
+
+build with python3
+
+--- src/3rdparty/chromium/mojo/public/tools/bindings/gen_data_files_list.py.orig 2022-03-30 09:48:18.000000000 +0000
++++ src/3rdparty/chromium/mojo/public/tools/bindings/gen_data_files_list.py
+@@ -18,7 +18,6 @@ import os
+ import re
+ import sys
+
+-from cStringIO import StringIO
+ from optparse import OptionParser
+
+ sys.path.insert(
+@@ -41,12 +40,9 @@ def main():
+ pattern = re.compile(options.pattern)
+ files = [f for f in os.listdir(options.directory) if pattern.match(f)]
+
+- stream = StringIO()
+- for f in files:
+- print(f, file=stream)
++ contents = '\n'.join(f for f in files) + '\n'
++ WriteFile(contents, options.output)
+
+- WriteFile(stream.getvalue(), options.output)
+- stream.close()
+
+ if __name__ == '__main__':
+ sys.exit(main())
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_mojo_public_tools_bindings_generators_mojom__java__generator.py
diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_mojo_public_tools_bindings_generators_mojom__java__generator.py:1.1
--- /dev/null Thu Jun 8 20:38:06 2023
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_mojo_public_tools_bindings_generators_mojom__java__generator.py Thu Jun 8 20:38:06 2023
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_3rdparty_chromium_mojo_public_tools_bindings_generators_mojom__java__generator.py,v 1.1 2023/06/08 20:38:06 markd Exp $
+
+build with python3
+
+--- src/3rdparty/chromium/mojo/public/tools/bindings/generators/mojom_java_generator.py.orig 2022-03-30 09:48:18.000000000 +0000
++++ src/3rdparty/chromium/mojo/public/tools/bindings/generators/mojom_java_generator.py
+@@ -25,6 +25,10 @@ sys.path.append(os.path.join(os.path.dir
+ 'build', 'android', 'gyp'))
+ from util import build_utils
+
++# TODO(crbug.com/1174969): Remove this once Python2 is obsoleted.
++if sys.version_info.major != 2:
++ basestring = str
++ long = int
+
+ GENERATOR_PREFIX = 'java'
+
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_mojo_public_tools_mojom_mojom_generate_generator.py
diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_mojo_public_tools_mojom_mojom_generate_generator.py:1.1
--- /dev/null Thu Jun 8 20:38:06 2023
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_mojo_public_tools_mojom_mojom_generate_generator.py Thu Jun 8 20:38:06 2023
@@ -0,0 +1,36 @@
+$NetBSD: patch-src_3rdparty_chromium_mojo_public_tools_mojom_mojom_generate_generator.py,v 1.1 2023/06/08 20:38:06 markd Exp $
+
+build with python3
+
+--- src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/generator.py.orig 2022-03-30 09:48:18.000000000 +0000
++++ src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/generator.py
+@@ -136,9 +136,14 @@ class Stylizer(object):
+
+ def WriteFile(contents, full_path):
+ # If |contents| is same with the file content, we skip updating.
++ if not isinstance(contents, bytes):
++ data = contents.encode('utf8')
++ else:
++ data = contents
++
+ if os.path.isfile(full_path):
+ with open(full_path, 'rb') as destination_file:
+- if destination_file.read() == contents:
++ if destination_file.read() == data:
+ return
+
+ # Make sure the containing directory exists.
+@@ -146,11 +151,8 @@ def WriteFile(contents, full_path):
+ fileutil.EnsureDirectoryExists(full_dir)
+
+ # Dump the data to disk.
+- with open(full_path, "wb") as f:
+- if not isinstance(contents, bytes):
+- f.write(contents.encode('utf-8'))
+- else:
+- f.write(contents)
++ with open(full_path, 'wb') as f:
++ f.write(data)
+
+
+ def AddComputedData(module):
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_mojo_public_tools_mojom_mojom_generate_module.py
diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_mojo_public_tools_mojom_mojom_generate_module.py:1.1
--- /dev/null Thu Jun 8 20:38:06 2023
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_mojo_public_tools_mojom_mojom_generate_module.py Thu Jun 8 20:38:06 2023
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_3rdparty_chromium_mojo_public_tools_mojom_mojom_generate_module.py,v 1.1 2023/06/08 20:38:06 markd Exp $
+
+build with python3
+
+--- src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/module.py.orig 2022-03-30 09:48:18.000000000 +0000
++++ src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/module.py
+@@ -398,7 +398,8 @@ class Field(object):
+
+
+ class StructField(Field):
+- pass
++ def __hash__(self):
++ return super(Field, self).__hash__()
+
+
+ class UnionField(Field):
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_mojo_public_tools_mojom_mojom_generate_template__expander.py
diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_mojo_public_tools_mojom_mojom_generate_template__expander.py:1.1
--- /dev/null Thu Jun 8 20:38:06 2023
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_mojo_public_tools_mojom_mojom_generate_template__expander.py Thu Jun 8 20:38:06 2023
@@ -0,0 +1,22 @@
+$NetBSD: patch-src_3rdparty_chromium_mojo_public_tools_mojom_mojom_generate_template__expander.py,v 1.1 2023/06/08 20:38:06 markd Exp $
+
+build with python3
+
+--- src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/template_expander.py.orig 2022-03-30 09:48:18.000000000 +0000
++++ src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/template_expander.py
+@@ -75,9 +75,9 @@ def PrecompileTemplates(generator_module
+ os.path.dirname(module.__file__), generator.GetTemplatePrefix())
+ ]))
+ jinja_env.filters.update(generator.GetFilters())
+- jinja_env.compile_templates(
+- os.path.join(output_dir, "%s.zip" % generator.GetTemplatePrefix()),
+- extensions=["tmpl"],
+- zip="stored",
+- py_compile=True,
+- ignore_errors=False)
++ jinja_env.compile_templates(os.path.join(
++ output_dir, "%s.zip" % generator.GetTemplatePrefix()),
++ extensions=["tmpl"],
++ zip="stored",
++ py_compile=sys.version_info.major < 3,
++ ignore_errors=False)
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_testing_BUILD.gn
diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_testing_BUILD.gn:1.1
--- /dev/null Thu Jun 8 20:38:06 2023
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_testing_BUILD.gn Thu Jun 8 20:38:06 2023
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_3rdparty_chromium_testing_BUILD.gn,v 1.1 2023/06/08 20:38:06 markd Exp $
+
+build with python3 (remove catapult)
+
+--- src/3rdparty/chromium/testing/BUILD.gn.orig 2022-03-30 09:48:18.000000000 +0000
++++ src/3rdparty/chromium/testing/BUILD.gn
+@@ -27,7 +27,6 @@ group("run_perf_test") {
+
+ data_deps = [
+ ":test_scripts_shared",
+- "//third_party/catapult/tracing:convert_chart_json",
+ ]
+
+ if (is_android) {
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_bind__gen_blink__v8__bridge.py
diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_bind__gen_blink__v8__bridge.py:1.1
--- /dev/null Thu Jun 8 20:38:06 2023
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_bind__gen_blink__v8__bridge.py Thu Jun 8 20:38:06 2023
@@ -0,0 +1,33 @@
+$NetBSD: patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_bind__gen_blink__v8__bridge.py,v 1.1 2023/06/08 20:38:06 markd Exp $
+
+build with python3
+
+--- src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/blink_v8_bridge.py.orig 2022-03-30 09:48:18.000000000 +0000
++++ src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/blink_v8_bridge.py
+@@ -344,7 +344,7 @@ def make_default_value_expr(idl_type, de
+ """
+ assert default_value.is_type_compatible_with(idl_type)
+
+- class DefaultValueExpr:
++ class DefaultValueExpr(object):
+ _ALLOWED_SYMBOLS_IN_DEPS = ("isolate")
+
+ def __init__(self, initializer_expr, initializer_deps,
+@@ -502,7 +502,7 @@ def make_v8_to_blink_value(blink_var_nam
+ assert isinstance(blink_var_name, str)
+ assert isinstance(v8_value_expr, str)
+ assert isinstance(idl_type, web_idl.IdlType)
+- assert (argument_index is None or isinstance(argument_index, (int, long)))
++ assert (argument_index is None or isinstance(argument_index, int))
+ assert (default_value is None
+ or isinstance(default_value, web_idl.LiteralConstant))
+
+@@ -622,7 +622,7 @@ def make_v8_to_blink_value_variadic(blin
+ """
+ assert isinstance(blink_var_name, str)
+ assert isinstance(v8_array, str)
+- assert isinstance(v8_array_start_index, (int, long))
++ assert isinstance(v8_array_start_index, int)
+ assert isinstance(idl_type, web_idl.IdlType)
+
+ pattern = ("auto&& ${{{_1}}} = "
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_bind__gen_callback__interface.py
diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_bind__gen_callback__interface.py:1.1
--- /dev/null Thu Jun 8 20:38:06 2023
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_bind__gen_callback__interface.py Thu Jun 8 20:38:06 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_bind__gen_callback__interface.py,v 1.1 2023/06/08 20:38:06 markd Exp $
+
+build with python3
+
+--- src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/callback_interface.py.orig 2022-03-30 09:48:18.000000000 +0000
++++ src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/callback_interface.py
+@@ -177,7 +177,7 @@ def generate_callback_interface(callback
+ prop_install_mode=PropInstallMode.UNCONDITIONAL,
+ trampoline_var_name=None,
+ attribute_entries=[],
+- constant_entries=filter(is_unconditional, constant_entries),
++ constant_entries=list(filter(is_unconditional, constant_entries)),
+ exposed_construct_entries=[],
+ operation_entries=[])
+ (install_interface_template_decl, install_interface_template_def,
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_bind__gen_code__node.py
diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_bind__gen_code__node.py:1.1
--- /dev/null Thu Jun 8 20:38:06 2023
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_bind__gen_code__node.py Thu Jun 8 20:38:06 2023
@@ -0,0 +1,41 @@
+$NetBSD: patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_bind__gen_code__node.py,v 1.1 2023/06/08 20:38:06 markd Exp $
+
+build with python3
+
+--- src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/code_node.py.orig 2022-03-30 09:48:18.000000000 +0000
++++ src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/code_node.py
+@@ -503,13 +503,13 @@ class CompositeNode(CodeNode):
+ gensym_kwargs = {}
+ template_vars = {}
+ for arg in args:
+- assert isinstance(arg, (CodeNode, int, long, str))
++ assert isinstance(arg, (CodeNode, int, str))
+ gensym = CodeNode.gensym()
+ gensym_args.append("${{{}}}".format(gensym))
+ template_vars[gensym] = arg
+ for key, value in kwargs.items():
+- assert isinstance(key, (int, long, str))
+- assert isinstance(value, (CodeNode, int, long, str))
++ assert isinstance(key, (int, str))
++ assert isinstance(value, (CodeNode, int, str))
+ gensym = CodeNode.gensym()
+ gensym_kwargs[key] = "${{{}}}".format(gensym)
+ template_vars[gensym] = value
+@@ -602,7 +602,7 @@ class ListNode(CodeNode):
+ def insert(self, index, node):
+ if node is None:
+ return
+- assert isinstance(index, (int, long))
++ assert isinstance(index, int)
+ assert isinstance(node, CodeNode)
+ assert node.outer is None and node.prev is None
+
+@@ -721,7 +721,7 @@ class SymbolScopeNode(SequenceNode):
+ if not scope_chains:
+ return counts
+
+- self_index = iter(scope_chains).next().index(self)
++ self_index = next(iter(scope_chains)).index(self)
+ scope_chains = map(
+ lambda scope_chain: scope_chain[self_index + 1:], scope_chains)
+ scope_to_likeliness = {}
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_bind__gen_codegen__expr.py
diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_bind__gen_codegen__expr.py:1.1
--- /dev/null Thu Jun 8 20:38:06 2023
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_bind__gen_codegen__expr.py Thu Jun 8 20:38:06 2023
@@ -0,0 +1,49 @@
+$NetBSD: patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_bind__gen_codegen__expr.py,v 1.1 2023/06/08 20:38:06 markd Exp $
+
+build with python3
+
+--- src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_expr.py.orig 2022-03-30 09:48:18.000000000 +0000
++++ src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_expr.py
+@@ -109,7 +109,7 @@ def expr_and(terms):
+
+ if any(term.is_always_false for term in terms):
+ return _Expr(False)
+- terms = filter(lambda x: not x.is_always_true, terms)
++ terms = list(filter(lambda x: not x.is_always_true, terms))
+ if not terms:
+ return _Expr(True)
+ if len(terms) == 1:
+@@ -124,7 +124,7 @@ def expr_or(terms):
+
+ if any(term.is_always_true for term in terms):
+ return _Expr(True)
+- terms = filter(lambda x: not x.is_always_false, terms)
++ terms = list(filter(lambda x: not x.is_always_false, terms))
+ if not terms:
+ return _Expr(False)
+ if len(terms) == 1:
+@@ -222,7 +222,7 @@ def expr_from_exposure(exposure,
+ elif exposure.only_in_secure_contexts is False:
+ secure_context_term = _Expr(True)
+ else:
+- terms = map(ref_enabled, exposure.only_in_secure_contexts)
++ terms = list(map(ref_enabled, exposure.only_in_secure_contexts))
+ secure_context_term = expr_or(
+ [_Expr("${is_in_secure_context}"),
+ expr_not(expr_and(terms))])
+@@ -275,10 +275,11 @@ def expr_from_exposure(exposure,
+
+ # [ContextEnabled]
+ if exposure.context_enabled_features:
+- terms = map(
+- lambda feature: _Expr(
+- "${{context_feature_settings}}->is{}Enabled()".format(
+- feature)), exposure.context_enabled_features)
++ terms = list(
++ map(
++ lambda feature: _Expr(
++ "${{context_feature_settings}}->is{}Enabled()".format(
++ feature)), exposure.context_enabled_features))
+ context_enabled_terms.append(
+ expr_and([_Expr("${context_feature_settings}"),
+ expr_or(terms)]))
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_bind__gen_codegen__format.py
diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_bind__gen_codegen__format.py:1.1
--- /dev/null Thu Jun 8 20:38:06 2023
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_bind__gen_codegen__format.py Thu Jun 8 20:38:06 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_bind__gen_codegen__format.py,v 1.1 2023/06/08 20:38:06 markd Exp $
+
+build with python3
+
+--- src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_format.py.orig 2022-03-30 09:48:18.000000000 +0000
++++ src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_format.py
+@@ -23,7 +23,7 @@ class _TemplateFormatter(string.Formatte
+ self._template_formatter_indexing_count_ = 0
+
+ def get_value(self, key, args, kwargs):
+- if isinstance(key, (int, long)):
++ if isinstance(key, int):
+ return args[key]
+ assert isinstance(key, str)
+ if not key:
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_bind__gen_codegen__utils.py
diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_bind__gen_codegen__utils.py:1.1
--- /dev/null Thu Jun 8 20:38:06 2023
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_bind__gen_codegen__utils.py Thu Jun 8 20:38:06 2023
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_bind__gen_codegen__utils.py,v 1.1 2023/06/08 20:38:06 markd Exp $
+
+build with python3
+
+--- src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_utils.py.orig 2022-03-30 09:48:18.000000000 +0000
++++ src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_utils.py
+@@ -116,4 +116,4 @@ def write_code_node_to_file(code_node, f
+ # stderr=format_result.error_message))
+ #
+ # web_idl.file_io.write_to_file_if_changed(filepath, format_result.contents)
+- web_idl.file_io.write_to_file_if_changed(filepath, rendered_text)
++ web_idl.file_io.write_to_file_if_changed(filepath, rendered_text.encode('utf-8'))
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_bind__gen_dictionary.py
diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_bind__gen_dictionary.py:1.1
--- /dev/null Thu Jun 8 20:38:06 2023
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_bind__gen_dictionary.py Thu Jun 8 20:38:06 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_bind__gen_dictionary.py,v 1.1 2023/06/08 20:38:06 markd Exp $
+
+build with python3
+
+--- src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/dictionary.py.orig 2022-03-30 09:48:18.000000000 +0000
++++ src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/dictionary.py
+@@ -993,7 +993,7 @@ def make_dict_trace_func(cg_context):
+ _2 = _blink_member_name(member).value_var
+ return TextNode(_format(pattern, _1=_1, _2=_2))
+
+- body.extend(map(make_trace_member_node, own_members))
++ body.extend(list(map(make_trace_member_node, own_members)))
+ body.append(TextNode("BaseClass::Trace(visitor);"))
+
+ return func_decl, func_def
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_bind__gen_interface.py
diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_bind__gen_interface.py:1.1
--- /dev/null Thu Jun 8 20:38:06 2023
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_bind__gen_interface.py Thu Jun 8 20:38:06 2023
@@ -0,0 +1,179 @@
+$NetBSD: patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_bind__gen_interface.py,v 1.1 2023/06/08 20:38:06 markd Exp $
+
+build with python3
+
+--- src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py.orig 2022-03-30 09:48:18.000000000 +0000
++++ src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py
+@@ -582,7 +582,7 @@ def _make_blink_api_call(code_node,
+ overriding_args=None):
+ assert isinstance(code_node, SymbolScopeNode)
+ assert isinstance(cg_context, CodeGenContext)
+- assert num_of_args is None or isinstance(num_of_args, (int, long))
++ assert num_of_args is None or isinstance(num_of_args, int)
+ assert (overriding_args is None
+ or (isinstance(overriding_args, (list, tuple))
+ and all(isinstance(arg, str) for arg in overriding_args)))
+@@ -1196,8 +1196,10 @@ def make_overload_dispatcher(cg_context)
+ did_use_break = did_use_break or can_fail
+
+ conditional = expr_or(
+- map(lambda item: expr_from_exposure(item.function_like.exposure),
+- items))
++ list(
++ map(
++ lambda item: expr_from_exposure(item.function_like.exposure
++ ), items)))
+ if not conditional.is_always_true:
+ node = CxxUnlikelyIfNode(cond=conditional, body=node)
+
+@@ -4642,7 +4644,7 @@ class _PropEntryConstructorGroup(_PropEn
+ def __init__(self, is_context_dependent, exposure_conditional, world,
+ constructor_group, ctor_callback_name, ctor_func_length):
+ assert isinstance(ctor_callback_name, str)
+- assert isinstance(ctor_func_length, (int, long))
++ assert isinstance(ctor_func_length, int)
+
+ _PropEntryBase.__init__(self, is_context_dependent,
+ exposure_conditional, world, constructor_group)
+@@ -4670,7 +4672,7 @@ class _PropEntryOperationGroup(_PropEntr
+ op_func_length,
+ no_alloc_direct_callback_name=None):
+ assert isinstance(op_callback_name, str)
+- assert isinstance(op_func_length, (int, long))
++ assert isinstance(op_func_length, int)
+
+ _PropEntryBase.__init__(self, is_context_dependent,
+ exposure_conditional, world, operation_group)
+@@ -5175,9 +5177,9 @@ def make_install_interface_template(cg_c
+ ])
+
+ if class_like.identifier == "CSSStyleDeclaration":
+- css_properties = filter(
+- lambda attr: "CSSProperty" in attr.extended_attributes,
+- class_like.attributes)
++ css_properties = list(
++ filter(lambda attr: "CSSProperty" in attr.extended_attributes,
++ class_like.attributes))
+ if css_properties:
+ prop_name_list = "".join(
+ map(lambda attr: "\"{}\", ".format(attr.identifier),
+@@ -5567,8 +5569,8 @@ ${instance_object} = ${v8_context}->Glob
+ "V8DOMConfiguration::InstallConstants(${isolate}, "
+ "${interface_template}, ${prototype_template}, "
+ "kConstantCallbackTable, base::size(kConstantCallbackTable));")
+- constant_callback_entries = filter(lambda entry: entry.const_callback_name,
+- constant_entries)
++ constant_callback_entries = list(filter(lambda entry: entry.const_callback_name,
++ constant_entries))
+ install_properties(table_name, constant_callback_entries,
+ _make_constant_callback_registration_table,
+ installer_call_text)
+@@ -5584,8 +5586,8 @@ ${instance_object} = ${v8_context}->Glob
+ "V8DOMConfiguration::InstallConstants(${isolate}, "
+ "${interface_template}, ${prototype_template}, "
+ "kConstantValueTable, base::size(kConstantValueTable));")
+- constant_value_entries = filter(
+- lambda entry: not entry.const_callback_name, constant_entries)
++ constant_value_entries = list(filter(
++ lambda entry: not entry.const_callback_name, constant_entries))
+ install_properties(table_name, constant_value_entries,
+ _make_constant_value_registration_table,
+ installer_call_text)
+@@ -6336,8 +6338,8 @@ def make_v8_context_snapshot_api(cg_cont
+ assert isinstance(component, web_idl.Component)
+
+ derived_interfaces = cg_context.interface.deriveds
+- derived_names = map(lambda interface: interface.identifier,
+- derived_interfaces)
++ derived_names = list(
++ map(lambda interface: interface.identifier, derived_interfaces))
+ derived_names.append(cg_context.interface.identifier)
+ if not ("Window" in derived_names or "HTMLDocument" in derived_names):
+ return None, None
+@@ -6411,9 +6413,11 @@ def _make_v8_context_snapshot_get_refere
+ collect_callbacks(named_properties_object_callback_defs)
+ collect_callbacks(cross_origin_property_callback_defs)
+
+- entry_nodes = map(
+- lambda name: TextNode("reinterpret_cast<intptr_t>({}),".format(name)),
+- filter(None, callback_names))
++ entry_nodes = list(
++ map(
++ lambda name: TextNode("reinterpret_cast<intptr_t>({}),".format(name
++ )),
++ filter(None, callback_names)))
+ table_node = ListNode([
+ TextNode("using namespace ${class_name}Callbacks;"),
+ TextNode("static const intptr_t kReferenceTable[] = {"),
+@@ -6451,10 +6455,11 @@ def _make_v8_context_snapshot_install_pr
+ class_name=None,
+ prop_install_mode=PropInstallMode.V8_CONTEXT_SNAPSHOT,
+ trampoline_var_name=None,
+- attribute_entries=filter(selector, attribute_entries),
+- constant_entries=filter(selector, constant_entries),
+- exposed_construct_entries=filter(selector, exposed_construct_entries),
+- operation_entries=filter(selector, operation_entries))
++ attribute_entries=list(filter(selector, attribute_entries)),
++ constant_entries=list(filter(selector, constant_entries)),
++ exposed_construct_entries=list(
++ filter(selector, exposed_construct_entries)),
++ operation_entries=list(filter(selector, operation_entries)))
+
+ return func_decl, func_def
+
+@@ -6810,11 +6815,11 @@ def generate_interface(interface_identif
+ class_name=impl_class_name,
+ prop_install_mode=PropInstallMode.UNCONDITIONAL,
+ trampoline_var_name=tp_install_unconditional_props,
+- attribute_entries=filter(is_unconditional, attribute_entries),
+- constant_entries=filter(is_unconditional, constant_entries),
+- exposed_construct_entries=filter(is_unconditional,
+- exposed_construct_entries),
+- operation_entries=filter(is_unconditional, operation_entries))
++ attribute_entries=list(filter(is_unconditional, attribute_entries)),
++ constant_entries=list(filter(is_unconditional, constant_entries)),
++ exposed_construct_entries=list(
++ filter(is_unconditional, exposed_construct_entries)),
++ operation_entries=list(filter(is_unconditional, operation_entries)))
+ (install_context_independent_props_decl,
+ install_context_independent_props_def,
+ install_context_independent_props_trampoline) = make_install_properties(
+@@ -6823,11 +6828,14 @@ def generate_interface(interface_identif
+ class_name=impl_class_name,
+ prop_install_mode=PropInstallMode.CONTEXT_INDEPENDENT,
+ trampoline_var_name=tp_install_context_independent_props,
+- attribute_entries=filter(is_context_independent, attribute_entries),
+- constant_entries=filter(is_context_independent, constant_entries),
+- exposed_construct_entries=filter(is_context_independent,
+- exposed_construct_entries),
+- operation_entries=filter(is_context_independent, operation_entries))
++ attribute_entries=list(
++ filter(is_context_independent, attribute_entries)),
++ constant_entries=list(filter(is_context_independent,
++ constant_entries)),
++ exposed_construct_entries=list(
++ filter(is_context_independent, exposed_construct_entries)),
++ operation_entries=list(
++ filter(is_context_independent, operation_entries)))
+ (install_context_dependent_props_decl, install_context_dependent_props_def,
+ install_context_dependent_props_trampoline) = make_install_properties(
+ cg_context,
+@@ -6835,11 +6843,13 @@ def generate_interface(interface_identif
+ class_name=impl_class_name,
+ prop_install_mode=PropInstallMode.CONTEXT_DEPENDENT,
+ trampoline_var_name=tp_install_context_dependent_props,
+- attribute_entries=filter(is_context_dependent, attribute_entries),
+- constant_entries=filter(is_context_dependent, constant_entries),
+- exposed_construct_entries=filter(is_context_dependent,
+- exposed_construct_entries),
+- operation_entries=filter(is_context_dependent, operation_entries))
++ attribute_entries=list(filter(is_context_dependent,
++ attribute_entries)),
++ constant_entries=list(filter(is_context_dependent, constant_entries)),
++ exposed_construct_entries=list(
++ filter(is_context_dependent, exposed_construct_entries)),
++ operation_entries=list(filter(is_context_dependent,
++ operation_entries)))
+ (install_interface_template_decl, install_interface_template_def,
+ install_interface_template_trampoline) = make_install_interface_template(
+ cg_context,
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_bind__gen_mako__renderer.py
diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_bind__gen_mako__renderer.py:1.1
--- /dev/null Thu Jun 8 20:38:06 2023
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_bind__gen_mako__renderer.py Thu Jun 8 20:38:06 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_bind__gen_mako__renderer.py,v 1.1 2023/06/08 20:38:06 markd Exp $
+
+build with python3
+
+--- src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/mako_renderer.py.orig 2022-03-30 09:48:18.000000000 +0000
++++ src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/mako_renderer.py
+@@ -105,7 +105,7 @@ class MakoRenderer(object):
+ on_error = self._caller_stack_on_error
+ if (len(current) <= len(on_error)
+ and all(current[i] == on_error[i]
+- for i in xrange(len(current)))):
++ for i in range(len(current)))):
+ pass # Error happened in a deeper caller.
+ else:
+ self._caller_stack_on_error = list(self._caller_stack)
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_bind__gen_task__queue.py
diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_bind__gen_task__queue.py:1.1
--- /dev/null Thu Jun 8 20:38:06 2023
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_bind__gen_task__queue.py Thu Jun 8 20:38:06 2023
@@ -0,0 +1,29 @@
+$NetBSD: patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_bind__gen_task__queue.py,v 1.1 2023/06/08 20:38:06 markd Exp $
+
+build with python3
+
+--- src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/task_queue.py.orig 2022-03-30 09:48:18.000000000 +0000
++++ src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/task_queue.py
+@@ -2,6 +2,7 @@
+ # Use of this source code is governed by a BSD-style license that can be
+ # found in the LICENSE file.
+
++import functools
+ import multiprocessing
+
+ from .package_initializer import package_initializer
+@@ -76,7 +77,7 @@ class TaskQueue(object):
+ if not report_progress:
+ return
+
+- done_count = reduce(
++ done_count = functools.reduce(
+ lambda count, worker_task: count + bool(worker_task.ready()),
+ self._worker_tasks, 0)
+ report_progress(len(self._worker_tasks), done_count)
+@@ -85,4 +86,4 @@ class TaskQueue(object):
+ def _task_queue_run_tasks(tasks):
+ for task in tasks:
+ func, args, kwargs = task
+- apply(func, args, kwargs)
++ func(*args, **kwargs)
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_code__generator.py
diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_code__generator.py:1.1
--- /dev/null Thu Jun 8 20:38:06 2023
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_code__generator.py Thu Jun 8 20:38:06 2023
@@ -0,0 +1,44 @@
+$NetBSD: patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_code__generator.py,v 1.1 2023/06/08 20:38:06 markd Exp $
+
+build with python3
+
+--- src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/code_generator.py.orig 2022-03-30 09:48:18.000000000 +0000
++++ src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/code_generator.py
+@@ -13,6 +13,7 @@ import re
+ import sys
+
+ from idl_types import set_ancestors, IdlType
++from itertools import groupby
+ from v8_globals import includes
+ from v8_interface import constant_filters
+ from v8_types import set_component_dirs
+@@ -43,6 +44,7 @@ TEMPLATES_DIR = os.path.normpath(
+ # after path[0] == invoking script dir
+ sys.path.insert(1, THIRD_PARTY_DIR)
+ import jinja2
++from jinja2.filters import make_attrgetter, environmentfilter
+
+
+ def generate_indented_conditional(code, conditional):
+@@ -88,6 +90,13 @@ def runtime_enabled_if(code, name):
+ return generate_indented_conditional(code, function)
+
+
++@environmentfilter
++def do_stringify_key_group_by(environment, value, attribute):
++ expr = make_attrgetter(environment, attribute)
++ key = lambda item: '' if expr(item) is None else str(expr(item))
++ return groupby(sorted(value, key=key), expr)
++
++
+ def initialize_jinja_env(cache_dir):
+ jinja_env = jinja2.Environment(
+ loader=jinja2.FileSystemLoader(TEMPLATES_DIR),
+@@ -117,6 +126,7 @@ def initialize_jinja_env(cache_dir):
+ })
+ jinja_env.filters.update(constant_filters())
+ jinja_env.filters.update(method_filters())
++ jinja_env.filters["stringifykeygroupby"] = do_stringify_key_group_by
+ return jinja_env
+
+
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_generate__origin__trial__features.py
diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_generate__origin__trial__features.py:1.1
--- /dev/null Thu Jun 8 20:38:06 2023
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_generate__origin__trial__features.py Thu Jun 8 20:38:06 2023
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_generate__origin__trial__features.py,v 1.1 2023/06/08 20:38:06 markd Exp $
+
+build with python3
+
+--- src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/generate_origin_trial_features.py.orig 2022-03-30 09:48:18.000000000 +0000
++++ src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/generate_origin_trial_features.py
+@@ -80,7 +80,7 @@ def read_idl_file(reader, idl_filename):
+ assert len(interfaces) == 1, (
+ "Expected one interface in file %r, found %d" %
+ (idl_filename, len(interfaces)))
+- return (interfaces.values()[0], includes)
++ return (list(interfaces.values())[0], includes)
+
+
+ def interface_is_global(interface):
+@@ -281,7 +281,7 @@ def main():
+
+ info_provider = create_component_info_provider(
+ os.path.normpath(options.info_dir), options.target_component)
+- idl_filenames = map(str.strip, open(options.idl_files_list))
++ idl_filenames = list(map(str.strip, open(options.idl_files_list)))
+
+ generate_origin_trial_features(info_provider, options, idl_filenames)
+ return 0
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_idl__definitions.py
diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_idl__definitions.py:1.1
--- /dev/null Thu Jun 8 20:38:06 2023
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_idl__definitions.py Thu Jun 8 20:38:06 2023
@@ -0,0 +1,35 @@
+$NetBSD: patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_idl__definitions.py,v 1.1 2023/06/08 20:38:06 markd Exp $
+
+build with python3
+
+--- src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/idl_definitions.py.orig 2022-03-30 09:48:18.000000000 +0000
++++ src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/idl_definitions.py
+@@ -394,7 +394,8 @@ class IdlInterface(object):
+ else:
+ raise ValueError('Unrecognized node class: %s' % child_class)
+
+- if len(filter(None, [self.iterable, self.maplike, self.setlike])) > 1:
++ if len(list(filter(None,
++ [self.iterable, self.maplike, self.setlike]))) > 1:
+ raise ValueError(
+ 'Interface can only have one of iterable<>, maplike<> and setlike<>.'
+ )
+@@ -512,6 +513,9 @@ class IdlAttribute(TypedObject):
+ def accept(self, visitor):
+ visitor.visit_attribute(self)
+
++ def __lt__(self, other):
++ return self.name < other.name
++
+
+ ################################################################################
+ # Constants
+@@ -852,7 +856,7 @@ class IdlIncludes(object):
+ ################################################################################
+
+
+-class Exposure:
++class Exposure(object):
+ """An Exposure holds one Exposed or RuntimeEnabled condition.
+ Each exposure has two properties: exposed and runtime_enabled.
+ Exposure(e, r) corresponds to [Exposed(e r)]. Exposure(e) corresponds to
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_idl__reader.py
diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_idl__reader.py:1.1
--- /dev/null Thu Jun 8 20:38:06 2023
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_idl__reader.py Thu Jun 8 20:38:06 2023
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_idl__reader.py,v 1.1 2023/06/08 20:38:06 markd Exp $
+
+build with python3
+
+--- src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/idl_reader.py.orig 2022-03-30 09:48:18.000000000 +0000
++++ src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/idl_reader.py
+@@ -55,8 +55,8 @@ def validate_blink_idl_definitions(idl_f
+ definitions. There is no filename convention in this case.
+ - Otherwise, an IDL file is invalid.
+ """
+- targets = (
+- definitions.interfaces.values() + definitions.dictionaries.values())
++ targets = (list(definitions.interfaces.values()) +
++ list(definitions.dictionaries.values()))
+ number_of_targets = len(targets)
+ if number_of_targets > 1:
+ raise Exception(
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_idl__types.py
diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_idl__types.py:1.1
--- /dev/null Thu Jun 8 20:38:06 2023
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_idl__types.py Thu Jun 8 20:38:06 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_idl__types.py,v 1.1 2023/06/08 20:38:06 markd Exp $
+
+build with python3
+
+--- src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/idl_types.py.orig 2022-03-30 09:48:18.000000000 +0000
++++ src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/idl_types.py
+@@ -349,7 +349,7 @@ class IdlUnionType(IdlTypeBase):
+ return True
+
+ def single_matching_member_type(self, predicate):
+- matching_types = filter(predicate, self.flattened_member_types)
++ matching_types = list(filter(predicate, self.flattened_member_types))
+ if len(matching_types) > 1:
+ raise ValueError('%s is ambiguous.' % self.name)
+ return matching_types[0] if matching_types else None
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_utilities.py
diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_utilities.py:1.1
--- /dev/null Thu Jun 8 20:38:06 2023
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_utilities.py Thu Jun 8 20:38:06 2023
@@ -0,0 +1,69 @@
+$NetBSD: patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_utilities.py,v 1.1 2023/06/08 20:38:06 markd Exp $
+
+build with python3
+
+--- src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/utilities.py.orig 2022-03-30 09:48:18.000000000 +0000
++++ src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/utilities.py
+@@ -196,8 +196,9 @@ class ComponentInfoProviderModules(Compo
+
+ @property
+ def callback_functions(self):
+- return dict(self._component_info_core['callback_functions'].items() +
+- self._component_info_modules['callback_functions'].items())
++ return dict(
++ list(self._component_info_core['callback_functions'].items()) +
++ list(self._component_info_modules['callback_functions'].items()))
+
+ @property
+ def specifier_for_export(self):
+@@ -209,8 +210,8 @@ class ComponentInfoProviderModules(Compo
+
+
+ def load_interfaces_info_overall_pickle(info_dir):
+- with open(os.path.join(info_dir,
+- 'interfaces_info.pickle')) as interface_info_file:
++ with open(os.path.join(info_dir, 'interfaces_info.pickle'),
++ mode='rb') as interface_info_file:
+ return pickle.load(interface_info_file)
+
+
+@@ -236,23 +237,20 @@ def merge_dict_recursively(target, diff)
+
+ def create_component_info_provider_core(info_dir):
+ interfaces_info = load_interfaces_info_overall_pickle(info_dir)
+- with open(
+- os.path.join(info_dir, 'core',
+- 'component_info_core.pickle')) as component_info_file:
++ with open(os.path.join(info_dir, 'core', 'component_info_core.pickle'),
++ mode='rb') as component_info_file:
+ component_info = pickle.load(component_info_file)
+ return ComponentInfoProviderCore(interfaces_info, component_info)
+
+
+ def create_component_info_provider_modules(info_dir):
+ interfaces_info = load_interfaces_info_overall_pickle(info_dir)
+- with open(
+- os.path.join(info_dir, 'core',
+- 'component_info_core.pickle')) as component_info_file:
++ with open(os.path.join(info_dir, 'core', 'component_info_core.pickle'),
++ mode='rb') as component_info_file:
+ component_info_core = pickle.load(component_info_file)
+- with open(
+- os.path.join(
+- info_dir, 'modules',
+- 'component_info_modules.pickle')) as component_info_file:
++ with open(os.path.join(info_dir, 'modules',
++ 'component_info_modules.pickle'),
++ mode='rb') as component_info_file:
+ component_info_modules = pickle.load(component_info_file)
+ return ComponentInfoProviderModules(interfaces_info, component_info_core,
+ component_info_modules)
+@@ -356,7 +354,7 @@ def write_pickle_file(pickle_filename, d
+ pickle_filename = abs(pickle_filename)
+ # If |data| is same with the file content, we skip updating.
+ if os.path.isfile(pickle_filename):
+- with open(pickle_filename) as pickle_file:
++ with open(pickle_filename, 'rb') as pickle_file:
+ try:
+ if pickle.load(pickle_file) == data:
+ return
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_v8__interface.py
diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_v8__interface.py:1.1
--- /dev/null Thu Jun 8 20:38:06 2023
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_v8__interface.py Thu Jun 8 20:38:06 2023
@@ -0,0 +1,37 @@
+$NetBSD: patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_v8__interface.py,v 1.1 2023/06/08 20:38:06 markd Exp $
+
+build with python3
+
+--- src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/v8_interface.py.orig 2022-03-30 09:48:18.000000000 +0000
++++ src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/v8_interface.py
+@@ -189,7 +189,7 @@ def context_enabled_features(attributes)
+ return sorted([
+ member for member in members
+ if member.get(KEY) and not member.get('exposed_test')
+- ])
++ ], key=lambda item: item['name'])
+
+ def member_filter_by_name(members, name):
+ return [member for member in members if member[KEY] == name]
+@@ -612,7 +612,8 @@ def interface_context(interface, interfa
+ sorted(
+ origin_trial_features(interface, context['constants'],
+ context['attributes'], context['methods']) +
+- context_enabled_features(context['attributes'])),
++ context_enabled_features(context['attributes']),
++ key=lambda item: item['name']),
+ })
+ if context['optional_features']:
+ includes.add('platform/bindings/v8_per_context_data.h')
+@@ -1356,9 +1357,9 @@ def resolution_tests_methods(effective_o
+
+ # Extract argument and IDL type to simplify accessing these in each loop.
+ arguments = [method['arguments'][index] for method in methods]
+- arguments_methods = zip(arguments, methods)
++ arguments_methods = list(zip(arguments, methods))
+ idl_types = [argument['idl_type_object'] for argument in arguments]
+- idl_types_methods = zip(idl_types, methods)
++ idl_types_methods = list(zip(idl_types, methods))
+
+ # We can’t do a single loop through all methods or simply sort them, because
+ # a method may be listed in multiple steps of the resolution algorithm, and
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_v8__methods.py
diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_v8__methods.py:1.1
--- /dev/null Thu Jun 8 20:38:06 2023
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_v8__methods.py Thu Jun 8 20:38:06 2023
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_v8__methods.py,v 1.1 2023/06/08 20:38:06 markd Exp $
+
+build with python3
+
+--- src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/v8_methods.py.orig 2022-03-30 09:48:18.000000000 +0000
++++ src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/v8_methods.py
+@@ -46,6 +46,10 @@ import v8_types
+ import v8_utilities
+ from v8_utilities import (has_extended_attribute_value, is_unforgeable)
+
++# TODO: Remove this once Python2 is obsoleted.
++if sys.version_info.major != 2:
++ basestring = str
++
+
+ def method_is_visible(method, interface_is_partial):
+ if 'overloads' in method:
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_v8__utilities.py
diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_v8__utilities.py:1.1
--- /dev/null Thu Jun 8 20:38:06 2023
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_v8__utilities.py Thu Jun 8 20:38:06 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_v8__utilities.py,v 1.1 2023/06/08 20:38:06 markd Exp $
+
+build with python3
+
+--- src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/v8_utilities.py.orig 2022-03-30 09:48:18.000000000 +0000
++++ src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/v8_utilities.py
+@@ -271,7 +271,7 @@ EXPOSED_WORKERS = set([
+ ])
+
+
+-class ExposureSet:
++class ExposureSet(object):
+ """An ExposureSet is a collection of Exposure instructions."""
+
+ def __init__(self, exposures=None):
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_web__idl_callback__interface.py
diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_web__idl_callback__interface.py:1.1
--- /dev/null Thu Jun 8 20:38:06 2023
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_web__idl_callback__interface.py Thu Jun 8 20:38:06 2023
@@ -0,0 +1,25 @@
+$NetBSD: patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_web__idl_callback__interface.py,v 1.1 2023/06/08 20:38:06 markd Exp $
+
+build with python3
+
+--- src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/web_idl/callback_interface.py.orig 2022-03-30 09:48:18.000000000 +0000
++++ src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/web_idl/callback_interface.py
+@@ -91,11 +91,13 @@ class CallbackInterface(UserDefinedType,
+ for operation_ir in ir.operations
+ ])
+ self._operation_groups = tuple([
+- OperationGroup(
+- operation_group_ir,
+- filter(lambda x: x.identifier == operation_group_ir.identifier,
+- self._operations),
+- owner=self) for operation_group_ir in ir.operation_groups
++ OperationGroup(operation_group_ir,
++ list(
++ filter(
++ lambda x: x.identifier == operation_group_ir
++ .identifier, self._operations)),
++ owner=self)
++ for operation_group_ir in ir.operation_groups
+ ])
+
+ @property
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_web__idl_database.py
diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_web__idl_database.py:1.1
--- /dev/null Thu Jun 8 20:38:06 2023
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_web__idl_database.py Thu Jun 8 20:38:06 2023
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_web__idl_database.py,v 1.1 2023/06/08 20:38:06 markd Exp $
+
+build with python3
+
+--- src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/web_idl/database.py.orig 2022-03-30 09:48:18.000000000 +0000
++++ src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/web_idl/database.py
+@@ -156,4 +156,4 @@ class Database(object):
+ return self._view_by_kind(Database._Kind.UNION)
+
+ def _view_by_kind(self, kind):
+- return self._impl.find_by_kind(kind).values()
++ return list(self._impl.find_by_kind(kind).values())
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_web__idl_exposure.py
diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_web__idl_exposure.py:1.1
--- /dev/null Thu Jun 8 20:38:06 2023
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_web__idl_exposure.py Thu Jun 8 20:38:06 2023
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_web__idl_exposure.py,v 1.1 2023/06/08 20:38:06 markd Exp $
+
+build with python3
+
+--- src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/web_idl/exposure.py.orig 2022-03-30 09:48:18.000000000 +0000
++++ src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/web_idl/exposure.py
+@@ -8,8 +8,11 @@ from .runtime_enabled_features import Ru
+ class _Feature(str):
+ """Represents a runtime-enabled feature."""
+
++ def __new__(cls, value):
++ return str.__new__(cls, value)
++
+ def __init__(self, value):
+- str.__init__(self, value)
++ str.__init__(self)
+ self._is_context_dependent = (
+ RuntimeEnabledFeatures.is_context_dependent(self))
+
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_web__idl_function__like.py
diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_web__idl_function__like.py:1.1
--- /dev/null Thu Jun 8 20:38:06 2023
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_web__idl_function__like.py Thu Jun 8 20:38:06 2023
@@ -0,0 +1,68 @@
+$NetBSD: patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_web__idl_function__like.py,v 1.1 2023/06/08 20:38:06 markd Exp $
+
+build with python3
+
+--- src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/web_idl/function_like.py.orig 2022-03-30 09:48:18.000000000 +0000
++++ src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/web_idl/function_like.py
+@@ -71,8 +71,9 @@ class FunctionLike(WithIdentifier):
+ def num_of_required_arguments(self):
+ """Returns the number of required arguments."""
+ return len(
+- filter(lambda arg: not (arg.is_optional or arg.is_variadic),
+- self.arguments))
++ list(
++ filter(lambda arg: not (arg.is_optional or arg.is_variadic),
++ self.arguments)))
+
+
+ class OverloadGroup(WithIdentifier):
+@@ -171,8 +172,7 @@ class OverloadGroup(WithIdentifier):
+ Returns the effective overload set.
+ https://heycam.github.io/webidl/#compute-the-effective-overload-set
+ """
+- assert argument_count is None or isinstance(argument_count,
+- (int, long))
++ assert argument_count is None or isinstance(argument_count, int)
+
+ N = argument_count
+ S = []
+@@ -188,21 +188,21 @@ class OverloadGroup(WithIdentifier):
+
+ S.append(
+ OverloadGroup.EffectiveOverloadItem(
+- X, map(lambda arg: arg.idl_type, X.arguments),
+- map(lambda arg: arg.optionality, X.arguments)))
++ X, list(map(lambda arg: arg.idl_type, X.arguments)),
++ list(map(lambda arg: arg.optionality, X.arguments))))
+
+ if X.is_variadic:
+- for i in xrange(n, max(maxarg, N)):
+- t = map(lambda arg: arg.idl_type, X.arguments)
+- o = map(lambda arg: arg.optionality, X.arguments)
+- for _ in xrange(n, i + 1):
++ for i in range(n, max(maxarg, N)):
++ t = list(map(lambda arg: arg.idl_type, X.arguments))
++ o = list(map(lambda arg: arg.optionality, X.arguments))
++ for _ in range(n, i + 1):
+ t.append(X.arguments[-1].idl_type)
+ o.append(X.arguments[-1].optionality)
+ S.append(OverloadGroup.EffectiveOverloadItem(X, t, o))
+
+- t = map(lambda arg: arg.idl_type, X.arguments)
+- o = map(lambda arg: arg.optionality, X.arguments)
+- for i in xrange(n - 1, -1, -1):
++ t = list(map(lambda arg: arg.idl_type, X.arguments))
++ o = list(map(lambda arg: arg.optionality, X.arguments))
++ for i in range(n - 1, -1, -1):
+ if X.arguments[i].optionality == IdlType.Optionality.REQUIRED:
+ break
+ S.append(OverloadGroup.EffectiveOverloadItem(X, t[:i], o[:i]))
+@@ -222,7 +222,7 @@ class OverloadGroup(WithIdentifier):
+ for item in items)
+ assert len(items) > 1
+
+- for index in xrange(len(items[0].type_list)):
++ for index in range(len(items[0].type_list)):
+ # Assume that the given items are valid, and we only need to test
+ # the two types.
+ if OverloadGroup.are_distinguishable_types(
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_web__idl_idl__compiler.py
diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_web__idl_idl__compiler.py:1.1
--- /dev/null Thu Jun 8 20:38:06 2023
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_web__idl_idl__compiler.py Thu Jun 8 20:38:06 2023
@@ -0,0 +1,69 @@
+$NetBSD: patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_web__idl_idl__compiler.py,v 1.1 2023/06/08 20:38:06 markd Exp $
+
+build with python3
+
+--- src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/web_idl/idl_compiler.py.orig 2022-03-30 09:48:18.000000000 +0000
++++ src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/web_idl/idl_compiler.py
+@@ -149,8 +149,8 @@ class IdlCompiler(object):
+ for old_ir in old_irs:
+ new_ir = make_copy(old_ir)
+ self._ir_map.add(new_ir)
+- new_ir.attributes = filter(not_disabled, new_ir.attributes)
+- new_ir.operations = filter(not_disabled, new_ir.operations)
++ new_ir.attributes = list(filter(not_disabled, new_ir.attributes))
++ new_ir.operations = list(filter(not_disabled, new_ir.operations))
+
+ def _record_defined_in_partial_and_mixin(self):
+ old_irs = self._ir_map.irs_of_kinds(
+@@ -231,7 +231,7 @@ class IdlCompiler(object):
+ only_to_members_of_partial_or_mixin=False)
+ propagate_to_exposure(propagate)
+
+- map(process_member_like, ir.iter_all_members())
++ list(map(process_member_like, ir.iter_all_members()))
+
+ def process_member_like(ir):
+ propagate = functools.partial(propagate_extattr, ir=ir)
+@@ -257,7 +257,7 @@ class IdlCompiler(object):
+
+ self._ir_map.move_to_new_phase()
+
+- map(process_interface_like, old_irs)
++ list(map(process_interface_like, old_irs))
+
+ def _determine_blink_headers(self):
+ irs = self._ir_map.irs_of_kinds(
+@@ -422,9 +422,9 @@ class IdlCompiler(object):
+ assert not new_interface.deriveds
+ derived_set = identifier_to_derived_set.get(
+ new_interface.identifier, set())
+- new_interface.deriveds = map(
+- lambda id_: self._ref_to_idl_def_factory.create(id_),
+- sorted(derived_set))
++ new_interface.deriveds = list(
++ map(lambda id_: self._ref_to_idl_def_factory.create(id_),
++ sorted(derived_set)))
+
+ def _supplement_missing_html_constructor_operation(self):
+ # Temporary mitigation of misuse of [HTMLConstructor]
+@@ -553,7 +553,8 @@ class IdlCompiler(object):
+ self._ir_map.add(new_ir)
+
+ for group in new_ir.iter_all_overload_groups():
+- exposures = map(lambda overload: overload.exposure, group)
++ exposures = list(map(lambda overload: overload.exposure,
++ group))
+
+ # [Exposed]
+ if any(not exposure.global_names_and_features
+@@ -653,8 +654,8 @@ class IdlCompiler(object):
+ constructs = set()
+ for global_name in global_names:
+ constructs.update(exposed_map.get(global_name, []))
+- new_ir.exposed_constructs = map(
+- self._ref_to_idl_def_factory.create, sorted(constructs))
++ new_ir.exposed_constructs = list(
++ map(self._ref_to_idl_def_factory.create, sorted(constructs)))
+
+ assert not new_ir.legacy_window_aliases
+ if new_ir.identifier != 'Window':
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_web__idl_interface.py
diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_web__idl_interface.py:1.1
--- /dev/null Thu Jun 8 20:38:06 2023
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_web__idl_interface.py Thu Jun 8 20:38:06 2023
@@ -0,0 +1,109 @@
+$NetBSD: patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_web__idl_interface.py,v 1.1 2023/06/08 20:38:06 markd Exp $
+
+build with python3
+
+--- src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/web_idl/interface.py.orig 2022-03-30 09:48:18.000000000 +0000
++++ src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/web_idl/interface.py
+@@ -180,8 +180,9 @@ class Interface(UserDefinedType, WithExt
+ self._constructor_groups = tuple([
+ ConstructorGroup(
+ group_ir,
+- filter(lambda x: x.identifier == group_ir.identifier,
+- self._constructors),
++ list(
++ filter(lambda x: x.identifier == group_ir.identifier,
++ self._constructors)),
+ owner=self) for group_ir in ir.constructor_groups
+ ])
+ assert len(self._constructor_groups) <= 1
+@@ -192,8 +193,9 @@ class Interface(UserDefinedType, WithExt
+ self._named_constructor_groups = tuple([
+ ConstructorGroup(
+ group_ir,
+- filter(lambda x: x.identifier == group_ir.identifier,
+- self._named_constructors),
++ list(
++ filter(lambda x: x.identifier == group_ir.identifier,
++ self._named_constructors)),
+ owner=self) for group_ir in ir.named_constructor_groups
+ ])
+ self._operations = tuple([
+@@ -203,22 +205,23 @@ class Interface(UserDefinedType, WithExt
+ self._operation_groups = tuple([
+ OperationGroup(
+ group_ir,
+- filter(lambda x: x.identifier == group_ir.identifier,
+- self._operations),
++ list(
++ filter(lambda x: x.identifier == group_ir.identifier,
++ self._operations)),
+ owner=self) for group_ir in ir.operation_groups
+ ])
+ self._exposed_constructs = tuple(ir.exposed_constructs)
+ self._legacy_window_aliases = tuple(ir.legacy_window_aliases)
+ self._indexed_and_named_properties = None
+- indexed_and_named_property_operations = filter(
+- lambda x: x.is_indexed_or_named_property_operation,
+- self._operations)
++ indexed_and_named_property_operations = list(
++ filter(lambda x: x.is_indexed_or_named_property_operation,
++ self._operations))
+ if indexed_and_named_property_operations:
+ self._indexed_and_named_properties = IndexedAndNamedProperties(
+ indexed_and_named_property_operations, owner=self)
+ self._stringifier = None
+- stringifier_operation_irs = filter(lambda x: x.is_stringifier,
+- ir.operations)
++ stringifier_operation_irs = list(
++ filter(lambda x: x.is_stringifier, ir.operations))
+ if stringifier_operation_irs:
+ assert len(stringifier_operation_irs) == 1
+ op_ir = make_copy(stringifier_operation_irs[0])
+@@ -231,8 +234,9 @@ class Interface(UserDefinedType, WithExt
+ attribute = None
+ if operation.stringifier_attribute:
+ attr_id = operation.stringifier_attribute
+- attributes = filter(lambda x: x.identifier == attr_id,
+- self._attributes)
++ attributes = list(
++ filter(lambda x: x.identifier == attr_id,
++ self._attributes))
+ assert len(attributes) == 1
+ attribute = attributes[0]
+ self._stringifier = Stringifier(operation, attribute, owner=self)
+@@ -578,8 +582,9 @@ class Iterable(WithDebugInfo):
+ self._operation_groups = tuple([
+ OperationGroup(
+ group_ir,
+- filter(lambda x: x.identifier == group_ir.identifier,
+- self._operations),
++ list(
++ filter(lambda x: x.identifier == group_ir.identifier,
++ self._operations)),
+ owner=owner) for group_ir in ir.operation_groups
+ ])
+
+@@ -666,8 +671,9 @@ class Maplike(WithDebugInfo):
+ self._operation_groups = tuple([
+ OperationGroup(
+ group_ir,
+- filter(lambda x: x.identifier == group_ir.identifier,
+- self._operations),
++ list(
++ filter(lambda x: x.identifier == group_ir.identifier,
++ self._operations)),
+ owner=owner) for group_ir in ir.operation_groups
+ ])
+
+@@ -755,8 +761,9 @@ class Setlike(WithDebugInfo):
+ self._operation_groups = tuple([
+ OperationGroup(
+ group_ir,
+- filter(lambda x: x.identifier == group_ir.identifier,
+- self._operations),
++ list(
++ filter(lambda x: x.identifier == group_ir.identifier,
++ self._operations)),
+ owner=owner) for group_ir in ir.operation_groups
+ ])
+
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_web__idl_ir__builder.py
diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_web__idl_ir__builder.py:1.1
--- /dev/null Thu Jun 8 20:38:06 2023
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_web__idl_ir__builder.py Thu Jun 8 20:38:06 2023
@@ -0,0 +1,112 @@
+$NetBSD: patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_web__idl_ir__builder.py,v 1.1 2023/06/08 20:38:06 markd Exp $
+
+build with python3
+
+--- src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/web_idl/ir_builder.py.orig 2022-03-30 09:48:18.000000000 +0000
++++ src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/web_idl/ir_builder.py
+@@ -2,6 +2,8 @@
+ # Use of this source code is governed by a BSD-style license that can be
+ # found in the LICENSE file.
+
++import sys
++
+ from .argument import Argument
+ from .ast_group import AstGroup
+ from .attribute import Attribute
+@@ -30,6 +32,11 @@ from .operation import Operation
+ from .typedef import Typedef
+
+
++# TODO: Remove this once Python2 is obsoleted.
++if sys.version_info.major != 2:
++ long = int
++
++
+ def load_and_register_idl_definitions(filepaths, register_ir,
+ create_ref_to_idl_def, idl_type_factory):
+ """
+@@ -160,7 +167,7 @@ class _IRBuilder(object):
+ child_nodes = list(node.GetChildren())
+ extended_attributes = self._take_extended_attributes(child_nodes)
+
+- members = map(self._build_interface_member, child_nodes)
++ members = list(map(self._build_interface_member, child_nodes))
+ attributes = []
+ constants = []
+ operations = []
+@@ -302,7 +309,7 @@ class _IRBuilder(object):
+ child_nodes = list(node.GetChildren())
+ inherited = self._take_inheritance(child_nodes)
+ extended_attributes = self._take_extended_attributes(child_nodes)
+- own_members = map(self._build_dictionary_member, child_nodes)
++ own_members = list(map(self._build_dictionary_member, child_nodes))
+
+ return Dictionary.IR(
+ identifier=Identifier(node.GetName()),
+@@ -336,7 +343,7 @@ class _IRBuilder(object):
+
+ child_nodes = list(node.GetChildren())
+ extended_attributes = self._take_extended_attributes(child_nodes)
+- members = map(self._build_interface_member, child_nodes)
++ members = list(map(self._build_interface_member, child_nodes))
+ constants = []
+ operations = []
+ for member in members:
+@@ -456,8 +463,8 @@ class _IRBuilder(object):
+ assert len(child_nodes) == 1
+ child = child_nodes[0]
+ if child.GetClass() == 'Arguments':
+- arguments = map(build_extattr_argument,
+- child.GetChildren())
++ arguments = list(
++ map(build_extattr_argument, child.GetChildren()))
+ elif child.GetClass() == 'Call':
+ assert len(child.GetChildren()) == 1
+ grand_child = child.GetChildren()[0]
+@@ -486,7 +493,9 @@ class _IRBuilder(object):
+
+ assert node.GetClass() == 'ExtAttributes'
+ return ExtendedAttributes(
+- filter(None, map(build_extended_attribute, node.GetChildren())))
++ list(
++ filter(None, map(build_extended_attribute,
++ node.GetChildren()))))
+
+ def _build_inheritance(self, node):
+ assert node.GetClass() == 'Inherit'
+@@ -506,7 +515,7 @@ class _IRBuilder(object):
+
+ def _build_iterable(self, node):
+ assert node.GetClass() == 'Iterable'
+- types = map(self._build_type, node.GetChildren())
++ types = list(map(self._build_type, node.GetChildren()))
+ assert len(types) == 1 or len(types) == 2
+ if len(types) == 1: # value iterator
+ key_type, value_type = (None, types[0])
+@@ -584,7 +593,7 @@ class _IRBuilder(object):
+ def _build_maplike(self, node, interface_identifier):
+ assert node.GetClass() == 'Maplike'
+ assert isinstance(interface_identifier, Identifier)
+- types = map(self._build_type, node.GetChildren())
++ types = list(map(self._build_type, node.GetChildren()))
+ assert len(types) == 2
+ key_type, value_type = types
+ is_readonly = bool(node.GetProperty('READONLY'))
+@@ -676,7 +685,7 @@ class _IRBuilder(object):
+ def _build_setlike(self, node, interface_identifier):
+ assert node.GetClass() == 'Setlike'
+ assert isinstance(interface_identifier, Identifier)
+- types = map(self._build_type, node.GetChildren())
++ types = list(map(self._build_type, node.GetChildren()))
+ assert len(types) == 1
+ value_type = types[0]
+ is_readonly = bool(node.GetProperty('READONLY'))
+@@ -838,7 +847,7 @@ class _IRBuilder(object):
+
+ def build_union_type(node, extended_attributes):
+ return self._idl_type_factory.union_type(
+- member_types=map(self._build_type, node.GetChildren()),
++ member_types=list(map(self._build_type, node.GetChildren())),
+ is_optional=is_optional,
+ extended_attributes=extended_attributes,
+ debug_info=self._build_debug_info(node))
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_web__idl_make__copy.py
diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_web__idl_make__copy.py:1.1
--- /dev/null Thu Jun 8 20:38:06 2023
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_web__idl_make__copy.py Thu Jun 8 20:38:06 2023
@@ -0,0 +1,20 @@
+$NetBSD: patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_web__idl_make__copy.py,v 1.1 2023/06/08 20:38:06 markd Exp $
+
+build with python3
+
+--- src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/web_idl/make_copy.py.orig 2022-03-30 09:48:18.000000000 +0000
++++ src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/web_idl/make_copy.py
+@@ -3,6 +3,13 @@
+ # found in the LICENSE file.
+
+
++import sys
++
++# TODO: Remove this once Python2 is obsoleted.
++if sys.version_info.major != 2:
++ long = int
++ basestring = str
++
+ def make_copy(obj, memo=None):
+ """
+ Creates a copy of the given object, which should be an IR or part of IR.
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_web__idl_namespace.py
diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_web__idl_namespace.py:1.1
--- /dev/null Thu Jun 8 20:38:06 2023
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_web__idl_namespace.py Thu Jun 8 20:38:06 2023
@@ -0,0 +1,25 @@
+$NetBSD: patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_web__idl_namespace.py,v 1.1 2023/06/08 20:38:06 markd Exp $
+
+build with python3
+
+--- src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/web_idl/namespace.py.orig 2022-03-30 09:48:18.000000000 +0000
++++ src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/web_idl/namespace.py
+@@ -107,11 +107,13 @@ class Namespace(UserDefinedType, WithExt
+ for operation_ir in ir.operations
+ ])
+ self._operation_groups = tuple([
+- OperationGroup(
+- operation_group_ir,
+- filter(lambda x: x.identifier == operation_group_ir.identifier,
+- self._operations),
+- owner=self) for operation_group_ir in ir.operation_groups
++ OperationGroup(operation_group_ir,
++ list(
++ filter(
++ lambda x: x.identifier == operation_group_ir
++ .identifier, self._operations)),
++ owner=self)
++ for operation_group_ir in ir.operation_groups
+ ])
+
+ @property
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_templates_dictionary__v8.cc.tmpl
diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_templates_dictionary__v8.cc.tmpl:1.1
--- /dev/null Thu Jun 8 20:38:06 2023
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_templates_dictionary__v8.cc.tmpl Thu Jun 8 20:38:06 2023
@@ -0,0 +1,30 @@
+$NetBSD: patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_templates_dictionary__v8.cc.tmpl,v 1.1 2023/06/08 20:38:06 markd Exp $
+
+build with python3
+
+--- src/3rdparty/chromium/third_party/blink/renderer/bindings/templates/dictionary_v8.cc.tmpl.orig 2022-03-30 09:48:18.000000000 +0000
++++ src/3rdparty/chromium/third_party/blink/renderer/bindings/templates/dictionary_v8.cc.tmpl
+@@ -59,9 +59,9 @@ void {{v8_class}}::ToImpl(v8::Isolate* i
+ DCHECK(executionContext);
+ {% endif %}{# has_origin_trial_members #}
+ {% endif %}{# members #}
+- {% for origin_trial_test, origin_trial_member_list in members | groupby('origin_trial_feature_name') %}
++ {% for origin_trial_test, origin_trial_member_list in members | stringifykeygroupby('origin_trial_feature_name') %}
+ {% filter origin_trial_enabled(origin_trial_test, "executionContext") %}
+- {% for feature_name, member_list in origin_trial_member_list | groupby('runtime_enabled_feature_name') %}
++ {% for feature_name, member_list in origin_trial_member_list | stringifykeygroupby('runtime_enabled_feature_name') %}
+ {% filter runtime_enabled(feature_name) %}
+ {% for member in member_list %}
+ v8::Local<v8::Value> {{member.v8_value}};
+@@ -147,9 +147,9 @@ bool toV8{{cpp_class}}(const {{cpp_class
+ DCHECK(executionContext);
+ {% endif %}{# has_origin_trial_members #}
+ {% endif %}{# members #}
+- {% for origin_trial_test, origin_trial_member_list in members | groupby('origin_trial_feature_name') %}
++ {% for origin_trial_test, origin_trial_member_list in members | stringifykeygroupby('origin_trial_feature_name') %}
+ {% filter origin_trial_enabled(origin_trial_test, "executionContext") %}
+- {% for feature_name, member_list in origin_trial_member_list | groupby('runtime_enabled_feature_name') %}
++ {% for feature_name, member_list in origin_trial_member_list | stringifykeygroupby('runtime_enabled_feature_name') %}
+ {% filter runtime_enabled(feature_name) %}
+ {% for member in member_list %}
+ v8::Local<v8::Value> {{member.v8_value}};
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_build_scripts_core_css_make__style__shorthands.py
diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_build_scripts_core_css_make__style__shorthands.py:1.1
--- /dev/null Thu Jun 8 20:38:06 2023
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_build_scripts_core_css_make__style__shorthands.py Thu Jun 8 20:38:06 2023
@@ -0,0 +1,50 @@
+$NetBSD: patch-src_3rdparty_chromium_third__party_blink_renderer_build_scripts_core_css_make__style__shorthands.py,v 1.1 2023/06/08 20:38:06 markd Exp $
+
+build with python3
+
+--- src/3rdparty/chromium/third_party/blink/renderer/build/scripts/core/css/make_style_shorthands.py.orig 2022-03-30 09:48:18.000000000 +0000
++++ src/3rdparty/chromium/third_party/blink/renderer/build/scripts/core/css/make_style_shorthands.py
+@@ -71,7 +71,7 @@ class Expansion(object):
+ def enabled_longhands(self):
+ include = lambda longhand: not longhand[
+ 'runtime_flag'] or self.is_enabled(longhand['runtime_flag'])
+- return filter(include, self._longhands)
++ return list(filter(include, self._longhands))
+
+ @property
+ def index(self):
+@@ -87,8 +87,9 @@ class Expansion(object):
+
+ def create_expansions(longhands):
+ flags = collect_runtime_flags(longhands)
+- expansions = map(lambda mask: Expansion(longhands, flags, mask),
+- range(1 << len(flags)))
++ expansions = list(
++ map(lambda mask: Expansion(longhands, flags, mask),
++ range(1 << len(flags))))
+ assert len(expansions) > 0
+ # We generate 2^N expansions for N flags, so enforce some limit.
+ assert len(flags) <= 4, 'Too many runtime flags for a single shorthand'
+@@ -114,14 +115,14 @@ class StylePropertyShorthandWriter(json5
+
+ self._longhand_dictionary = defaultdict(list)
+ for property_ in json5_properties.shorthands:
+- property_['longhand_enum_keys'] = map(enum_key_for_css_property,
+- property_['longhands'])
+- property_['longhand_property_ids'] = map(id_for_css_property,
+- property_['longhands'])
+-
+- longhands = map(
+- lambda name: json5_properties.properties_by_name[name],
+- property_['longhands'])
++ property_['longhand_enum_keys'] = list(
++ map(enum_key_for_css_property, property_['longhands']))
++ property_['longhand_property_ids'] = list(
++ map(id_for_css_property, property_['longhands']))
++
++ longhands = list(
++ map(lambda name: json5_properties.properties_by_name[name],
++ property_['longhands']))
+ property_['expansions'] = create_expansions(longhands)
+ for longhand_enum_key in property_['longhand_enum_keys']:
+ self._longhand_dictionary[longhand_enum_key].append(property_)
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_build_scripts_core_css_properties_make__css__property__instances.py
diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_build_scripts_core_css_properties_make__css__property__instances.py:1.1
--- /dev/null Thu Jun 8 20:38:06 2023
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_build_scripts_core_css_properties_make__css__property__instances.py Thu Jun 8 20:38:06 2023
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_3rdparty_chromium_third__party_blink_renderer_build_scripts_core_css_properties_make__css__property__instances.py,v 1.1 2023/06/08 20:38:06 markd Exp $
+
+build with python3
+
+--- src/3rdparty/chromium/third_party/blink/renderer/build/scripts/core/css/properties/make_css_property_instances.py.orig 2022-03-30 09:48:18.000000000 +0000
++++ src/3rdparty/chromium/third_party/blink/renderer/build/scripts/core/css/properties/make_css_property_instances.py
+@@ -42,8 +42,8 @@ class CSSPropertyInstancesWriter(json5_g
+ aliases = self._css_properties.aliases
+
+ # Lists of PropertyClassData.
+- self._property_classes_by_id = map(self.get_class, properties)
+- self._alias_classes_by_id = map(self.get_class, aliases)
++ self._property_classes_by_id = list(map(self.get_class, properties))
++ self._alias_classes_by_id = list(map(self.get_class, aliases))
+
+ # Sort by enum value.
+ self._property_classes_by_id.sort(key=lambda t: t.enum_value)
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_build_scripts_gperf.py
diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_build_scripts_gperf.py:1.1
--- /dev/null Thu Jun 8 20:38:06 2023
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_build_scripts_gperf.py Thu Jun 8 20:38:06 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_3rdparty_chromium_third__party_blink_renderer_build_scripts_gperf.py,v 1.1 2023/06/08 20:38:06 markd Exp $
+
+build with python3
+
+--- src/3rdparty/chromium/third_party/blink/renderer/build/scripts/gperf.py.orig 2022-03-30 09:48:18.000000000 +0000
++++ src/3rdparty/chromium/third_party/blink/renderer/build/scripts/gperf.py
+@@ -95,7 +95,7 @@ def main():
+
+ open(args.output_file, 'wb').write(
+ generate_gperf(gperf_path,
+- open(infile).read(), gperf_args))
++ open(infile).read(), gperf_args).encode('utf-8'))
+
+
+ if __name__ == '__main__':
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_build_scripts_in__file.py
diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_build_scripts_in__file.py:1.1
--- /dev/null Thu Jun 8 20:38:06 2023
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_build_scripts_in__file.py Thu Jun 8 20:38:06 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_3rdparty_chromium_third__party_blink_renderer_build_scripts_in__file.py,v 1.1 2023/06/08 20:38:06 markd Exp $
+
+build with python3
+
+--- src/3rdparty/chromium/third_party/blink/renderer/build/scripts/in_file.py.orig 2022-03-30 09:48:18.000000000 +0000
++++ src/3rdparty/chromium/third_party/blink/renderer/build/scripts/in_file.py
+@@ -66,7 +66,7 @@ class InFile(object):
+ self._defaults = defaults
+ self._valid_values = copy.deepcopy(
+ valid_values if valid_values else {})
+- self._parse(map(str.strip, lines))
++ self._parse(list(map(str.strip, lines)))
+
+ @classmethod
+ def load_from_files(self, file_paths, defaults, valid_values,
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_build_scripts_in__generator.py
diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_build_scripts_in__generator.py:1.1
--- /dev/null Thu Jun 8 20:38:06 2023
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_build_scripts_in__generator.py Thu Jun 8 20:38:06 2023
@@ -0,0 +1,22 @@
+$NetBSD: patch-src_3rdparty_chromium_third__party_blink_renderer_build_scripts_in__generator.py,v 1.1 2023/06/08 20:38:06 markd Exp $
+
+build with python3
+
+--- src/3rdparty/chromium/third_party/blink/renderer/build/scripts/in_generator.py.orig 2022-03-30 09:48:18.000000000 +0000
++++ src/3rdparty/chromium/third_party/blink/renderer/build/scripts/in_generator.py
+@@ -32,10 +32,15 @@ import os
+ import os.path
+ import shlex
+ import shutil
++import sys
+ import optparse
+
+ from in_file import InFile
+
++# TODO: Remove this once Python2 is obsoleted.
++if sys.version_info.major != 2:
++ basestring = str
++
+
+ #########################################################
+ # This is now deprecated - use json5_generator.py instead
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_build_scripts_make__runtime__features.py
diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_build_scripts_make__runtime__features.py:1.1
--- /dev/null Thu Jun 8 20:38:06 2023
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_build_scripts_make__runtime__features.py Thu Jun 8 20:38:06 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_3rdparty_chromium_third__party_blink_renderer_build_scripts_make__runtime__features.py,v 1.1 2023/06/08 20:38:06 markd Exp $
+
+build with python3
+
+--- src/3rdparty/chromium/third_party/blink/renderer/build/scripts/make_runtime_features.py.orig 2022-03-30 09:48:18.000000000 +0000
++++ src/3rdparty/chromium/third_party/blink/renderer/build/scripts/make_runtime_features.py
+@@ -138,7 +138,7 @@ class RuntimeFeatureWriter(BaseRuntimeFe
+ except Exception:
+ # If trouble unpickling, overwrite
+ pass
+- with open(os.path.abspath(file_name), 'w') as pickle_file:
++ with open(os.path.abspath(file_name), 'wb') as pickle_file:
+ pickle.dump(features_map, pickle_file)
+
+ def _template_inputs(self):
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_build_scripts_templates_element__factory.cc.tmpl
diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_build_scripts_templates_element__factory.cc.tmpl:1.1
--- /dev/null Thu Jun 8 20:38:06 2023
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_build_scripts_templates_element__factory.cc.tmpl Thu Jun 8 20:38:06 2023
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_3rdparty_chromium_third__party_blink_renderer_build_scripts_templates_element__factory.cc.tmpl,v 1.1 2023/06/08 20:38:06 markd Exp $
+
+build with python3
+
+--- src/3rdparty/chromium/third_party/blink/renderer/build/scripts/templates/element_factory.cc.tmpl.orig 2022-03-30 09:48:18.000000000 +0000
++++ src/3rdparty/chromium/third_party/blink/renderer/build/scripts/templates/element_factory.cc.tmpl
+@@ -26,7 +26,7 @@ using {{namespace}}FunctionMap = HashMap
+
+ static {{namespace}}FunctionMap* g_{{namespace|lower}}_constructors = nullptr;
+
+-{% for tag in tags|sort if not tag.noConstructor %}
++{% for tag in tags|sort(attribute='name') if not tag.noConstructor %}
+ static {{namespace}}Element* {{namespace}}{{tag.name.to_upper_camel_case()}}Constructor(
+ Document& document, const CreateElementFlags flags) {
+ {% if tag.runtimeEnabled %}
+@@ -52,7 +52,7 @@ static void Create{{namespace}}FunctionM
+ // Empty array initializer lists are illegal [dcl.init.aggr] and will not
+ // compile in MSVC. If tags list is empty, add check to skip this.
+ static const Create{{namespace}}FunctionMapData data[] = {
+- {% for tag in tags|sort if not tag.noConstructor %}
++ {% for tag in tags|sort(attribute='name') if not tag.noConstructor %}
+ { {{cpp_namespace}}::{{tag|symbol}}Tag, {{namespace}}{{tag.name.to_upper_camel_case()}}Constructor },
+ {% endfor %}
+ };
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_build_scripts_templates_element__type__helpers.cc.tmpl
diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_build_scripts_templates_element__type__helpers.cc.tmpl:1.1
--- /dev/null Thu Jun 8 20:38:06 2023
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_build_scripts_templates_element__type__helpers.cc.tmpl Thu Jun 8 20:38:06 2023
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_3rdparty_chromium_third__party_blink_renderer_build_scripts_templates_element__type__helpers.cc.tmpl,v 1.1 2023/06/08 20:38:06 markd Exp $
+
+build with python3
+
+--- src/3rdparty/chromium/third_party/blink/renderer/build/scripts/templates/element_type_helpers.cc.tmpl.orig 2022-03-30 09:48:18.000000000 +0000
++++ src/3rdparty/chromium/third_party/blink/renderer/build/scripts/templates/element_type_helpers.cc.tmpl
+@@ -22,7 +22,7 @@ HTMLTypeMap CreateHTMLTypeMap() {
+ const char* name;
+ HTMLElementType type;
+ } kTags[] = {
+- {% for tag in tags|sort %}
++ {% for tag in tags|sort(attribute='name') %}
+ { "{{tag.name}}", HTMLElementType::k{{tag.js_interface}} },
+ {% endfor %}
+ };
+@@ -42,7 +42,7 @@ HTMLElementType htmlElementTypeForTag(co
+ if (it == html_type_map.end())
+ return HTMLElementType::kHTMLUnknownElement;
+
+- {% for tag in tags|sort %}
++ {% for tag in tags|sort(attribute='name') %}
+ {% if tag.runtimeEnabled %}
+ if (tagName == "{{tag.name}}") {
+ if (!RuntimeEnabledFeatures::{{tag.runtimeEnabled}}Enabled(document->GetExecutionContext())) {
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_build_scripts_templates_element__type__helpers.h.tmpl
diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_build_scripts_templates_element__type__helpers.h.tmpl:1.1
--- /dev/null Thu Jun 8 20:38:06 2023
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_build_scripts_templates_element__type__helpers.h.tmpl Thu Jun 8 20:38:06 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_3rdparty_chromium_third__party_blink_renderer_build_scripts_templates_element__type__helpers.h.tmpl,v 1.1 2023/06/08 20:38:06 markd Exp $
+
+build with python3
+
+--- src/3rdparty/chromium/third_party/blink/renderer/build/scripts/templates/element_type_helpers.h.tmpl.orig 2022-03-30 09:48:18.000000000 +0000
++++ src/3rdparty/chromium/third_party/blink/renderer/build/scripts/templates/element_type_helpers.h.tmpl
+@@ -15,7 +15,7 @@ namespace blink {
+ class Document;
+
+ // Type checking.
+-{% for tag in tags|sort if not tag.multipleTagNames and not tag.noTypeHelpers %}
++{% for tag in tags|sort(attribute='name') if not tag.multipleTagNames and not tag.noTypeHelpers %}
+ class {{tag.interface}};
+ template <>
+ inline bool IsElementOfType<const {{tag.interface}}>(const Node& node) {
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_build_scripts_templates_macros.tmpl
diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_build_scripts_templates_macros.tmpl:1.1
--- /dev/null Thu Jun 8 20:38:06 2023
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_build_scripts_templates_macros.tmpl Thu Jun 8 20:38:06 2023
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_3rdparty_chromium_third__party_blink_renderer_build_scripts_templates_macros.tmpl,v 1.1 2023/06/08 20:38:06 markd Exp $
+
+build with python3
+
+--- src/3rdparty/chromium/third_party/blink/renderer/build/scripts/templates/macros.tmpl.orig 2022-03-30 09:48:18.000000000 +0000
++++ src/3rdparty/chromium/third_party/blink/renderer/build/scripts/templates/macros.tmpl
+@@ -25,7 +25,7 @@
+
+
+ {% macro trie_leaf(index, object, return_macro, lowercase_data) %}
+-{% set name, value = object.items()[0] %}
++{% set name, value = (object.items()|list)[0] %}
+ {% if name|length %}
+ if (
+ {%- for c in name -%}
+@@ -45,7 +45,7 @@ return {{ return_macro(value) }};
+
+
+ {% macro trie_switch(trie, index, return_macro, lowercase_data) %}
+-{% if trie|length == 1 and trie.values()[0] is string %}
++{% if trie|length == 1 and (trie.values()|list)[0] is string %}
+ {{ trie_leaf(index, trie, return_macro, lowercase_data) -}}
+ {% else %}
+ {% if lowercase_data %}
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_build_scripts_templates_make__qualified__names.h.tmpl
diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_build_scripts_templates_make__qualified__names.h.tmpl:1.1
--- /dev/null Thu Jun 8 20:38:06 2023
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_build_scripts_templates_make__qualified__names.h.tmpl Thu Jun 8 20:38:06 2023
@@ -0,0 +1,21 @@
+$NetBSD: patch-src_3rdparty_chromium_third__party_blink_renderer_build_scripts_templates_make__qualified__names.h.tmpl,v 1.1 2023/06/08 20:38:06 markd Exp $
+
+build with python3
+
+--- src/3rdparty/chromium/third_party/blink/renderer/build/scripts/templates/make_qualified_names.h.tmpl.orig 2022-03-30 09:48:18.000000000 +0000
++++ src/3rdparty/chromium/third_party/blink/renderer/build/scripts/templates/make_qualified_names.h.tmpl
+@@ -24,12 +24,12 @@ namespace {{cpp_namespace}} {
+ {{symbol_export}}extern const WTF::AtomicString& {{namespace_prefix}}NamespaceURI;
+
+ // Tags
+-{% for tag in tags|sort %}
++{% for tag in tags|sort(attribute='name') %}
+ {{symbol_export}}extern const blink::{{namespace}}QualifiedName& {{tag|symbol}}Tag;
+ {% endfor %}
+
+ // Attributes
+-{% for attr in attrs|sort %}
++{% for attr in attrs|sort(attribute='name') %}
+ {{symbol_export}}extern const blink::QualifiedName& {{attr|symbol}}Attr;
+ {% endfor %}
+
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_dawn_generator_generator__lib.py
diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_dawn_generator_generator__lib.py:1.1
--- /dev/null Thu Jun 8 20:38:06 2023
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_dawn_generator_generator__lib.py Thu Jun 8 20:38:06 2023
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_3rdparty_chromium_third__party_dawn_generator_generator__lib.py,v 1.1 2023/06/08 20:38:06 markd Exp $
+
+build with python3
+
+--- src/3rdparty/chromium/third_party/dawn/generator/generator_lib.py.orig 2022-03-30 09:48:18.000000000 +0000
++++ src/3rdparty/chromium/third_party/dawn/generator/generator_lib.py
+@@ -201,6 +201,10 @@ def _compute_python_dependencies(root_di
+
+ paths = set()
+ for path in module_paths:
++ # Builtin/namespaced modules may return None for the file path.
++ if not path:
++ continue
++
+ path = os.path.abspath(path)
+
+ if not path.startswith(root_dir):
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_devtools-frontend_src_scripts_build_build__inspector__overlay.py
diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_devtools-frontend_src_scripts_build_build__inspector__overlay.py:1.1
--- /dev/null Thu Jun 8 20:38:06 2023
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_devtools-frontend_src_scripts_build_build__inspector__overlay.py Thu Jun 8 20:38:06 2023
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_3rdparty_chromium_third__party_devtools-frontend_src_scripts_build_build__inspector__overlay.py,v 1.1 2023/06/08 20:38:06 markd Exp $
+
+build with python3
+
+--- src/3rdparty/chromium/third_party/devtools-frontend/src/scripts/build/build_inspector_overlay.py.orig 2022-03-30 09:48:18.000000000 +0000
++++ src/3rdparty/chromium/third_party/devtools-frontend/src/scripts/build/build_inspector_overlay.py
+@@ -45,7 +45,8 @@ def rollup(input_path, output_path, file
+ ['--format', 'iife', '-n', 'InspectorOverlay'] + ['--input', target] +
+ ['--plugin', rollup_plugin],
+ stdout=subprocess.PIPE,
+- stderr=subprocess.PIPE)
++ stderr=subprocess.PIPE,
++ text=True)
+ out, error = rollup_process.communicate()
+ if not out:
+ raise Exception("rollup failed: " + error)
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_devtools-frontend_src_scripts_build_build__release__applications.py
diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_devtools-frontend_src_scripts_build_build__release__applications.py:1.1
--- /dev/null Thu Jun 8 20:38:06 2023
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_devtools-frontend_src_scripts_build_build__release__applications.py Thu Jun 8 20:38:06 2023
@@ -0,0 +1,36 @@
+$NetBSD: patch-src_3rdparty_chromium_third__party_devtools-frontend_src_scripts_build_build__release__applications.py,v 1.1 2023/06/08 20:38:06 markd Exp $
+
+build with python3
+
+--- src/3rdparty/chromium/third_party/devtools-frontend/src/scripts/build/build_release_applications.py.orig 2022-03-30 09:48:18.000000000 +0000
++++ src/3rdparty/chromium/third_party/devtools-frontend/src/scripts/build/build_release_applications.py
+@@ -10,7 +10,7 @@ Builds applications in release mode:
+ and the application loader into a single script.
+ """
+
+-from cStringIO import StringIO
++from io import StringIO
+ from os import path
+ from os.path import join
+ import copy
+@@ -145,8 +145,7 @@ class ReleaseBuilder(object):
+ resource_content = read_file(path.join(self.application_dir, resource_name))
+ if not (resource_name.endswith('.html')
+ or resource_name.endswith('md')):
+- resource_content += resource_source_url(resource_name).encode(
+- 'utf-8')
++ resource_content += resource_source_url(resource_name)
+ resource_content = resource_content.replace('\\', '\\\\')
+ resource_content = resource_content.replace('\n', '\\n')
+ resource_content = resource_content.replace('"', '\\"')
+@@ -173,7 +172,9 @@ class ReleaseBuilder(object):
+ def _concatenate_application_script(self, output):
+ output.write('Root.allDescriptors.push(...%s);' % self._release_module_descriptors())
+ if self.descriptors.extends:
+- output.write('Root.applicationDescriptor.modules.push(...%s);' % json.dumps(self.descriptors.application.values()))
++ output.write(
++ 'Root.applicationDescriptor.modules.push(...%s);' %
++ json.dumps(list(self.descriptors.application.values())))
+ else:
+ output.write('Root.applicationDescriptor = %s;' % self.descriptors.application_json())
+
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_devtools-frontend_src_scripts_build_generate__devtools__grd.py
diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_devtools-frontend_src_scripts_build_generate__devtools__grd.py:1.1
--- /dev/null Thu Jun 8 20:38:06 2023
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_devtools-frontend_src_scripts_build_generate__devtools__grd.py Thu Jun 8 20:38:06 2023
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_3rdparty_chromium_third__party_devtools-frontend_src_scripts_build_generate__devtools__grd.py,v 1.1 2023/06/08 20:38:06 markd Exp $
+
+build with python3
+
+--- src/3rdparty/chromium/third_party/devtools-frontend/src/scripts/build/generate_devtools_grd.py.orig 2022-03-30 09:48:18.000000000 +0000
++++ src/3rdparty/chromium/third_party/devtools-frontend/src/scripts/build/generate_devtools_grd.py
+@@ -123,7 +123,7 @@ def main(argv):
+
+ try:
+ os.makedirs(path.join(output_directory, 'Images'))
+- except OSError, e:
++ except OSError as e:
+ if e.errno != errno.EEXIST:
+ raise e
+
+@@ -147,7 +147,7 @@ def main(argv):
+ shutil.copy(path.join(dirname, filename), path.join(output_directory, 'Images'))
+ add_file_to_grd(doc, path.join('Images', filename))
+
+- with open(parsed_args.output_filename, 'w') as output_file:
++ with open(parsed_args.output_filename, 'wb') as output_file:
+ output_file.write(doc.toxml(encoding='UTF-8'))
+
+
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_devtools-frontend_src_scripts_build_modular__build.py
diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_devtools-frontend_src_scripts_build_modular__build.py:1.1
--- /dev/null Thu Jun 8 20:38:06 2023
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_devtools-frontend_src_scripts_build_modular__build.py Thu Jun 8 20:38:06 2023
@@ -0,0 +1,33 @@
+$NetBSD: patch-src_3rdparty_chromium_third__party_devtools-frontend_src_scripts_build_modular__build.py,v 1.1 2023/06/08 20:38:06 markd Exp $
+
+build with python3
+
+--- src/3rdparty/chromium/third_party/devtools-frontend/src/scripts/build/modular_build.py.orig 2022-03-30 09:48:18.000000000 +0000
++++ src/3rdparty/chromium/third_party/devtools-frontend/src/scripts/build/modular_build.py
+@@ -7,6 +7,8 @@
+ Utilities for the modular DevTools build.
+ """
+
++from __future__ import print_function
++
+ import collections
+ from os import path
+ import os
+@@ -40,7 +42,7 @@ def load_and_parse_json(filename):
+ try:
+ return json.loads(read_file(filename))
+ except:
+- print 'ERROR: Failed to parse %s' % filename
++ print('ERROR: Failed to parse %s' % filename)
+ raise
+
+ class Descriptors:
+@@ -57,7 +59,7 @@ class Descriptors:
+
+ def application_json(self):
+ result = dict()
+- result['modules'] = self.application.values()
++ result['modules'] = list(self.application.values())
+ return json.dumps(result)
+
+ def all_compiled_files(self):
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_jinja2_tests.py
diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_jinja2_tests.py:1.1
--- /dev/null Thu Jun 8 20:38:06 2023
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_jinja2_tests.py Thu Jun 8 20:38:06 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_3rdparty_chromium_third__party_jinja2_tests.py,v 1.1 2023/06/08 20:38:06 markd Exp $
+
+build with python3
+
+--- src/3rdparty/chromium/third_party/jinja2/tests.py.orig 2022-03-30 09:48:18.000000000 +0000
++++ src/3rdparty/chromium/third_party/jinja2/tests.py
+@@ -10,7 +10,7 @@
+ """
+ import operator
+ import re
+-from collections import Mapping
++from collections.abc import Mapping
+ from jinja2.runtime import Undefined
+ from jinja2._compat import text_type, string_types, integer_types
+ import decimal
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_webrtc_modules_video__coding_codecs_h264_h264__decoder__impl.cc
diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_webrtc_modules_video__coding_codecs_h264_h264__decoder__impl.cc:1.1
--- /dev/null Thu Jun 8 20:38:06 2023
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_webrtc_modules_video__coding_codecs_h264_h264__decoder__impl.cc Thu Jun 8 20:38:06 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_3rdparty_chromium_third__party_webrtc_modules_video__coding_codecs_h264_h264__decoder__impl.cc,v 1.1 2023/06/08 20:38:06 markd Exp $
+
+build with ffmpeg5 from archlinux
+
+--- src/3rdparty/chromium/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc.orig 2022-03-30 09:48:18.000000000 +0000
++++ src/3rdparty/chromium/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc
+@@ -203,7 +203,7 @@ int32_t H264DecoderImpl::InitDecode(cons
+ // a pointer |this|.
+ av_context_->opaque = this;
+
+- AVCodec* codec = avcodec_find_decoder(av_context_->codec_id);
++ const AVCodec* codec = avcodec_find_decoder(av_context_->codec_id);
+ if (!codec) {
+ // This is an indication that FFmpeg has not been initialized or it has not
+ // been compiled/initialized with the correct set of codecs.
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_tools_grit_BUILD.gn
diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_tools_grit_BUILD.gn:1.1
--- /dev/null Thu Jun 8 20:38:06 2023
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_tools_grit_BUILD.gn Thu Jun 8 20:38:06 2023
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_3rdparty_chromium_tools_grit_BUILD.gn,v 1.1 2023/06/08 20:38:06 markd Exp $
+
+build with python3 (remove catapult)
+
+--- src/3rdparty/chromium/tools/grit/BUILD.gn.orig 2022-03-30 09:48:18.000000000 +0000
++++ src/3rdparty/chromium/tools/grit/BUILD.gn
+@@ -33,7 +33,6 @@ group("grit_python_unittests") {
+ "//testing/scripts/run_isolated_script_test.py",
+ "//testing/xvfb.py",
+ "//tools/grit/",
+- "//third_party/catapult/third_party/typ/",
+ ]
+ }
+
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_tools_grit_grit_util.py
diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_tools_grit_grit_util.py:1.1
--- /dev/null Thu Jun 8 20:38:06 2023
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_tools_grit_grit_util.py Thu Jun 8 20:38:06 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_3rdparty_chromium_tools_grit_grit_util.py,v 1.1 2023/06/08 20:38:06 markd Exp $
+
+build with python3
+
+--- src/3rdparty/chromium/tools/grit/grit/util.py.orig 2022-03-30 09:48:18.000000000 +0000
++++ src/3rdparty/chromium/tools/grit/grit/util.py
+@@ -211,7 +211,7 @@ def ReadFile(filename, encoding):
+ mode = 'rb'
+ encoding = None
+ else:
+- mode = 'rU'
++ mode = 'r'
+
+ with io.open(abs(filename), mode, encoding=encoding) as f:
+ return f.read()
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_tools_gritsettings_resource__ids.spec
diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_tools_gritsettings_resource__ids.spec:1.1
--- /dev/null Thu Jun 8 20:38:06 2023
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_tools_gritsettings_resource__ids.spec Thu Jun 8 20:38:06 2023
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_3rdparty_chromium_tools_gritsettings_resource__ids.spec,v 1.1 2023/06/08 20:38:06 markd Exp $
+
+build with python3 (remove catapult)
+
+--- src/3rdparty/chromium/tools/gritsettings/resource_ids.spec.orig 2022-03-30 09:48:18.000000000 +0000
++++ src/3rdparty/chromium/tools/gritsettings/resource_ids.spec
+@@ -499,12 +499,6 @@
+ "content/shell/shell_resources.grd": {
+ "includes": [2940],
+ },
+-
+- # This file is generated during the build.
+- "<(SHARED_INTERMEDIATE_DIR)/content/browser/tracing/tracing_resources.grd": {
+- "META": {"sizes": {"includes": [20],}},
+- "includes": [2960],
+- },
+ # END content/ section.
+
+ # START ios/web/ section.
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_tools_metrics_BUILD.gn
diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_tools_metrics_BUILD.gn:1.1
--- /dev/null Thu Jun 8 20:38:06 2023
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_tools_metrics_BUILD.gn Thu Jun 8 20:38:06 2023
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_3rdparty_chromium_tools_metrics_BUILD.gn,v 1.1 2023/06/08 20:38:06 markd Exp $
+
+build with python3 (remove catapult)
+
+--- src/3rdparty/chromium/tools/metrics/BUILD.gn.orig 2022-03-30 09:48:18.000000000 +0000
++++ src/3rdparty/chromium/tools/metrics/BUILD.gn
+@@ -56,7 +56,6 @@ group("metrics_python_tests") {
+ "//testing/scripts/common.py",
+ "//testing/xvfb.py",
+ "//testing/test_env.py",
+- "//third_party/catapult/third_party/typ/",
+
+ # Scripts we depend on. Their unit tests are also included.
+ "//tools/json_comment_eater/json_comment_eater.py",
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_tools_metrics_ukm_gen__builders.py
diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_tools_metrics_ukm_gen__builders.py:1.1
--- /dev/null Thu Jun 8 20:38:06 2023
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_tools_metrics_ukm_gen__builders.py Thu Jun 8 20:38:06 2023
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_3rdparty_chromium_tools_metrics_ukm_gen__builders.py,v 1.1 2023/06/08 20:38:06 markd Exp $
+
+build with python3
+
+--- src/3rdparty/chromium/tools/metrics/ukm/gen_builders.py.orig 2022-03-30 09:48:18.000000000 +0000
++++ src/3rdparty/chromium/tools/metrics/ukm/gen_builders.py
+@@ -48,9 +48,10 @@ def ReadFilteredData(path):
+ data = ukm_model.UKM_XML_TYPE.Parse(ukm_file.read())
+ event_tag = ukm_model._EVENT_TYPE.tag
+ metric_tag = ukm_model._METRIC_TYPE.tag
+- data[event_tag] = filter(ukm_model.IsNotObsolete, data[event_tag])
++ data[event_tag] = list(filter(ukm_model.IsNotObsolete, data[event_tag]))
+ for event in data[event_tag]:
+- event[metric_tag] = filter(ukm_model.IsNotObsolete, event[metric_tag])
++ event[metric_tag] = list(
++ filter(ukm_model.IsNotObsolete, event[metric_tag]))
+ return data
+
+
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_tools_metrics_ukm_ukm__model.py
diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_tools_metrics_ukm_ukm__model.py:1.1
--- /dev/null Thu Jun 8 20:38:06 2023
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_tools_metrics_ukm_ukm__model.py Thu Jun 8 20:38:06 2023
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_3rdparty_chromium_tools_metrics_ukm_ukm__model.py,v 1.1 2023/06/08 20:38:06 markd Exp $
+
+build with python3
+
+--- src/3rdparty/chromium/tools/metrics/ukm/ukm_model.py.orig 2022-03-30 09:48:18.000000000 +0000
++++ src/3rdparty/chromium/tools/metrics/ukm/ukm_model.py
+@@ -42,7 +42,7 @@ _INDEX_TYPE = models.ObjectNodeType(
+ _STATISTICS_TYPE = models.ObjectNodeType(
+ 'statistics',
+ attributes=[
+- ('export', str, r'^(?i)(|true|false)$'),
++ ('export', str, r'(?i)^(|true|false)$'),
+ ],
+ children=[
+ models.ChildType(_QUANTILES_TYPE.tag, _QUANTILES_TYPE, multiple=False),
+@@ -94,7 +94,7 @@ _EVENT_TYPE = models.ObjectNodeType(
+ 'event',
+ attributes=[
+ ('name', str, r'^[A-Za-z0-9.]+$'),
+- ('singular', str, r'^(?i)(|true|false)$'),
++ ('singular', str, r'(?i)^(|true|false)$'),
+ ],
+ alphabetization=[
+ (_OBSOLETE_TYPE.tag, _KEEP_ORDER),
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_tools_perf_core_perfetto__binary__roller_BUILD.gn
diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_tools_perf_core_perfetto__binary__roller_BUILD.gn:1.1
--- /dev/null Thu Jun 8 20:38:06 2023
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_tools_perf_core_perfetto__binary__roller_BUILD.gn Thu Jun 8 20:38:06 2023
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_3rdparty_chromium_tools_perf_core_perfetto__binary__roller_BUILD.gn,v 1.1 2023/06/08 20:38:06 markd Exp $
+
+build with python3 (remove catapult)
+
+--- src/3rdparty/chromium/tools/perf/core/perfetto_binary_roller/BUILD.gn.orig 2022-03-30 09:48:18.000000000 +0000
++++ src/3rdparty/chromium/tools/perf/core/perfetto_binary_roller/BUILD.gn
+@@ -7,7 +7,6 @@ import("//build/util/generate_wrapper.gn
+ generate_wrapper("upload_trace_processor") {
+ testonly = true
+ data_deps = [
+- "//third_party/catapult:telemetry_chrome_test_support",
+ "//third_party/perfetto/src/trace_processor:trace_processor_shell",
+ ]
+ data = [
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_tools_polymer_BUILD.gn
diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_tools_polymer_BUILD.gn:1.1
--- /dev/null Thu Jun 8 20:38:06 2023
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_tools_polymer_BUILD.gn Thu Jun 8 20:38:06 2023
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_3rdparty_chromium_tools_polymer_BUILD.gn,v 1.1 2023/06/08 20:38:06 markd Exp $
+
+build with python3 (remove catapult)
+
+--- src/3rdparty/chromium/tools/polymer/BUILD.gn.orig 2022-03-30 09:48:18.000000000 +0000
++++ src/3rdparty/chromium/tools/polymer/BUILD.gn
+@@ -10,6 +10,5 @@ group("polymer_tools_python_unittests")
+ "//testing/scripts/run_isolated_script_test.py",
+ "//testing/xvfb.py",
+ "//tools/polymer/",
+- "//third_party/catapult/third_party/typ/",
+ ]
+ }
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_ui_ozone_generate__constructor__list.py
diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_ui_ozone_generate__constructor__list.py:1.1
--- /dev/null Thu Jun 8 20:38:06 2023
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_ui_ozone_generate__constructor__list.py Thu Jun 8 20:38:06 2023
@@ -0,0 +1,49 @@
+$NetBSD: patch-src_3rdparty_chromium_ui_ozone_generate__constructor__list.py,v 1.1 2023/06/08 20:38:06 markd Exp $
+
+build with python3
+
+--- src/3rdparty/chromium/ui/ozone/generate_constructor_list.py.orig 2022-03-30 09:48:18.000000000 +0000
++++ src/3rdparty/chromium/ui/ozone/generate_constructor_list.py
+@@ -45,12 +45,15 @@ Example Output: ./ui/ozone/generate_cons
+ } // namespace ui
+ """
+
++try:
++ from StringIO import StringIO # for Python 2
++except ImportError:
++ from io import StringIO # for Python 3
+ import optparse
+ import os
+ import collections
+ import re
+ import sys
+-import string
+
+
+ def GetTypedefName(typename):
+@@ -68,7 +71,7 @@ def GetConstructorName(typename, platfor
+ This is just "Create" + typename + platform.
+ """
+
+- return 'Create' + typename + string.capitalize(platform)
++ return 'Create' + typename + platform.capitalize()
+
+
+ def GenerateConstructorList(out, namespace, export, typenames, platforms,
+@@ -163,12 +166,14 @@ def main(argv):
+ sys.exit(1)
+
+ # Write to standard output or file specified by --output_cc.
+- out_cc = sys.stdout
++ out_cc = getattr(sys.stdout, 'buffer', sys.stdout)
+ if options.output_cc:
+ out_cc = open(options.output_cc, 'wb')
+
+- GenerateConstructorList(out_cc, options.namespace, options.export,
++ out_cc_str = StringIO()
++ GenerateConstructorList(out_cc_str, options.namespace, options.export,
+ typenames, platforms, includes, usings)
++ out_cc.write(out_cc_str.getvalue().encode('utf-8'))
+
+ if options.output_cc:
+ out_cc.close()
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_ui_ozone_generate__ozone__platform__list.py
diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_ui_ozone_generate__ozone__platform__list.py:1.1
--- /dev/null Thu Jun 8 20:38:06 2023
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_ui_ozone_generate__ozone__platform__list.py Thu Jun 8 20:38:06 2023
@@ -0,0 +1,65 @@
+$NetBSD: patch-src_3rdparty_chromium_ui_ozone_generate__ozone__platform__list.py,v 1.1 2023/06/08 20:38:06 markd Exp $
+
+build with python3
+
+--- src/3rdparty/chromium/ui/ozone/generate_ozone_platform_list.py.orig 2022-03-30 09:48:18.000000000 +0000
++++ src/3rdparty/chromium/ui/ozone/generate_ozone_platform_list.py
+@@ -49,12 +49,15 @@ Example Output: ./generate_ozone_platfor
+
+ """
+
++try:
++ from StringIO import StringIO # for Python 2
++except ImportError:
++ from io import StringIO # for Python 3
+ import optparse
+ import os
+ import collections
+ import re
+ import sys
+-import string
+
+
+ def GetConstantName(name):
+@@ -63,7 +66,7 @@ def GetConstantName(name):
+ We just capitalize the platform name and prepend "CreateOzonePlatform".
+ """
+
+- return 'kPlatform' + string.capitalize(name)
++ return 'kPlatform' + name.capitalize()
+
+
+ def GeneratePlatformListText(out, platforms):
+@@ -149,9 +152,9 @@ def main(argv):
+ platforms.insert(0, options.default)
+
+ # Write to standard output or file specified by --output_{cc,h}.
+- out_cc = sys.stdout
+- out_h = sys.stdout
+- out_txt = sys.stdout
++ out_cc = getattr(sys.stdout, 'buffer', sys.stdout)
++ out_h = getattr(sys.stdout, 'buffer', sys.stdout)
++ out_txt = getattr(sys.stdout, 'buffer', sys.stdout)
+ if options.output_cc:
+ out_cc = open(options.output_cc, 'wb')
+ if options.output_h:
+@@ -159,9 +162,16 @@ def main(argv):
+ if options.output_txt:
+ out_txt = open(options.output_txt, 'wb')
+
+- GeneratePlatformListText(out_txt, platforms)
+- GeneratePlatformListHeader(out_h, platforms)
+- GeneratePlatformListSource(out_cc, platforms)
++ out_txt_str = StringIO()
++ out_h_str = StringIO()
++ out_cc_str = StringIO()
++
++ GeneratePlatformListText(out_txt_str, platforms)
++ out_txt.write(out_txt_str.getvalue().encode('utf-8'))
++ GeneratePlatformListHeader(out_h_str, platforms)
++ out_h.write(out_h_str.getvalue().encode('utf-8'))
++ GeneratePlatformListSource(out_cc_str, platforms)
++ out_cc.write(out_cc_str.getvalue().encode('utf-8'))
+
+ if options.output_cc:
+ out_cc.close()
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_v8_tools_BUILD.gn
diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_v8_tools_BUILD.gn:1.1
--- /dev/null Thu Jun 8 20:38:06 2023
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_v8_tools_BUILD.gn Thu Jun 8 20:38:06 2023
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_3rdparty_chromium_v8_tools_BUILD.gn,v 1.1 2023/06/08 20:38:06 markd Exp $
+
+build with python3 (remove catapult)
+
+--- src/3rdparty/chromium/v8/tools/BUILD.gn.orig 2022-03-30 09:48:18.000000000 +0000
++++ src/3rdparty/chromium/v8/tools/BUILD.gn
+@@ -31,10 +31,6 @@ group("v8_android_test_runner_deps") {
+
+ if (is_android && !build_with_chromium) {
+ data_deps = [ "//build/android:test_runner_py" ]
+- data = [
+- # This is used by android.py, but not included by test_runner_py above.
+- "//third_party/catapult/devil/devil/android/perf/",
+- ]
+ }
+ }
+
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_core_qtwebengine__resources.gni
diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_core_qtwebengine__resources.gni:1.1
--- /dev/null Thu Jun 8 20:38:06 2023
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_core_qtwebengine__resources.gni Thu Jun 8 20:38:06 2023
@@ -0,0 +1,22 @@
+$NetBSD: patch-src_core_qtwebengine__resources.gni,v 1.1 2023/06/08 20:38:06 markd Exp $
+
+build with python3
+
+--- src/core/qtwebengine_resources.gni.orig 2022-03-30 09:48:18.000000000 +0000
++++ src/core/qtwebengine_resources.gni
+@@ -27,7 +27,6 @@ repack("qtwebengine_repack_resources") {
+ "$root_gen_dir/components/components_resources.pak",
+ "$root_gen_dir/components/dev_ui_components_resources.pak",
+ "$root_gen_dir/content/browser/resources/media/media_internals_resources.pak",
+- "$root_gen_dir/content/browser/tracing/tracing_resources.pak",
+ "$root_gen_dir/content/content_resources.pak",
+ "$root_gen_dir/content/dev_ui_content_resources.pak",
+ "$root_gen_dir/mojo/public/js/mojo_bindings_resources.pak",
+@@ -44,7 +43,6 @@ repack("qtwebengine_repack_resources") {
+ "//components/resources:components_resources_grit",
+ "//components/resources:dev_ui_components_resources_grit",
+ "//content/browser/resources/media:media_internals_resources",
+- "//content/browser/tracing:resources",
+ "//content:content_resources_grit",
+ "//content:dev_ui_content_resources_grit",
+ "//mojo/public/js:resources",
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_devtools-frontend_src_BUILD.gn
diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_devtools-frontend_src_BUILD.gn:1.3
--- /dev/null Thu Jun 8 20:38:06 2023
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_devtools-frontend_src_BUILD.gn Thu Jun 8 20:38:06 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_3rdparty_chromium_third__party_devtools-frontend_src_BUILD.gn,v 1.3 2023/06/08 20:38:06 markd Exp $
+
+build with python3
+
+--- src/3rdparty/chromium/third_party/devtools-frontend/src/BUILD.gn.orig 2022-03-30 09:48:18.000000000 +0000
++++ src/3rdparty/chromium/third_party/devtools-frontend/src/BUILD.gn
+@@ -2,6 +2,8 @@
+ # Use of this source code is governed by a BSD-style license that can be
+ # found in the LICENSE file.
+
++import("//build/config/python.gni")
++
+ import("//third_party/blink/public/public_features.gni")
+ import("./all_devtools_files.gni")
+ import("./all_devtools_modules.gni")
Home |
Main Index |
Thread Index |
Old Index