[neon/qt6/qt6-webengine/Neon/release] debian/patches: refresh patches
Carlos De Maine
null at kde.org
Fri Apr 5 01:50:35 BST 2024
Git commit fd5f0f85de751a94850eb70f3683a90a030ae645 by Carlos De Maine.
Committed on 05/04/2024 at 00:50.
Pushed by carlosdem into branch 'Neon/release'.
refresh patches
M +1 -1 debian/patches/reduce_debugging_info.patch
M +49 -59 debian/patches/remove_catapult_3rdparty.patch
M +9 -9 debian/patches/remove_catapult_core.patch
M +1 -1 debian/patches/support-i386.patch
https://invent.kde.org/neon/qt6/qt6-webengine/-/commit/fd5f0f85de751a94850eb70f3683a90a030ae645
diff --git a/debian/patches/reduce_debugging_info.patch b/debian/patches/reduce_debugging_info.patch
index fcce729..759fb89 100644
--- a/debian/patches/reduce_debugging_info.patch
+++ b/debian/patches/reduce_debugging_info.patch
@@ -1,6 +1,6 @@
--- a/src/3rdparty/chromium/build/config/compiler/BUILD.gn
+++ b/src/3rdparty/chromium/build/config/compiler/BUILD.gn
-@@ -2682,7 +2682,7 @@
+@@ -2865,7 +2865,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") {
diff --git a/debian/patches/remove_catapult_3rdparty.patch b/debian/patches/remove_catapult_3rdparty.patch
index af76576..ecbe323 100644
--- a/debian/patches/remove_catapult_3rdparty.patch
+++ b/debian/patches/remove_catapult_3rdparty.patch
@@ -4,39 +4,31 @@ Forwarded: not-needed
--- 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",
-- "//third_party/catapult/telemetry:bitmaptools($host_toolchain)",
- ]
- if (!is_android) {
- if (!is_castos) {
-@@ -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",
-@@ -1124,7 +1122,6 @@
- "//chrome:chrome",
- "//chrome/test/chromedriver:chromedriver_server",
- "//testing:test_scripts_shared",
-- "//third_party/catapult/third_party/typ",
+@@ -242,7 +242,6 @@
+ if (!is_ios) {
+ deps += [
+ "//google_apis/gcm:mcs_probe",
+- "//third_party/catapult/telemetry:bitmaptools($host_toolchain)",
]
- if (is_win) {
- data_deps += [ "//build/win:copy_cdb_to_output" ]
-@@ -1177,7 +1174,6 @@
+ if (!is_android) {
+ if (!is_castos) {
+@@ -376,7 +375,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/jni_zero/samples:jni_generator_tests",
+ "//third_party/r8:custom_d8_java",
+ "//tools/android:android_tools",
+@@ -1164,7 +1162,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",
+ "//third_party/blink/renderer/core:gen_files_for_web_tests",
- "//third_party/catapult/third_party/typ",
"//third_party/hyphenation-patterns:test_data",
"//third_party/mesa_headers",
"//tools/imagediff",
-@@ -1254,7 +1250,6 @@
+@@ -1243,7 +1240,6 @@
if (is_android) {
data += [
@@ -44,20 +36,20 @@ Forwarded: not-needed
"//build/android/",
]
}
-@@ -1630,10 +1625,6 @@
- "//third_party/blink/web_tests/TestExpectations",
+@@ -1609,10 +1605,6 @@
"//third_party/blink/web_tests/VirtualTestSuites",
"//third_party/blink/web_tests/W3CImportExpectations",
+ "//third_party/blink/web_tests/paint/invalidation/repaint-overlay/",
- "//third_party/catapult/common/py_utils/",
- "//third_party/catapult/devil/",
- "//third_party/catapult/dependency_manager/",
- "//third_party/catapult/third_party/typ/",
- "//third_party/depot_tools/pylint-1.5",
+ "//third_party/depot_tools/pylint-2.7",
"//third_party/depot_tools/pylint_main.py",
"//third_party/depot_tools/pylintrc",
--- a/src/3rdparty/chromium/chrome/chrome_paks.gni
+++ b/src/3rdparty/chromium/chrome/chrome_paks.gni
-@@ -189,7 +189,6 @@
+@@ -190,13 +190,11 @@
"$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",
@@ -65,9 +57,7 @@ Forwarded: not-needed
]
deps += [
"//chrome/browser/resources:component_extension_resources",
-@@ -230,7 +229,6 @@
- "//chrome/browser/resources/webui_gallery:resources",
- "//chrome/browser/resources/whats_new:resources",
+ "//chrome/browser/resources:dev_ui_paks",
"//content/browser/devtools:devtools_resources",
- "//content/browser/tracing:resources",
]
@@ -75,7 +65,7 @@ Forwarded: not-needed
sources += [
--- a/src/3rdparty/chromium/chrome/test/BUILD.gn
+++ b/src/3rdparty/chromium/chrome/test/BUILD.gn
-@@ -10814,7 +10814,6 @@
+@@ -11643,7 +11643,6 @@
deps = [ "//tools/perf/chrome_telemetry_build:telemetry_chrome_test" ]
data = [
@@ -85,10 +75,10 @@ Forwarded: not-needed
]
--- a/src/3rdparty/chromium/content/browser/BUILD.gn
+++ b/src/3rdparty/chromium/content/browser/BUILD.gn
-@@ -3230,7 +3230,6 @@
+@@ -3391,7 +3391,6 @@
deps += [
"//components/vector_icons",
- "//content/browser/devtools:devtools_resources_extern",
+ "//components/webauthn/json",
- "//content/browser/tracing:resources",
]
}
@@ -156,18 +146,18 @@ Forwarded: not-needed
base::BindRepeating(OnTracingRequest));
--- a/src/3rdparty/chromium/content/shell/BUILD.gn
+++ b/src/3rdparty/chromium/content/shell/BUILD.gn
-@@ -496,11 +496,6 @@
- "//ui/strings",
- ]
+@@ -533,11 +533,6 @@
+ sources += [ "$root_gen_dir/content/webxr_internals_resources.pak" ]
+ }
- if (!is_android) {
- deps += [ "//content/browser/tracing:resources" ]
- sources += [ "$root_gen_dir/content/browser/tracing/tracing_resources.pak" ]
- }
-
- if (shell_use_toolkit_views) {
- deps += [ "//ui/views/resources" ]
- sources +=
+ if (is_ios) {
+ sources += [
+ "$root_gen_dir/device/bluetooth/strings/bluetooth_strings_en-US.pak",
--- a/src/3rdparty/chromium/mojo/public/tools/BUILD.gn
+++ b/src/3rdparty/chromium/mojo/public/tools/BUILD.gn
@@ -17,6 +17,5 @@
@@ -179,7 +169,7 @@ Forwarded: not-needed
}
--- a/src/3rdparty/chromium/testing/BUILD.gn
+++ b/src/3rdparty/chromium/testing/BUILD.gn
-@@ -45,7 +45,6 @@
+@@ -75,7 +75,6 @@
data_deps = [
":test_scripts_shared",
@@ -189,7 +179,7 @@ Forwarded: not-needed
if (is_android) {
--- a/src/3rdparty/chromium/third_party/angle/gni/angle.gni
+++ b/src/3rdparty/chromium/third_party/angle/gni/angle.gni
-@@ -528,10 +528,6 @@
+@@ -563,10 +563,6 @@
if (angle_has_histograms) {
sources +=
[ "$angle_root/src/tests/test_utils/runner/HistogramWriter.cpp" ]
@@ -202,7 +192,7 @@ Forwarded: not-needed
if (is_mac) {
--- a/src/3rdparty/chromium/third_party/webrtc/test/BUILD.gn
+++ b/src/3rdparty/chromium/third_party/webrtc/test/BUILD.gn
-@@ -322,10 +322,6 @@
+@@ -395,10 +395,6 @@
]
if (rtc_enable_protobuf) {
sources += [ "testsupport/perf_test_histogram_writer.cc" ]
@@ -213,14 +203,14 @@ Forwarded: not-needed
} else {
sources += [ "testsupport/perf_test_histogram_writer_no_protobuf.cc" ]
}
-@@ -714,7 +710,6 @@
+@@ -795,7 +791,6 @@
- if (rtc_enable_protobuf) {
- sources += [ "testsupport/perf_test_histogram_writer_unittest.cc" ]
-- deps += [ "//third_party/catapult/tracing/tracing:histogram" ]
- }
+ if (rtc_enable_protobuf) {
+ sources += [ "testsupport/perf_test_histogram_writer_unittest.cc" ]
+- deps += [ "//third_party/catapult/tracing/tracing:histogram" ]
+ }
- data = test_support_unittests_resources
+ data = test_support_unittests_resources
--- a/src/3rdparty/chromium/tools/binary_size/BUILD.gn
+++ b/src/3rdparty/chromium/tools/binary_size/BUILD.gn
@@ -20,7 +20,6 @@
@@ -243,19 +233,19 @@ Forwarded: not-needed
}
--- a/src/3rdparty/chromium/tools/gritsettings/resource_ids.spec
+++ b/src/3rdparty/chromium/tools/gritsettings/resource_ids.spec
-@@ -918,12 +918,6 @@
+@@ -1018,12 +1018,6 @@
"content/test/web_ui_mojo_test_resources.grd": {
- "includes": [3840],
+ "includes": [6340],
},
-
- # This file is generated during the build.
- "<(SHARED_INTERMEDIATE_DIR)/content/browser/tracing/tracing_resources.grd": {
- "META": {"sizes": {"includes": [20],}},
-- "includes": [3860],
+- "includes": [6360],
- },
# END content/ section.
- # START ios/web/ section.
+ # START "everything else" section.
--- a/src/3rdparty/chromium/tools/metrics/BUILD.gn
+++ b/src/3rdparty/chromium/tools/metrics/BUILD.gn
@@ -45,7 +45,6 @@
@@ -268,7 +258,7 @@ Forwarded: not-needed
"//tools/json_comment_eater/json_comment_eater.py",
--- 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 @@
+@@ -167,7 +167,6 @@
]
data_deps = [
"//testing:test_scripts_shared",
@@ -276,7 +266,7 @@ Forwarded: not-needed
"//tools/metrics:metrics_python_tests",
]
-@@ -225,7 +224,5 @@
+@@ -219,7 +218,5 @@
"//build/android:devil_chromium_py",
"//build/android:stack_tools",
]
@@ -306,7 +296,7 @@ Forwarded: not-needed
}
--- a/src/3rdparty/chromium/v8/tools/BUILD.gn
+++ b/src/3rdparty/chromium/v8/tools/BUILD.gn
-@@ -38,10 +38,6 @@
+@@ -37,10 +37,6 @@
if (is_android && !build_with_chromium) {
data_deps = [ "//build/android:test_runner_py" ]
@@ -319,7 +309,7 @@ Forwarded: not-needed
--- a/src/3rdparty/chromium/weblayer/shell/BUILD.gn
+++ b/src/3rdparty/chromium/weblayer/shell/BUILD.gn
-@@ -183,9 +183,6 @@
+@@ -182,9 +182,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 e07f854..afd118e 100644
--- a/debian/patches/remove_catapult_core.patch
+++ b/debian/patches/remove_catapult_core.patch
@@ -4,19 +4,19 @@ Forwarded: not-needed
--- a/src/core/configure/BUILD.root.gn.in
+++ b/src/core/configure/BUILD.root.gn.in
-@@ -551,7 +551,6 @@
+@@ -574,7 +574,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",
-@@ -571,7 +570,6 @@
- "//components/resources:dev_ui_components_resources_grit",
- "//content/browser/resources/attribution_reporting:resources",
- "//content/browser/resources/media:resources",
+ "$root_gen_dir/content/gpu_resources.pak",
+ "$root_gen_dir/content/histograms_resources.pak",
+@@ -606,7 +605,6 @@
+ "//content/browser/resources/process:resources",
+ "//content/browser/resources/quota:resources",
+ "//content/browser/resources/service_worker:resources",
- "//content/browser/tracing:resources",
"//content:content_resources",
- "//content/browser/resources/indexed_db:resources",
- "//content/browser/resources/quota:resources",
+ "//mojo/public/js:resources",
+ "//net:net_resources_grit",
diff --git a/debian/patches/support-i386.patch b/debian/patches/support-i386.patch
index 161eed9..84fdd5e 100644
--- a/debian/patches/support-i386.patch
+++ b/debian/patches/support-i386.patch
@@ -12,7 +12,7 @@ we're on our own with bugs.
--- a/src/3rdparty/chromium/BUILD.gn
+++ b/src/3rdparty/chromium/BUILD.gn
-@@ -1638,9 +1638,7 @@
+@@ -1619,9 +1619,7 @@
}
# TODO(cassew): Add more OS's that don't support x86.
More information about the Neon-commits
mailing list