| author | Antonio Rojas
<arojas@archlinux.org> 2023-05-25 19:50:05 UTC |
| committer | Antonio Rojas
<arojas@archlinux.org> 2023-05-25 19:50:05 UTC |
| parent | 985e5d55633a8ff360673a2b8ecdaeb3ae7d2f49 |
| PKGBUILD | +6 | -15 |
| qt5-webengine-chromium-python3.patch | +524 | -0 |
| qt5-webengine-gcc12.patch | +0 | -13 |
| qt5-webengine-python3.patch | +32 | -0 |
diff --git a/PKGBUILD b/PKGBUILD index a0f9de7..b1a9cb4 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,8 +3,8 @@ pkgname=qt5-webengine _basever=5.15.9 -pkgver=5.15.13 -pkgrel=2 +pkgver=5.15.14 +pkgrel=1 arch=('x86_64') url='https://www.qt.io' license=('LGPL3' 'LGPL2.1' 'BSD') @@ -17,20 +17,16 @@ groups=('qt' 'qt5') _pkgfqn=${pkgname/5-/} source=(git+https://code.qt.io/qt/qtwebengine.git#tag=v${pkgver}-lts git+https://code.qt.io/qt/qtwebengine-chromium.git - git+https://chromium.googlesource.com/catapult#commit=5eedfe23148a234211ba477f76fc2ea2e8529189 qt5-webengine-python3.patch qt5-webengine-chromium-python3.patch qt5-webengine-ffmpeg5.patch - qt5-webengine-pipewire-0.3.patch - qt5-webengine-gcc12.patch) + qt5-webengine-pipewire-0.3.patch) sha256sums=('SKIP' 'SKIP' - 'SKIP' - '398c996cb5b606695ac93645143df39e23fa67e768b09e0da6dbd37342a43f32' - 'fda4ff16790799fb285847918a677f4f3f7c0f513d4751f846ffc5aa5d873932' + '0ad5d1660886f7bbf5108b071bf5d7bbbabf1cd1258ce9d4587a01dec4a1aa89' + 'd8beb3d65a1aaf927285e6f055a9d1facd0f9c3fd851f91ba568389fb3137399' 'c50d3019626183e753c53a997dc8a55938847543aa3178d4c51f377be741c693' - '5e3a3c4711d964d5152a04059a2b5c1d14bb13dd29bce370120f60e85b476b6f' - 'cf9be3ffcc3b3cd9450b1ff13535ff7d76284f73173412d097a6ab487463a379') + '5e3a3c4711d964d5152a04059a2b5c1d14bb13dd29bce370120f60e85b476b6f') prepare() { mkdir -p build @@ -46,11 +42,6 @@ prepare() { patch -p1 -d src/3rdparty -i "$srcdir"/qt5-webengine-ffmpeg5.patch # Fix build with ffmpeg 5 patch -p1 -d src/3rdparty -i "$srcdir"/qt5-webengine-pipewire-0.3.patch # Port to pipewire 0.3 - patch -p1 -d src/3rdparty -i "$srcdir"/qt5-webengine-gcc12.patch # Fix build with GCC 12 - -# Update catapult for python3 compatibility - rm -r src/3rdparty/chromium/third_party/catapult - mv "$srcdir"/catapult src/3rdparty/chromium/third_party } build() { diff --git a/qt5-webengine-chromium-python3.patch b/qt5-webengine-chromium-python3.patch index c55225b..7604ef2 100644 --- a/qt5-webengine-chromium-python3.patch +++ b/qt5-webengine-chromium-python3.patch @@ -1810,3 +1810,527 @@ index d47c398259b..2702b68b9bd 100755 if options.output_cc: out_cc.close() +diff --git a/chromium/tools/metrics/ukm/ukm_model.py b/chromium/tools/metrics/ukm/ukm_model.py +index ec24dd57360..57decab3ccc 100644 +--- a/chromium/tools/metrics/ukm/ukm_model.py ++++ b/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), +diff --git a/chromium/tools/grit/grit/util.py b/chromium/tools/grit/grit/util.py +index 528d766ad6b..6e8cdb0ebfa 100644 +--- a/chromium/tools/grit/grit/util.py ++++ b/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() +From b0581c62625e57a63e56369f7eb24a141687cc7a Mon Sep 17 00:00:00 2001 +From: Jimi Huotari <chiitoo@gentoo.org> +Date: Wed, 6 Apr 2022 14:35:14 +0300 +Subject: [PATCH] Remove dependency on catapult + +Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> +--- + chromium/BUILD.gn | 11 ---- + chromium/chrome/chrome_paks.gni | 2 - + chromium/chrome/test/BUILD.gn | 6 --- + chromium/content/browser/BUILD.gn | 1 - + chromium/content/browser/tracing/BUILD.gn | 51 ------------------- + .../content/browser/tracing/tracing_ui.cc | 3 -- + chromium/content/shell/BUILD.gn | 2 - + chromium/fuchsia/engine/BUILD.gn | 2 - + chromium/headless/BUILD.gn | 2 - + chromium/mojo/public/tools/BUILD.gn | 1 - + chromium/testing/BUILD.gn | 1 - + chromium/third_party/webrtc/test/BUILD.gn | 5 -- + chromium/tools/binary_size/BUILD.gn | 1 - + chromium/tools/grit/BUILD.gn | 1 - + chromium/tools/gritsettings/resource_ids.spec | 6 --- + chromium/tools/metrics/BUILD.gn | 1 - + .../perf/chrome_telemetry_build/BUILD.gn | 3 -- + .../perf/core/perfetto_binary_roller/BUILD.gn | 1 - + chromium/tools/polymer/BUILD.gn | 1 - + chromium/v8/tools/BUILD.gn | 4 -- + chromium/weblayer/shell/BUILD.gn | 2 - + 21 files changed, 107 deletions(-) + delete mode 100644 chromium/content/browser/tracing/BUILD.gn + +diff --git a/chromium/BUILD.gn b/chromium/BUILD.gn +index 8d9657d545c..59e9447f456 100644 +--- a/chromium/BUILD.gn ++++ b/chromium/BUILD.gn +@@ -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", +@@ -959,7 +957,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 +1034,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 +1080,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", + ] +@@ -1152,7 +1147,6 @@ if (!is_ios && !use_qt) { + + if (is_android) { + data += [ +- "//third_party/catapult/", + "//build/android/", + ] + } +@@ -1259,11 +1253,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", +diff --git a/chromium/chrome/chrome_paks.gni b/chromium/chrome/chrome_paks.gni +index 9323a774a56..0362b6501aa 100644 +--- a/chromium/chrome/chrome_paks.gni ++++ b/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", +diff --git a/chromium/chrome/test/BUILD.gn b/chromium/chrome/test/BUILD.gn +index 1a369fa56d2..eb5bc9676fb 100644 +--- a/chromium/chrome/test/BUILD.gn ++++ b/chromium/chrome/test/BUILD.gn +@@ -7103,8 +7103,6 @@ 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) { +@@ -7141,7 +7139,6 @@ if (!is_fuchsia && !is_android) { + + # TODO(uwyiming@chromium.org) 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", + ] + } +diff --git a/chromium/content/browser/BUILD.gn b/chromium/content/browser/BUILD.gn +index 1466f33d462..51039e0da19 100644 +--- a/chromium/content/browser/BUILD.gn ++++ b/chromium/content/browser/BUILD.gn +@@ -2169,7 +2169,6 @@ jumbo_static_library("browser") { + if (!is_android) { + deps += [ + "//components/vector_icons", +- "//content/browser/tracing:resources", + ] + } + +diff --git a/chromium/content/browser/tracing/BUILD.gn b/chromium/content/browser/tracing/BUILD.gn +deleted file mode 100644 +index eac05999fac..00000000000 +--- a/chromium/content/browser/tracing/BUILD.gn ++++ /dev/null +@@ -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" ] +-} +diff --git a/chromium/content/browser/tracing/tracing_ui.cc b/chromium/content/browser/tracing/tracing_ui.cc +index 2bffb5eb3b0..8965922dfba 100644 +--- a/chromium/content/browser/tracing/tracing_ui.cc ++++ b/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); +diff --git a/chromium/content/shell/BUILD.gn b/chromium/content/shell/BUILD.gn +index 56c0e8b48e3..6e4ffbe962d 100644 +--- a/chromium/content/shell/BUILD.gn ++++ b/chromium/content/shell/BUILD.gn +@@ -390,7 +390,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 +412,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", +diff --git a/chromium/fuchsia/engine/BUILD.gn b/chromium/fuchsia/engine/BUILD.gn +index a502b7fc273..39df2a7028a 100644 +--- a/chromium/fuchsia/engine/BUILD.gn ++++ b/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", +diff --git a/chromium/headless/BUILD.gn b/chromium/headless/BUILD.gn +index d2ab76aed32..15e4b78009d 100644 +--- a/chromium/headless/BUILD.gn ++++ b/chromium/headless/BUILD.gn +@@ -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", +diff --git a/chromium/mojo/public/tools/BUILD.gn b/chromium/mojo/public/tools/BUILD.gn +index 4c68350b399..1cc01256f00 100644 +--- a/chromium/mojo/public/tools/BUILD.gn ++++ b/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/" ] + } +diff --git a/chromium/testing/BUILD.gn b/chromium/testing/BUILD.gn +index 56ebf8d46c9..7d51bc0ccf7 100644 +--- a/chromium/testing/BUILD.gn ++++ b/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) { +diff --git a/chromium/third_party/webrtc/test/BUILD.gn b/chromium/third_party/webrtc/test/BUILD.gn +index 58d3dab5219..48328298d2e 100644 +--- a/chromium/third_party/webrtc/test/BUILD.gn ++++ b/chromium/third_party/webrtc/test/BUILD.gn +@@ -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 +diff --git a/chromium/tools/binary_size/BUILD.gn b/chromium/tools/binary_size/BUILD.gn +index e6806bf7754..2c985d15fab 100644 +--- a/chromium/tools/binary_size/BUILD.gn ++++ b/chromium/tools/binary_size/BUILD.gn +@@ -18,7 +18,6 @@ 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) { +diff --git a/chromium/tools/grit/BUILD.gn b/chromium/tools/grit/BUILD.gn +index 1cd3c75b553..60c4cf2f77a 100644 +--- a/chromium/tools/grit/BUILD.gn ++++ b/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/", + ] + } + +diff --git a/chromium/tools/gritsettings/resource_ids.spec b/chromium/tools/gritsettings/resource_ids.spec +index d0a4545514c..80b0bf1737b 100644 +--- a/chromium/tools/gritsettings/resource_ids.spec ++++ b/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. +diff --git a/chromium/tools/metrics/BUILD.gn b/chromium/tools/metrics/BUILD.gn +index 846d5248bfa..cb57d2bdae1 100644 +--- a/chromium/tools/metrics/BUILD.gn ++++ b/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", +diff --git a/chromium/tools/perf/chrome_telemetry_build/BUILD.gn b/chromium/tools/perf/chrome_telemetry_build/BUILD.gn +index 280bb754c2c..c287fdcebb3 100644 +--- a/chromium/tools/perf/chrome_telemetry_build/BUILD.gn ++++ b/chromium/tools/perf/chrome_telemetry_build/BUILD.gn +@@ -107,7 +107,6 @@ group("telemetry_chrome_test_without_chrome") { + "//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_chrome") { + "//build/android:devil_chromium_py", + "//build/android:stack_tools", + ] +- } else if (!is_fuchsia) { +- data_deps += [ "//third_party/catapult/telemetry:bitmaptools" ] + } + } +diff --git a/chromium/tools/perf/core/perfetto_binary_roller/BUILD.gn b/chromium/tools/perf/core/perfetto_binary_roller/BUILD.gn +index 7fe48cba143..e9c7f0261a5 100644 +--- a/chromium/tools/perf/core/perfetto_binary_roller/BUILD.gn ++++ b/chromium/tools/perf/core/perfetto_binary_roller/BUILD.gn +@@ -7,7 +7,6 @@ import("//build/util/generate_wrapper.gni") + 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 = [ +diff --git a/chromium/tools/polymer/BUILD.gn b/chromium/tools/polymer/BUILD.gn +index 092066b7c04..d115144cd61 100644 +--- a/chromium/tools/polymer/BUILD.gn ++++ b/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/", + ] + } +diff --git a/chromium/v8/tools/BUILD.gn b/chromium/v8/tools/BUILD.gn +index 2f8197dd369..83304b6342b 100644 +--- a/chromium/v8/tools/BUILD.gn ++++ b/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/", +- ] + } + } + +diff --git a/chromium/weblayer/shell/BUILD.gn b/chromium/weblayer/shell/BUILD.gn +index 66984a7da54..1815fad623d 100644 +--- a/chromium/weblayer/shell/BUILD.gn ++++ b/chromium/weblayer/shell/BUILD.gn +@@ -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", +-- +2.35.1 + diff --git a/qt5-webengine-gcc12.patch b/qt5-webengine-gcc12.patch deleted file mode 100644 index 46f2dbf..0000000 --- a/qt5-webengine-gcc12.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/chromium/third_party/skia/src/utils/SkParseColor.cpp b/chromium/third_party/skia/src/utils/SkParseColor.cpp -index 7260365b2c6..b5a6aae3596 100644 ---- a/chromium/third_party/skia/src/utils/SkParseColor.cpp -+++ b/chromium/third_party/skia/src/utils/SkParseColor.cpp -@@ -8,6 +8,8 @@ - - #include "include/utils/SkParse.h" - -+#include <iterator> -+ - static constexpr const char* gColorNames[] = { - "aliceblue", - "antiquewhite", diff --git a/qt5-webengine-python3.patch b/qt5-webengine-python3.patch index 0b75727..9a3b600 100644 --- a/qt5-webengine-python3.patch +++ b/qt5-webengine-python3.patch @@ -159,3 +159,35 @@ index 88d1790c..032aa665 100644 ] }, "webengine-gperf": { +From b60fc250d65144532cd47eac72279e93baaec2b8 Mon Sep 17 00:00:00 2001 +From: Jimi Huotari <chiitoo@gentoo.org> +Date: Wed, 6 Apr 2022 14:35:14 +0300 +Subject: [PATCH] Remove dependency on catapult + +--- + src/core/qtwebengine_resources.gni | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/src/core/qtwebengine_resources.gni b/src/core/qtwebengine_resources.gni +index 3bf1a5d57..29fd2603c 100644 +--- a/src/core/qtwebengine_resources.gni ++++ b/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", +-- +2.35.1 +