[neon/qt6/qt6-webengine/Neon/unstable] debian/patches: refresh patches
Carlos De Maine
null at kde.org
Wed Aug 30 23:18:10 BST 2023
Git commit b5115ac25c59cd4e939162eb3ec23b1bbbdaa2b9 by Carlos De Maine.
Committed on 31/08/2023 at 00:17.
Pushed by carlosdem into branch 'Neon/unstable'.
refresh patches
M +3 -5 debian/patches/compressing_files.patch
M +6 -8 debian/patches/reduce_debugging_info.patch
M +74 -140 debian/patches/remove_catapult_3rdparty.patch
M +6 -8 debian/patches/remove_catapult_core.patch
M +3 -5 debian/patches/support-i386.patch
https://invent.kde.org/neon/qt6/qt6-webengine/-/commit/b5115ac25c59cd4e939162eb3ec23b1bbbdaa2b9
diff --git a/debian/patches/compressing_files.patch b/debian/patches/compressing_files.patch
index aaa1576..e9943aa 100644
--- a/debian/patches/compressing_files.patch
+++ b/debian/patches/compressing_files.patch
@@ -3,11 +3,9 @@ Description: Building on 32-bit architectures fails when trying to compress
files in the devtools-frontend.
Forwarded: not-needed
-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) {
+--- 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
+@@ -75,7 +75,16 @@
const fileList = argv[fileListPosition + 1];
const fileListContents = await readTextFile(fileList);
const files = fileListContents.split(' ');
diff --git a/debian/patches/reduce_debugging_info.patch b/debian/patches/reduce_debugging_info.patch
index b4304e9..fcce729 100644
--- a/debian/patches/reduce_debugging_info.patch
+++ b/debian/patches/reduce_debugging_info.patch
@@ -1,11 +1,9 @@
-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") {
+--- a/src/3rdparty/chromium/build/config/compiler/BUILD.gn
++++ b/src/3rdparty/chromium/build/config/compiler/BUILD.gn
+@@ -2682,7 +2682,7 @@
+ # Keeping -g2 for saigo as it's the only toolchain whose artifacts that are
+ # part of chromium release (other nacl toolchains are used only for tests).
+ if ((!is_nacl || is_nacl_saigo) && current_os != "zos") {
- cflags += [ "-g2" ]
+ cflags += [ "-g1" ]
}
diff --git a/debian/patches/remove_catapult_3rdparty.patch b/debian/patches/remove_catapult_3rdparty.patch
index afa7727..2a1d6a5 100644
--- a/debian/patches/remove_catapult_3rdparty.patch
+++ b/debian/patches/remove_catapult_3rdparty.patch
@@ -2,11 +2,9 @@ Author: Patrick Franz <deltaone at debian.org>
Description: Remove dependencies on catapult from src/3rdparty
Forwarded: not-needed
-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){
+--- a/src/3rdparty/chromium/BUILD.gn
++++ b/src/3rdparty/chromium/BUILD.gn
+@@ -249,7 +249,6 @@
deps += [
"//google_apis/gcm:mcs_probe",
"//media/cast:cast_unittests",
@@ -14,23 +12,23 @@ Index: qtwebengine-everywhere-src-6.5.0/src/3rdparty/chromium/BUILD.gn
]
if (!is_android) {
if (!is_castos) {
-@@ -370,7 +369,6 @@ if (!is_qtwebengine){
- "//services:services_junit_tests",
+@@ -381,7 +380,6 @@
"//testing/android/junit:junit_unit_tests",
"//third_party/android_build_tools/lint:custom_lint_java",
+ "//third_party/androidx_javascriptengine",
- "//third_party/catapult/devil",
"//third_party/r8:custom_d8_java",
"//tools/android:android_tools",
"//tools/android:memconsumer",
-@@ -1149,7 +1147,6 @@ if (!is_ios && !is_qtwebengine) {
+@@ -1124,7 +1122,6 @@
"//chrome:chrome",
- "//chrome/test/chromedriver",
+ "//chrome/test/chromedriver:chromedriver_server",
"//testing:test_scripts_shared",
- "//third_party/catapult/third_party/typ",
]
if (is_win) {
data_deps += [ "//build/win:copy_cdb_to_output" ]
-@@ -1198,7 +1195,6 @@ if (!is_ios && !is_qtwebengine) {
+@@ -1177,7 +1174,6 @@
"//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,7 +36,7 @@ Index: qtwebengine-everywhere-src-6.5.0/src/3rdparty/chromium/BUILD.gn
"//third_party/hyphenation-patterns:test_data",
"//third_party/mesa_headers",
"//tools/imagediff",
-@@ -1274,7 +1270,6 @@ if (!is_ios && !is_qtwebengine) {
+@@ -1254,7 +1250,6 @@
if (is_android) {
data += [
@@ -46,10 +44,10 @@ Index: qtwebengine-everywhere-src-6.5.0/src/3rdparty/chromium/BUILD.gn
"//build/android/",
]
}
-@@ -1627,10 +1622,6 @@ if (!is_ios && !is_qtwebengine) {
- "//third_party/blink/web_tests/StaleTestExpectations",
+@@ -1630,10 +1625,6 @@
"//third_party/blink/web_tests/TestExpectations",
"//third_party/blink/web_tests/VirtualTestSuites",
+ "//third_party/blink/web_tests/W3CImportExpectations",
- "//third_party/catapult/common/py_utils/",
- "//third_party/catapult/devil/",
- "//third_party/catapult/dependency_manager/",
@@ -57,11 +55,9 @@ Index: qtwebengine-everywhere-src-6.5.0/src/3rdparty/chromium/BUILD.gn
"//third_party/depot_tools/pylint-1.5",
"//third_party/depot_tools/pylint_main.py",
"//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") {
+--- a/src/3rdparty/chromium/chrome/chrome_paks.gni
++++ b/src/3rdparty/chromium/chrome/chrome_paks.gni
+@@ -189,7 +189,6 @@
"$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",
@@ -69,7 +65,7 @@ Index: qtwebengine-everywhere-src-6.5.0/src/3rdparty/chromium/chrome/chrome_paks
]
deps += [
"//chrome/browser/resources:component_extension_resources",
-@@ -205,7 +204,6 @@ template("chrome_extra_paks") {
+@@ -230,7 +229,6 @@
"//chrome/browser/resources/webui_gallery:resources",
"//chrome/browser/resources/whats_new:resources",
"//content/browser/devtools:devtools_resources",
@@ -77,37 +73,9 @@ Index: qtwebengine-everywhere-src-6.5.0/src/3rdparty/chromium/chrome/chrome_paks
]
if (is_chrome_branded) {
sources += [
-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) {
-@@ -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) {
-@@ -10792,7 +10788,6 @@ if (!is_android) {
- "//skia",
- "//testing/gmock",
- "//testing/gtest",
-- "//third_party/catapult:telemetry_chrome_test_support",
- "//third_party/hunspell",
- "//third_party/icu",
- "//third_party/libpng",
-@@ -10843,7 +10838,6 @@ if (!is_android) {
+--- a/src/3rdparty/chromium/chrome/test/BUILD.gn
++++ b/src/3rdparty/chromium/chrome/test/BUILD.gn
+@@ -10814,7 +10814,6 @@
deps = [ "//tools/perf/chrome_telemetry_build:telemetry_chrome_test" ]
data = [
@@ -115,22 +83,18 @@ Index: qtwebengine-everywhere-src-6.5.0/src/3rdparty/chromium/chrome/test/BUILD.
"//tools/perf/run_telemetry_tests",
"//testing/scripts/run_telemetry_as_googletest.py",
]
-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) {
+--- a/src/3rdparty/chromium/content/browser/BUILD.gn
++++ b/src/3rdparty/chromium/content/browser/BUILD.gn
+@@ -3220,7 +3220,6 @@
deps += [
"//components/vector_icons",
+ "//content/browser/devtools:devtools_resources_extern",
- "//content/browser/tracing:resources",
]
- sources += [
- # Non-Android platforms that don't presently support
-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
+ }
+
+--- a/src/3rdparty/chromium/content/browser/tracing/BUILD.gn
++++ b/src/3rdparty/chromium/content/browser/tracing/BUILD.gn
@@ -1,39 +0,0 @@
-# Copyright 2014 The Chromium Authors
-# Use of this source code is governed by a BSD-style license that can be
@@ -171,10 +135,8 @@ Index: qtwebengine-everywhere-src-6.5.0/src/3rdparty/chromium/content/browser/tr
-
- deps = [ ":build_grd" ]
-}
-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
+--- a/src/3rdparty/chromium/content/browser/tracing/tracing_ui.cc
++++ b/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"
@@ -183,7 +145,7 @@ Index: qtwebengine-everywhere-src-6.5.0/src/3rdparty/chromium/content/browser/tr
#include "content/browser/tracing/tracing_controller_impl.h"
#include "content/public/browser/browser_context.h"
#include "content/public/browser/browser_thread.h"
-@@ -240,8 +239,6 @@ TracingUI::TracingUI(WebUI* web_ui)
+@@ -241,8 +240,6 @@
web_ui->GetWebContents()->GetBrowserContext(), kChromeUITracingHost);
source->DisableTrustedTypesCSP();
source->UseStringsJs();
@@ -192,11 +154,9 @@ Index: qtwebengine-everywhere-src-6.5.0/src/3rdparty/chromium/content/browser/tr
source->SetRequestFilter(base::BindRepeating(OnShouldHandleRequest),
base::BindRepeating(OnTracingRequest));
-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") {
+--- a/src/3rdparty/chromium/content/shell/BUILD.gn
++++ b/src/3rdparty/chromium/content/shell/BUILD.gn
+@@ -496,11 +496,6 @@
"//ui/strings",
]
@@ -208,22 +168,18 @@ Index: qtwebengine-everywhere-src-6.5.0/src/3rdparty/chromium/content/shell/BUIL
if (shell_use_toolkit_views) {
deps += [ "//ui/views/resources" ]
sources +=
-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") {
+--- a/src/3rdparty/chromium/mojo/public/tools/BUILD.gn
++++ b/src/3rdparty/chromium/mojo/public/tools/BUILD.gn
+@@ -17,6 +17,5 @@
]
data_deps = [
"//testing:test_scripts_shared",
- "//third_party/catapult/third_party/typ/",
]
}
-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") {
+--- a/src/3rdparty/chromium/testing/BUILD.gn
++++ b/src/3rdparty/chromium/testing/BUILD.gn
+@@ -45,7 +45,6 @@
data_deps = [
":test_scripts_shared",
@@ -231,11 +187,9 @@ Index: qtwebengine-everywhere-src-6.5.0/src/3rdparty/chromium/testing/BUILD.gn
]
if (is_android) {
-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
+--- a/src/3rdparty/chromium/third_party/angle/gni/angle.gni
++++ b/src/3rdparty/chromium/third_party/angle/gni/angle.gni
+@@ -528,10 +528,6 @@
if (angle_has_histograms) {
sources +=
[ "$angle_root/src/tests/test_utils/runner/HistogramWriter.cpp" ]
@@ -246,11 +200,9 @@ Index: qtwebengine-everywhere-src-6.5.0/src/3rdparty/chromium/third_party/angle/
}
if (is_mac) {
-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") {
+--- a/src/3rdparty/chromium/third_party/webrtc/test/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/webrtc/test/BUILD.gn
+@@ -322,10 +322,6 @@
]
if (rtc_enable_protobuf) {
sources += [ "testsupport/perf_test_histogram_writer.cc" ]
@@ -261,7 +213,7 @@ Index: qtwebengine-everywhere-src-6.5.0/src/3rdparty/chromium/third_party/webrtc
} else {
sources += [ "testsupport/perf_test_histogram_writer_no_protobuf.cc" ]
}
-@@ -684,7 +680,6 @@ if (rtc_include_tests && !build_with_chr
+@@ -714,7 +710,6 @@
if (rtc_enable_protobuf) {
sources += [ "testsupport/perf_test_histogram_writer_unittest.cc" ]
@@ -269,11 +221,9 @@ Index: qtwebengine-everywhere-src-6.5.0/src/3rdparty/chromium/third_party/webrtc
}
data = test_support_unittests_resources
-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") {
+--- a/src/3rdparty/chromium/tools/binary_size/BUILD.gn
++++ b/src/3rdparty/chromium/tools/binary_size/BUILD.gn
+@@ -20,7 +20,6 @@
pydeps_file = "sizes.pydeps"
data_deps = [
"//build/util:test_results",
@@ -281,23 +231,19 @@ Index: qtwebengine-everywhere-src-6.5.0/src/3rdparty/chromium/tools/binary_size/
]
}
-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") {
+--- a/src/3rdparty/chromium/tools/grit/BUILD.gn
++++ b/src/3rdparty/chromium/tools/grit/BUILD.gn
+@@ -33,7 +33,6 @@
data = [
"//testing/scripts/run_isolated_script_test.py",
"//tools/grit/",
- "//third_party/catapult/third_party/typ/",
"//third_party/node/",
- "//third_party/six/src/six.py",
]
-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 @@
+ }
+--- a/src/3rdparty/chromium/tools/gritsettings/resource_ids.spec
++++ b/src/3rdparty/chromium/tools/gritsettings/resource_ids.spec
+@@ -918,12 +918,6 @@
"content/test/web_ui_mojo_test_resources.grd": {
"includes": [3840],
},
@@ -310,11 +256,9 @@ Index: qtwebengine-everywhere-src-6.5.0/src/3rdparty/chromium/tools/gritsettings
# END content/ section.
# START ios/web/ section.
-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") {
+--- a/src/3rdparty/chromium/tools/metrics/BUILD.gn
++++ b/src/3rdparty/chromium/tools/metrics/BUILD.gn
+@@ -45,7 +45,6 @@
# The run_isolated_script_test.py script and its dependencies.
"//testing/scripts/run_isolated_script_test.py",
"//testing/scripts/common.py",
@@ -322,11 +266,9 @@ Index: qtwebengine-everywhere-src-6.5.0/src/3rdparty/chromium/tools/metrics/BUIL
# Scripts we depend on. Their unit tests are also included.
"//tools/json_comment_eater/json_comment_eater.py",
-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
+--- a/src/3rdparty/chromium/tools/perf/chrome_telemetry_build/BUILD.gn
++++ b/src/3rdparty/chromium/tools/perf/chrome_telemetry_build/BUILD.gn
+@@ -181,7 +181,6 @@
]
data_deps = [
"//testing:test_scripts_shared",
@@ -334,7 +276,7 @@ Index: qtwebengine-everywhere-src-6.5.0/src/3rdparty/chromium/tools/perf/chrome_
"//tools/metrics:metrics_python_tests",
]
-@@ -225,7 +224,5 @@ group("telemetry_chrome_test_without_chr
+@@ -225,7 +224,5 @@
"//build/android:devil_chromium_py",
"//build/android:stack_tools",
]
@@ -342,11 +284,9 @@ Index: qtwebengine-everywhere-src-6.5.0/src/3rdparty/chromium/tools/perf/chrome_
- data_deps += [ "//third_party/catapult/telemetry:bitmaptools" ]
}
}
-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
+--- 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 @@
generate_wrapper("upload_trace_processor") {
testonly = true
data_deps = [
@@ -354,11 +294,9 @@ Index: qtwebengine-everywhere-src-6.5.0/src/3rdparty/chromium/tools/perf/core/pe
"//third_party/perfetto/src/trace_processor:trace_processor_shell",
]
data = [
-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")
+--- a/src/3rdparty/chromium/tools/polymer/BUILD.gn
++++ b/src/3rdparty/chromium/tools/polymer/BUILD.gn
+@@ -8,7 +8,6 @@
data = [
"//testing/scripts/run_isolated_script_test.py",
"//tools/polymer/",
@@ -366,11 +304,9 @@ Index: qtwebengine-everywhere-src-6.5.0/src/3rdparty/chromium/tools/polymer/BUIL
]
data_deps = [ "//testing:test_scripts_shared" ]
}
-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") {
+--- a/src/3rdparty/chromium/v8/tools/BUILD.gn
++++ b/src/3rdparty/chromium/v8/tools/BUILD.gn
+@@ -38,10 +38,6 @@
if (is_android && !build_with_chromium) {
data_deps = [ "//build/android:test_runner_py" ]
@@ -381,11 +317,9 @@ Index: qtwebengine-everywhere-src-6.5.0/src/3rdparty/chromium/v8/tools/BUILD.gn
}
}
-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") {
+--- a/src/3rdparty/chromium/weblayer/shell/BUILD.gn
++++ b/src/3rdparty/chromium/weblayer/shell/BUILD.gn
+@@ -183,9 +183,6 @@
}
if (is_android) {
deps += [ "//ui/android:ui_java_resources" ]
diff --git a/debian/patches/remove_catapult_core.patch b/debian/patches/remove_catapult_core.patch
index b3a4ef8..e07f854 100644
--- a/debian/patches/remove_catapult_core.patch
+++ b/debian/patches/remove_catapult_core.patch
@@ -2,21 +2,19 @@ Author: Patrick Franz <deltaone at debian.org>
Description: Remove dependencies on catapult from src/core
Forwarded: not-needed
-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",
+--- a/src/core/configure/BUILD.root.gn.in
++++ b/src/core/configure/BUILD.root.gn.in
+@@ -551,7 +551,6 @@
"$root_gen_dir/components/dev_ui_components_resources.pak",
+ "$root_gen_dir/content/attribution_internals_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/indexed_db_resources.pak",
-@@ -548,7 +547,6 @@ repack("qtwebengine_repack_resources") {
- "//components/resources:components_resources_grit",
+@@ -571,7 +570,6 @@
"//components/resources:dev_ui_components_resources_grit",
+ "//content/browser/resources/attribution_reporting:resources",
"//content/browser/resources/media:resources",
- "//content/browser/tracing:resources",
"//content:content_resources",
diff --git a/debian/patches/support-i386.patch b/debian/patches/support-i386.patch
index 24e247d..161eed9 100644
--- a/debian/patches/support-i386.patch
+++ b/debian/patches/support-i386.patch
@@ -10,11 +10,9 @@ 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.
-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) {
+--- a/src/3rdparty/chromium/BUILD.gn
++++ b/src/3rdparty/chromium/BUILD.gn
+@@ -1638,9 +1638,7 @@
}
# TODO(cassew): Add more OS's that don't support x86.
More information about the Neon-commits
mailing list