[neon/qt6/qt6-webengine/Neon/release] debian/patches: refresh patches
Jonathan Esk-Riddell
null at kde.org
Tue Apr 4 16:43:18 BST 2023
Git commit 54343d29256cd1510b84e60fe55d576452b24bd5 by Jonathan Esk-Riddell.
Committed on 04/04/2023 at 15:43.
Pushed by jriddell into branch 'Neon/release'.
refresh patches
M +5 -3 debian/patches/compressing_files.patch
M +7 -6 debian/patches/reduce_debugging_info.patch
M +133 -163 debian/patches/remove_catapult_3rdparty.patch
M +8 -6 debian/patches/remove_catapult_core.patch
M +8 -6 debian/patches/support-i386.patch
https://invent.kde.org/neon/qt6/qt6-webengine/commit/54343d29256cd1510b84e60fe55d576452b24bd5
diff --git a/debian/patches/compressing_files.patch b/debian/patches/compressing_files.patch
index 9bbf73d..aaa1576 100644
--- a/debian/patches/compressing_files.patch
+++ b/debian/patches/compressing_files.patch
@@ -3,8 +3,10 @@ Description: Building on 32-bit architectures fails when trying to compress
files in the devtools-frontend.
Forwarded: not-needed
---- a/src/3rdparty/chromium/third_party/devtools-frontend/src/scripts/build/compress_files.js
-+++ b/src/3rdparty/chromium/third_party/devtools-frontend/src/scripts/build/compress_files.js
+Index: qtwebengine-everywhere-src-6.5.0/src/3rdparty/chromium/third_party/devtools-frontend/src/scripts/build/compress_files.js
+===================================================================
+--- qtwebengine-everywhere-src-6.5.0.orig/src/3rdparty/chromium/third_party/devtools-frontend/src/scripts/build/compress_files.js
++++ qtwebengine-everywhere-src-6.5.0/src/3rdparty/chromium/third_party/devtools-frontend/src/scripts/build/compress_files.js
@@ -75,7 +75,16 @@ async function main(argv) {
const fileList = argv[fileListPosition + 1];
const fileListContents = await readTextFile(fileList);
@@ -21,5 +23,5 @@ Forwarded: not-needed
+ }
+ }
}
-
+
main(process.argv).catch(err => {
diff --git a/debian/patches/reduce_debugging_info.patch b/debian/patches/reduce_debugging_info.patch
index 0add43e..b4304e9 100644
--- a/debian/patches/reduce_debugging_info.patch
+++ b/debian/patches/reduce_debugging_info.patch
@@ -1,12 +1,13 @@
---- a/src/3rdparty/chromium/build/config/compiler/BUILD.gn
-+++ b/src/3rdparty/chromium/build/config/compiler/BUILD.gn
-@@ -2553,7 +2553,7 @@ config("symbols") {
+Index: qtwebengine-everywhere-src-6.5.0/src/3rdparty/chromium/build/config/compiler/BUILD.gn
+===================================================================
+--- qtwebengine-everywhere-src-6.5.0.orig/src/3rdparty/chromium/build/config/compiler/BUILD.gn
++++ qtwebengine-everywhere-src-6.5.0/src/3rdparty/chromium/build/config/compiler/BUILD.gn
+@@ -2601,7 +2601,7 @@ config("symbols") {
# flag, so we can use use -g1 for pnacl and nacl-clang compiles.
# gcc nacl is is_nacl && !is_clang, pnacl and nacl-clang are && is_clang.
if ((!is_nacl || is_clang) && current_os != "zos") {
- cflags += [ "-g2" ]
+ cflags += [ "-g1" ]
}
-
- if (!is_nacl && is_clang && !is_tsan && !is_asan &&
-
+
+ if (!is_nacl && is_clang && !is_tsan && !is_asan) {
diff --git a/debian/patches/remove_catapult_3rdparty.patch b/debian/patches/remove_catapult_3rdparty.patch
index 0e73e86..afa7727 100644
--- a/debian/patches/remove_catapult_3rdparty.patch
+++ b/debian/patches/remove_catapult_3rdparty.patch
@@ -2,27 +2,27 @@ Author: Patrick Franz <deltaone at debian.org>
Description: Remove dependencies on catapult from src/3rdparty
Forwarded: not-needed
-diff --git a/src/3rdparty/chromium/BUILD.gn b/src/3rdparty/chromium/BUILD.gn
-index 6e0183ce0b7..22370dff563 100644
---- a/src/3rdparty/chromium/BUILD.gn
-+++ b/src/3rdparty/chromium/BUILD.gn
-@@ -243,7 +243,6 @@ group("gn_all") {
+Index: qtwebengine-everywhere-src-6.5.0/src/3rdparty/chromium/BUILD.gn
+===================================================================
+--- qtwebengine-everywhere-src-6.5.0.orig/src/3rdparty/chromium/BUILD.gn
++++ qtwebengine-everywhere-src-6.5.0/src/3rdparty/chromium/BUILD.gn
+@@ -235,7 +235,6 @@ if (!is_qtwebengine){
deps += [
"//google_apis/gcm:mcs_probe",
"//media/cast:cast_unittests",
- "//third_party/catapult/telemetry:bitmaptools($host_toolchain)",
]
if (!is_android) {
- deps += [ "//chrome/test:telemetry_perf_unittests" ]
-@@ -382,7 +381,6 @@ group("gn_all") {
- "//net/android:net_junit_tests",
+ if (!is_castos) {
+@@ -370,7 +369,6 @@ if (!is_qtwebengine){
"//services:services_junit_tests",
"//testing/android/junit:junit_unit_tests",
+ "//third_party/android_build_tools/lint:custom_lint_java",
- "//third_party/catapult/devil",
"//third_party/r8:custom_d8_java",
"//tools/android:android_tools",
"//tools/android:memconsumer",
-@@ -1082,7 +1080,6 @@ if (!is_ios && !use_qt) {
+@@ -1149,7 +1147,6 @@ if (!is_ios && !is_qtwebengine) {
"//chrome:chrome",
"//chrome/test/chromedriver",
"//testing:test_scripts_shared",
@@ -30,7 +30,7 @@ index 6e0183ce0b7..22370dff563 100644
]
if (is_win) {
data_deps += [ "//build/win:copy_cdb_to_output" ]
-@@ -1124,7 +1121,6 @@ if (!is_ios && !use_qt) {
+@@ -1198,7 +1195,6 @@ if (!is_ios && !is_qtwebengine) {
"//third_party/blink/public:blink_devtools_inspector_resources",
"//third_party/blink/public/mojom:mojom_platform_js_data_deps",
"//third_party/blink/renderer/core:js_files_for_form_controls_web_tests",
@@ -38,15 +38,15 @@ index 6e0183ce0b7..22370dff563 100644
"//third_party/hyphenation-patterns:test_data",
"//third_party/mesa_headers",
"//tools/imagediff",
-@@ -1191,7 +1187,6 @@ if (!is_ios && !use_qt) {
-
+@@ -1274,7 +1270,6 @@ if (!is_ios && !is_qtwebengine) {
+
if (is_android) {
data += [
- "//third_party/catapult/",
"//build/android/",
]
}
-@@ -1350,10 +1345,6 @@ if (!is_ios && !use_qt) {
+@@ -1627,10 +1622,6 @@ if (!is_ios && !is_qtwebengine) {
"//third_party/blink/web_tests/StaleTestExpectations",
"//third_party/blink/web_tests/TestExpectations",
"//third_party/blink/web_tests/VirtualTestSuites",
@@ -54,52 +54,52 @@ index 6e0183ce0b7..22370dff563 100644
- "//third_party/catapult/devil/",
- "//third_party/catapult/dependency_manager/",
- "//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/src/3rdparty/chromium/chrome/chrome_paks.gni b/src/3rdparty/chromium/chrome/chrome_paks.gni
-index b9dce47a02f..e7e4c5e7be5 100644
---- a/src/3rdparty/chromium/chrome/chrome_paks.gni
-+++ b/src/3rdparty/chromium/chrome/chrome_paks.gni
-@@ -168,7 +168,6 @@ template("chrome_extra_paks") {
- "$root_gen_dir/chrome/webid_resources_100_percent.pak",
+ "//third_party/depot_tools/pylintrc",
+Index: qtwebengine-everywhere-src-6.5.0/src/3rdparty/chromium/chrome/chrome_paks.gni
+===================================================================
+--- qtwebengine-everywhere-src-6.5.0.orig/src/3rdparty/chromium/chrome/chrome_paks.gni
++++ qtwebengine-everywhere-src-6.5.0/src/3rdparty/chromium/chrome/chrome_paks.gni
+@@ -171,7 +171,6 @@ template("chrome_extra_paks") {
+ "$root_gen_dir/chrome/webui_gallery_resources.pak",
"$root_gen_dir/chrome/whats_new_resources.pak",
"$root_gen_dir/content/browser/devtools/devtools_resources.pak",
- "$root_gen_dir/content/browser/tracing/tracing_resources.pak",
]
deps += [
"//chrome/browser/resources:component_extension_resources",
-@@ -198,7 +197,6 @@ template("chrome_extra_paks") {
- "//chrome/browser/resources/tab_search:resources",
+@@ -205,7 +204,6 @@ template("chrome_extra_paks") {
+ "//chrome/browser/resources/webui_gallery:resources",
"//chrome/browser/resources/whats_new:resources",
"//content/browser/devtools:devtools_resources",
- "//content/browser/tracing:resources",
]
if (is_chrome_branded) {
sources += [
-diff --git a/src/3rdparty/chromium/chrome/test/BUILD.gn b/src/3rdparty/chromium/chrome/test/BUILD.gn
-index a4e85c1e931..03beb728a61 100644
---- a/src/3rdparty/chromium/chrome/test/BUILD.gn
-+++ b/src/3rdparty/chromium/chrome/test/BUILD.gn
-@@ -9981,8 +9981,6 @@ if (!is_android && !is_fuchsia) {
+Index: qtwebengine-everywhere-src-6.5.0/src/3rdparty/chromium/chrome/test/BUILD.gn
+===================================================================
+--- qtwebengine-everywhere-src-6.5.0.orig/src/3rdparty/chromium/chrome/test/BUILD.gn
++++ qtwebengine-everywhere-src-6.5.0/src/3rdparty/chromium/chrome/test/BUILD.gn
+@@ -10631,8 +10631,6 @@ if (!is_android && !is_fuchsia) {
"//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) {
-@@ -10085,8 +10083,6 @@ if (!is_android) {
+@@ -10733,8 +10731,6 @@ if (!is_android) {
"//chrome/test/data/enterprise/connectors/file_system/captures/",
"//chrome/test/data/enterprise/connectors/file_system/downloads/",
"//chrome/test/data/web_page_replay_go_helper_scripts/automation_helper.js",
- "//third_party/catapult/telemetry/telemetry/bin/",
- "//third_party/catapult/web_page_replay_go/deterministic.js",
]
-
+
if (is_fuchsia) {
-@@ -10146,7 +10142,6 @@ if (!is_android) {
+@@ -10792,7 +10788,6 @@ if (!is_android) {
"//skia",
"//testing/gmock",
"//testing/gtest",
@@ -107,27 +107,19 @@ index a4e85c1e931..03beb728a61 100644
"//third_party/hunspell",
"//third_party/icu",
"//third_party/libpng",
-@@ -10197,7 +10192,6 @@ if (!is_android) {
+@@ -10843,7 +10838,6 @@ if (!is_android) {
deps = [ "//tools/perf/chrome_telemetry_build:telemetry_chrome_test" ]
-
+
data = [
- "//third_party/catapult/telemetry/telemetry/internal/bin/",
"//tools/perf/run_telemetry_tests",
"//testing/scripts/run_telemetry_as_googletest.py",
]
-@@ -10330,7 +10324,6 @@ if (is_mac || is_win || is_android) {
- "//chrome/test/data/perf",
- "//components/variations/service/generate_ui_string_overrider.py",
- "//testing/scripts",
-- "//third_party/catapult",
- "//tools/perf",
- ]
- data_deps = [ "//testing:test_scripts_shared" ]
-diff --git a/src/3rdparty/chromium/content/browser/BUILD.gn b/src/3rdparty/chromium/content/browser/BUILD.gn
-index 00ba6f9edaf..5922ea17795 100644
---- a/src/3rdparty/chromium/content/browser/BUILD.gn
-+++ b/src/3rdparty/chromium/content/browser/BUILD.gn
-@@ -2526,7 +2526,6 @@ jumbo_source_set("browser") {
+Index: qtwebengine-everywhere-src-6.5.0/src/3rdparty/chromium/content/browser/BUILD.gn
+===================================================================
+--- qtwebengine-everywhere-src-6.5.0.orig/src/3rdparty/chromium/content/browser/BUILD.gn
++++ qtwebengine-everywhere-src-6.5.0/src/3rdparty/chromium/content/browser/BUILD.gn
+@@ -2623,7 +2623,6 @@ jumbo_source_set("browser") {
if (!is_android) {
deps += [
"//components/vector_icons",
@@ -135,13 +127,12 @@ index 00ba6f9edaf..5922ea17795 100644
]
sources += [
# Non-Android platforms that don't presently support
-diff --git a/src/3rdparty/chromium/content/browser/tracing/BUILD.gn b/src/3rdparty/chromium/content/browser/tracing/BUILD.gn
-deleted file mode 100644
-index 9d744a67cfd..00000000000
---- a/src/3rdparty/chromium/content/browser/tracing/BUILD.gn
-+++ /dev/null
+Index: qtwebengine-everywhere-src-6.5.0/src/3rdparty/chromium/content/browser/tracing/BUILD.gn
+===================================================================
+--- qtwebengine-everywhere-src-6.5.0.orig/src/3rdparty/chromium/content/browser/tracing/BUILD.gn
++++ qtwebengine-everywhere-src-6.5.0/src/3rdparty/chromium/content/browser/tracing/BUILD.gn
@@ -1,39 +0,0 @@
--# Copyright 2014 The Chromium Authors. All rights reserved.
+-# Copyright 2014 The Chromium Authors
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
@@ -180,10 +171,10 @@ index 9d744a67cfd..00000000000
-
- deps = [ ":build_grd" ]
-}
-diff --git a/src/3rdparty/chromium/content/browser/tracing/tracing_ui.cc b/src/3rdparty/chromium/content/browser/tracing/tracing_ui.cc
-index dcfee226a6e..66d8bfc26bb 100644
---- a/src/3rdparty/chromium/content/browser/tracing/tracing_ui.cc
-+++ b/src/3rdparty/chromium/content/browser/tracing/tracing_ui.cc
+Index: qtwebengine-everywhere-src-6.5.0/src/3rdparty/chromium/content/browser/tracing/tracing_ui.cc
+===================================================================
+--- qtwebengine-everywhere-src-6.5.0.orig/src/3rdparty/chromium/content/browser/tracing/tracing_ui.cc
++++ qtwebengine-everywhere-src-6.5.0/src/3rdparty/chromium/content/browser/tracing/tracing_ui.cc
@@ -25,7 +25,6 @@
#include "base/strings/string_util.h"
#include "base/trace_event/trace_event.h"
@@ -192,23 +183,23 @@ index dcfee226a6e..66d8bfc26bb 100644
#include "content/browser/tracing/tracing_controller_impl.h"
#include "content/public/browser/browser_context.h"
#include "content/public/browser/browser_thread.h"
-@@ -240,8 +240,6 @@ TracingUI::TracingUI(WebUI* web_ui)
+@@ -240,8 +239,6 @@ TracingUI::TracingUI(WebUI* web_ui)
web_ui->GetWebContents()->GetBrowserContext(), kChromeUITracingHost);
source->DisableTrustedTypesCSP();
source->UseStringsJs();
- source->SetDefaultResource(IDR_TRACING_ABOUT_TRACING_HTML);
- source->AddResourcePath("tracing.js", IDR_TRACING_ABOUT_TRACING_JS);
-
+
source->SetRequestFilter(base::BindRepeating(OnShouldHandleRequest),
base::BindRepeating(OnTracingRequest));
-diff --git a/src/3rdparty/chromium/content/shell/BUILD.gn b/src/3rdparty/chromium/content/shell/BUILD.gn
-index bfa01025410..e0cf308394f 100644
---- a/src/3rdparty/chromium/content/shell/BUILD.gn
-+++ b/src/3rdparty/chromium/content/shell/BUILD.gn
-@@ -449,11 +449,6 @@ repack("pak") {
+Index: qtwebengine-everywhere-src-6.5.0/src/3rdparty/chromium/content/shell/BUILD.gn
+===================================================================
+--- qtwebengine-everywhere-src-6.5.0.orig/src/3rdparty/chromium/content/shell/BUILD.gn
++++ qtwebengine-everywhere-src-6.5.0/src/3rdparty/chromium/content/shell/BUILD.gn
+@@ -471,11 +471,6 @@ repack("pak") {
"//ui/strings",
]
-
+
- if (!is_android) {
- deps += [ "//content/browser/tracing:resources" ]
- sources += [ "$root_gen_dir/content/browser/tracing/tracing_resources.pak" ]
@@ -217,54 +208,34 @@ index bfa01025410..e0cf308394f 100644
if (shell_use_toolkit_views) {
deps += [ "//ui/views/resources" ]
sources +=
-diff --git a/src/3rdparty/chromium/fuchsia/engine/BUILD.gn b/src/3rdparty/chromium/fuchsia/engine/BUILD.gn
-index 745c183dad7..cb8e5542116 100644
---- a/src/3rdparty/chromium/fuchsia/engine/BUILD.gn
-+++ b/src/3rdparty/chromium/fuchsia/engine/BUILD.gn
-@@ -38,7 +38,6 @@ repack("web_engine_pak") {
- sources = [
- "$root_gen_dir/components/components_resources.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",
-@@ -53,7 +52,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/src/3rdparty/chromium/mojo/public/tools/BUILD.gn b/src/3rdparty/chromium/mojo/public/tools/BUILD.gn
-index eb6391a6540..87e7585aa15 100644
---- a/src/3rdparty/chromium/mojo/public/tools/BUILD.gn
-+++ b/src/3rdparty/chromium/mojo/public/tools/BUILD.gn
-@@ -13,6 +13,5 @@ group("mojo_python_unittests") {
- deps = [ "//mojo/public/tools/mojom/mojom:tests" ]
+Index: qtwebengine-everywhere-src-6.5.0/src/3rdparty/chromium/mojo/public/tools/BUILD.gn
+===================================================================
+--- qtwebengine-everywhere-src-6.5.0.orig/src/3rdparty/chromium/mojo/public/tools/BUILD.gn
++++ qtwebengine-everywhere-src-6.5.0/src/3rdparty/chromium/mojo/public/tools/BUILD.gn
+@@ -17,6 +17,5 @@ group("mojo_python_unittests") {
+ ]
data_deps = [
"//testing:test_scripts_shared",
- "//third_party/catapult/third_party/typ/",
]
}
-diff --git a/src/3rdparty/chromium/testing/BUILD.gn b/src/3rdparty/chromium/testing/BUILD.gn
-index 3e30ea06c3a..16faa75dff8 100644
---- a/src/3rdparty/chromium/testing/BUILD.gn
-+++ b/src/3rdparty/chromium/testing/BUILD.gn
-@@ -35,7 +35,6 @@ group("run_perf_test") {
-
+Index: qtwebengine-everywhere-src-6.5.0/src/3rdparty/chromium/testing/BUILD.gn
+===================================================================
+--- qtwebengine-everywhere-src-6.5.0.orig/src/3rdparty/chromium/testing/BUILD.gn
++++ qtwebengine-everywhere-src-6.5.0/src/3rdparty/chromium/testing/BUILD.gn
+@@ -45,7 +45,6 @@ group("run_perf_test") {
+
data_deps = [
":test_scripts_shared",
- "//third_party/catapult/tracing:convert_chart_json",
]
-
+
if (is_android) {
-diff --git a/src/3rdparty/chromium/third_party/angle/gni/angle.gni b/src/3rdparty/chromium/third_party/angle/gni/angle.gni
-index 31253e3f442..3bf708d5205 100644
---- a/src/3rdparty/chromium/third_party/angle/gni/angle.gni
-+++ b/src/3rdparty/chromium/third_party/angle/gni/angle.gni
-@@ -473,10 +473,6 @@ if (angle_standalone || build_with_chromium) {
+Index: qtwebengine-everywhere-src-6.5.0/src/3rdparty/chromium/third_party/angle/gni/angle.gni
+===================================================================
+--- qtwebengine-everywhere-src-6.5.0.orig/src/3rdparty/chromium/third_party/angle/gni/angle.gni
++++ qtwebengine-everywhere-src-6.5.0/src/3rdparty/chromium/third_party/angle/gni/angle.gni
+@@ -517,10 +517,6 @@ if (angle_standalone || build_with_chrom
if (angle_has_histograms) {
sources +=
[ "$angle_root/src/tests/test_utils/runner/HistogramWriter.cpp" ]
@@ -273,13 +244,13 @@ index 31253e3f442..3bf708d5205 100644
- "//third_party/catapult/tracing/tracing:reserved_infos",
- ]
}
-
+
if (is_mac) {
-diff --git a/src/3rdparty/chromium/third_party/webrtc/test/BUILD.gn b/src/3rdparty/chromium/third_party/webrtc/test/BUILD.gn
-index c89085d5421..36b2889d27c 100644
---- a/src/3rdparty/chromium/third_party/webrtc/test/BUILD.gn
-+++ b/src/3rdparty/chromium/third_party/webrtc/test/BUILD.gn
-@@ -265,10 +265,6 @@ rtc_library("perf_test") {
+Index: qtwebengine-everywhere-src-6.5.0/src/3rdparty/chromium/third_party/webrtc/test/BUILD.gn
+===================================================================
+--- qtwebengine-everywhere-src-6.5.0.orig/src/3rdparty/chromium/third_party/webrtc/test/BUILD.gn
++++ qtwebengine-everywhere-src-6.5.0/src/3rdparty/chromium/third_party/webrtc/test/BUILD.gn
+@@ -304,10 +304,6 @@ rtc_library("perf_test") {
]
if (rtc_enable_protobuf) {
sources += [ "testsupport/perf_test_histogram_writer.cc" ]
@@ -290,18 +261,18 @@ index c89085d5421..36b2889d27c 100644
} else {
sources += [ "testsupport/perf_test_histogram_writer_no_protobuf.cc" ]
}
-@@ -577,7 +573,6 @@ if (rtc_include_tests && !build_with_chromium) {
-
+@@ -684,7 +680,6 @@ if (rtc_include_tests && !build_with_chr
+
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/src/3rdparty/chromium/tools/binary_size/BUILD.gn b/src/3rdparty/chromium/tools/binary_size/BUILD.gn
-index 383ab115e57..e681d1f6e70 100644
---- a/src/3rdparty/chromium/tools/binary_size/BUILD.gn
-+++ b/src/3rdparty/chromium/tools/binary_size/BUILD.gn
+Index: qtwebengine-everywhere-src-6.5.0/src/3rdparty/chromium/tools/binary_size/BUILD.gn
+===================================================================
+--- qtwebengine-everywhere-src-6.5.0.orig/src/3rdparty/chromium/tools/binary_size/BUILD.gn
++++ qtwebengine-everywhere-src-6.5.0/src/3rdparty/chromium/tools/binary_size/BUILD.gn
@@ -20,7 +20,6 @@ python_library("sizes_py") {
pydeps_file = "sizes.pydeps"
data_deps = [
@@ -309,11 +280,11 @@ index 383ab115e57..e681d1f6e70 100644
- "//third_party/catapult/tracing:convert_chart_json",
]
}
-
-diff --git a/src/3rdparty/chromium/tools/grit/BUILD.gn b/src/3rdparty/chromium/tools/grit/BUILD.gn
-index 08f41243caa..c0e1c9e40a9 100644
---- a/src/3rdparty/chromium/tools/grit/BUILD.gn
-+++ b/src/3rdparty/chromium/tools/grit/BUILD.gn
+
+Index: qtwebengine-everywhere-src-6.5.0/src/3rdparty/chromium/tools/grit/BUILD.gn
+===================================================================
+--- qtwebengine-everywhere-src-6.5.0.orig/src/3rdparty/chromium/tools/grit/BUILD.gn
++++ qtwebengine-everywhere-src-6.5.0/src/3rdparty/chromium/tools/grit/BUILD.gn
@@ -33,7 +33,6 @@ group("grit_python_unittests") {
data = [
"//testing/scripts/run_isolated_script_test.py",
@@ -322,48 +293,48 @@ index 08f41243caa..c0e1c9e40a9 100644
"//third_party/node/",
"//third_party/six/src/six.py",
]
-diff --git a/src/3rdparty/chromium/tools/gritsettings/resource_ids.spec b/src/3rdparty/chromium/tools/gritsettings/resource_ids.spec
-index 82699203111..12497514e73 100644
---- a/src/3rdparty/chromium/tools/gritsettings/resource_ids.spec
-+++ b/src/3rdparty/chromium/tools/gritsettings/resource_ids.spec
-@@ -743,12 +743,6 @@
+Index: qtwebengine-everywhere-src-6.5.0/src/3rdparty/chromium/tools/gritsettings/resource_ids.spec
+===================================================================
+--- qtwebengine-everywhere-src-6.5.0.orig/src/3rdparty/chromium/tools/gritsettings/resource_ids.spec
++++ qtwebengine-everywhere-src-6.5.0/src/3rdparty/chromium/tools/gritsettings/resource_ids.spec
+@@ -828,12 +828,6 @@
"content/test/web_ui_mojo_test_resources.grd": {
- "includes": [3860],
+ "includes": [3840],
},
-
- # This file is generated during the build.
- "<(SHARED_INTERMEDIATE_DIR)/content/browser/tracing/tracing_resources.grd": {
- "META": {"sizes": {"includes": [20],}},
-- "includes": [3880],
+- "includes": [3860],
- },
# END content/ section.
-
+
# START ios/web/ section.
-diff --git a/src/3rdparty/chromium/tools/metrics/BUILD.gn b/src/3rdparty/chromium/tools/metrics/BUILD.gn
-index 51583b56257..9334755861c 100644
---- a/src/3rdparty/chromium/tools/metrics/BUILD.gn
-+++ b/src/3rdparty/chromium/tools/metrics/BUILD.gn
+Index: qtwebengine-everywhere-src-6.5.0/src/3rdparty/chromium/tools/metrics/BUILD.gn
+===================================================================
+--- qtwebengine-everywhere-src-6.5.0.orig/src/3rdparty/chromium/tools/metrics/BUILD.gn
++++ qtwebengine-everywhere-src-6.5.0/src/3rdparty/chromium/tools/metrics/BUILD.gn
@@ -45,7 +45,6 @@ group("metrics_python_tests") {
# The run_isolated_script_test.py script and its dependencies.
"//testing/scripts/run_isolated_script_test.py",
"//testing/scripts/common.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/src/3rdparty/chromium/tools/perf/chrome_telemetry_build/BUILD.gn b/src/3rdparty/chromium/tools/perf/chrome_telemetry_build/BUILD.gn
-index 902b24d2e2f..fa729b52f51 100644
---- a/src/3rdparty/chromium/tools/perf/chrome_telemetry_build/BUILD.gn
-+++ b/src/3rdparty/chromium/tools/perf/chrome_telemetry_build/BUILD.gn
-@@ -207,7 +207,6 @@ group("telemetry_chrome_test_without_chrome") {
+Index: qtwebengine-everywhere-src-6.5.0/src/3rdparty/chromium/tools/perf/chrome_telemetry_build/BUILD.gn
+===================================================================
+--- qtwebengine-everywhere-src-6.5.0.orig/src/3rdparty/chromium/tools/perf/chrome_telemetry_build/BUILD.gn
++++ qtwebengine-everywhere-src-6.5.0/src/3rdparty/chromium/tools/perf/chrome_telemetry_build/BUILD.gn
+@@ -181,7 +181,6 @@ group("telemetry_chrome_test_without_chr
]
data_deps = [
"//testing:test_scripts_shared",
- "//third_party/catapult:telemetry_chrome_test_support",
"//tools/metrics:metrics_python_tests",
]
-
-@@ -251,7 +250,5 @@ group("telemetry_chrome_test_without_chrome") {
+
+@@ -225,7 +224,5 @@ group("telemetry_chrome_test_without_chr
"//build/android:devil_chromium_py",
"//build/android:stack_tools",
]
@@ -371,11 +342,11 @@ index 902b24d2e2f..fa729b52f51 100644
- data_deps += [ "//third_party/catapult/telemetry:bitmaptools" ]
}
}
-diff --git a/src/3rdparty/chromium/tools/perf/core/perfetto_binary_roller/BUILD.gn b/src/3rdparty/chromium/tools/perf/core/perfetto_binary_roller/BUILD.gn
-index d7289e158c6..72c9991df95 100644
---- a/src/3rdparty/chromium/tools/perf/core/perfetto_binary_roller/BUILD.gn
-+++ b/src/3rdparty/chromium/tools/perf/core/perfetto_binary_roller/BUILD.gn
-@@ -7,7 +7,6 @@ import("//build/util/generate_wrapper.gni")
+Index: qtwebengine-everywhere-src-6.5.0/src/3rdparty/chromium/tools/perf/core/perfetto_binary_roller/BUILD.gn
+===================================================================
+--- qtwebengine-everywhere-src-6.5.0.orig/src/3rdparty/chromium/tools/perf/core/perfetto_binary_roller/BUILD.gn
++++ qtwebengine-everywhere-src-6.5.0/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 = [
@@ -383,11 +354,11 @@ index d7289e158c6..72c9991df95 100644
"//third_party/perfetto/src/trace_processor:trace_processor_shell",
]
data = [
-diff --git a/src/3rdparty/chromium/tools/polymer/BUILD.gn b/src/3rdparty/chromium/tools/polymer/BUILD.gn
-index 96d13acb93f..79a94d2e3c0 100644
---- a/src/3rdparty/chromium/tools/polymer/BUILD.gn
-+++ b/src/3rdparty/chromium/tools/polymer/BUILD.gn
-@@ -8,7 +8,6 @@ group("polymer_tools_python_unittests") {
+Index: qtwebengine-everywhere-src-6.5.0/src/3rdparty/chromium/tools/polymer/BUILD.gn
+===================================================================
+--- qtwebengine-everywhere-src-6.5.0.orig/src/3rdparty/chromium/tools/polymer/BUILD.gn
++++ qtwebengine-everywhere-src-6.5.0/src/3rdparty/chromium/tools/polymer/BUILD.gn
+@@ -8,7 +8,6 @@ group("polymer_tools_python_unittests")
data = [
"//testing/scripts/run_isolated_script_test.py",
"//tools/polymer/",
@@ -395,12 +366,12 @@ index 96d13acb93f..79a94d2e3c0 100644
]
data_deps = [ "//testing:test_scripts_shared" ]
}
-diff --git a/src/3rdparty/chromium/v8/tools/BUILD.gn b/src/3rdparty/chromium/v8/tools/BUILD.gn
-index 2f8197dd369..83304b6342b 100644
---- a/src/3rdparty/chromium/v8/tools/BUILD.gn
-+++ b/src/3rdparty/chromium/v8/tools/BUILD.gn
-@@ -31,10 +31,6 @@ group("v8_android_test_runner_deps") {
-
+Index: qtwebengine-everywhere-src-6.5.0/src/3rdparty/chromium/v8/tools/BUILD.gn
+===================================================================
+--- qtwebengine-everywhere-src-6.5.0.orig/src/3rdparty/chromium/v8/tools/BUILD.gn
++++ qtwebengine-everywhere-src-6.5.0/src/3rdparty/chromium/v8/tools/BUILD.gn
+@@ -35,10 +35,6 @@ group("v8_android_test_runner_deps") {
+
if (is_android && !build_with_chromium) {
data_deps = [ "//build/android:test_runner_py" ]
- data = [
@@ -409,12 +380,12 @@ index 2f8197dd369..83304b6342b 100644
- ]
}
}
-
-diff --git a/src/3rdparty/chromium/weblayer/shell/BUILD.gn b/src/3rdparty/chromium/weblayer/shell/BUILD.gn
-index 064ff6f8c61..986973881b9 100644
---- a/src/3rdparty/chromium/weblayer/shell/BUILD.gn
-+++ b/src/3rdparty/chromium/weblayer/shell/BUILD.gn
-@@ -192,9 +192,6 @@ repack("support_pak") {
+
+Index: qtwebengine-everywhere-src-6.5.0/src/3rdparty/chromium/weblayer/shell/BUILD.gn
+===================================================================
+--- qtwebengine-everywhere-src-6.5.0.orig/src/3rdparty/chromium/weblayer/shell/BUILD.gn
++++ qtwebengine-everywhere-src-6.5.0/src/3rdparty/chromium/weblayer/shell/BUILD.gn
+@@ -183,9 +183,6 @@ repack("support_pak") {
}
if (is_android) {
deps += [ "//ui/android:ui_java_resources" ]
@@ -424,4 +395,3 @@ index 064ff6f8c61..986973881b9 100644
}
output = "$root_out_dir/weblayer_support.pak"
}
---
diff --git a/debian/patches/remove_catapult_core.patch b/debian/patches/remove_catapult_core.patch
index 7ed6f70..b3a4ef8 100644
--- a/debian/patches/remove_catapult_core.patch
+++ b/debian/patches/remove_catapult_core.patch
@@ -2,21 +2,23 @@ Author: Patrick Franz <deltaone at debian.org>
Description: Remove dependencies on catapult from src/core
Forwarded: not-needed
---- a/src/core/configure/BUILD.root.gn.in
-+++ b/src/core/configure/BUILD.root.gn.in
-@@ -445,7 +445,6 @@ repack("qtwebengine_repack_resources") {
+Index: qtwebengine-everywhere-src-6.5.0/src/core/configure/BUILD.root.gn.in
+===================================================================
+--- qtwebengine-everywhere-src-6.5.0.orig/src/core/configure/BUILD.root.gn.in
++++ qtwebengine-everywhere-src-6.5.0/src/core/configure/BUILD.root.gn.in
+@@ -529,7 +529,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/content/quota_internals_resources.pak",
-@@ -463,7 +462,6 @@ repack("qtwebengine_repack_resources") {
+ "$root_gen_dir/content/indexed_db_resources.pak",
+@@ -548,7 +547,6 @@ repack("qtwebengine_repack_resources") {
"//components/resources:components_resources_grit",
"//components/resources:dev_ui_components_resources_grit",
"//content/browser/resources/media:resources",
- "//content/browser/tracing:resources",
"//content:content_resources",
+ "//content/browser/resources/indexed_db:resources",
"//content/browser/resources/quota:resources",
- "//content:dev_ui_content_resources_grit",
diff --git a/debian/patches/support-i386.patch b/debian/patches/support-i386.patch
index a147946..24e247d 100644
--- a/debian/patches/support-i386.patch
+++ b/debian/patches/support-i386.patch
@@ -10,16 +10,18 @@ still support i386] can patch the file."
At this point, i386 on linux is completely unsupported upstream, so
we're on our own with bugs.
---- a/src/3rdparty/chromium/BUILD.gn
-+++ b/src/3rdparty/chromium/BUILD.gn
-@@ -1538,9 +1538,7 @@ if (!is_ios && !use_qt) {
+Index: qtwebengine-everywhere-src-6.5.0/src/3rdparty/chromium/BUILD.gn
+===================================================================
+--- qtwebengine-everywhere-src-6.5.0.orig/src/3rdparty/chromium/BUILD.gn
++++ qtwebengine-everywhere-src-6.5.0/src/3rdparty/chromium/BUILD.gn
+@@ -1635,9 +1635,7 @@ if (!is_ios && !is_qtwebengine) {
}
-
+
# TODO(cassew): Add more OS's that don't support x86.
-is_valid_x86_target =
- target_os != "ios" && target_os != "mac" &&
- (target_os != "linux" || use_libfuzzer || !build_with_chromium)
+is_valid_x86_target = true
+
+ # Note: v8_target_cpu == arm allows using the V8 arm simulator on x86 for fuzzing.
assert(
- is_valid_x86_target || target_cpu != "x86",
- "'target_cpu=x86' is not supported for 'target_os=$target_os'. Consider omitting 'target_cpu' (default) or using 'target_cpu=x64' instead.")
More information about the Neon-commits
mailing list