[neon/qt6/qt6-webengine/Neon/release] debian: lints
Carlos De Maine
null at kde.org
Sun Feb 9 03:17:20 GMT 2025
Git commit 45e8c46c5fd4559cd3970b34d1a538cbb06d4e9f by Carlos De Maine.
Committed on 09/02/2025 at 03:16.
Pushed by carlosdem into branch 'Neon/release'.
lints
D +0 -331 debian/patches/remove_catapult_3rdparty.patch
D +0 -22 debian/patches/remove_catapult_core.patch
M +4 -4 debian/qt6-webengine.lintian-overrides
https://invent.kde.org/neon/qt6/qt6-webengine/-/commit/45e8c46c5fd4559cd3970b34d1a538cbb06d4e9f
diff --git a/debian/patches/remove_catapult_3rdparty.patch b/debian/patches/remove_catapult_3rdparty.patch
deleted file mode 100644
index d19c51e..0000000
--- a/debian/patches/remove_catapult_3rdparty.patch
+++ /dev/null
@@ -1,331 +0,0 @@
-Author: Patrick Franz <deltaone at debian.org>
-Description: Remove dependencies on catapult from src/3rdparty
-Forwarded: not-needed
-
---- a/src/3rdparty/chromium/BUILD.gn
-+++ b/src/3rdparty/chromium/BUILD.gn
-@@ -242,7 +242,6 @@
- if (!is_ios) {
- deps += [
- "//google_apis/gcm:mcs_probe",
-- "//third_party/catapult/telemetry:bitmaptools($host_toolchain)",
- ]
- 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:gen_files_for_web_tests",
-- "//third_party/catapult/third_party/typ",
- "//third_party/hyphenation-patterns:test_data",
- "//third_party/mesa_headers",
- "//tools/imagediff",
-@@ -1243,7 +1240,6 @@
-
- if (is_android) {
- data += [
-- "//third_party/catapult/",
- "//build/android/",
- ]
- }
-@@ -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-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
-@@ -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",
-- "$root_gen_dir/content/browser/tracing/tracing_resources.pak",
- ]
- deps += [
- "//chrome/browser/resources:component_extension_resources",
- "//chrome/browser/resources:dev_ui_paks",
- "//content/browser/devtools:devtools_resources",
-- "//content/browser/tracing:resources",
- ]
- if (is_chrome_branded) {
- sources += [
---- a/src/3rdparty/chromium/chrome/test/BUILD.gn
-+++ b/src/3rdparty/chromium/chrome/test/BUILD.gn
-@@ -11643,7 +11643,6 @@
- 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",
- ]
---- a/src/3rdparty/chromium/content/browser/BUILD.gn
-+++ b/src/3rdparty/chromium/content/browser/BUILD.gn
-@@ -3391,7 +3391,6 @@
- deps += [
- "//components/vector_icons",
- "//components/webauthn/json",
-- "//content/browser/tracing:resources",
- ]
- }
-
---- 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
--# found in the LICENSE file.
--
--import("//tools/grit/grit_rule.gni")
--import("//ui/webui/resources/tools/generate_grd.gni")
--
--assert(!is_android)
--
--# 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 = "$target_gen_dir/tracing_resources.grd"
--
--generate_grd("build_grd") {
-- grd_prefix = "tracing"
-- out_grd = tracing_grd
-- input_files = [
-- "about_tracing.html",
-- "about_tracing.js",
-- ]
-- input_files_base_dir = rebase_path(target_gen_dir, 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",
-- "grit/tracing_resources_map.cc",
-- "grit/tracing_resources_map.h",
-- "tracing_resources.pak",
-- ]
--
-- deps = [ ":build_grd" ]
--}
---- 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"
- #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"
-@@ -241,8 +240,6 @@
- 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));
---- a/src/3rdparty/chromium/content/shell/BUILD.gn
-+++ b/src/3rdparty/chromium/content/shell/BUILD.gn
-@@ -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 (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 @@
- ]
- data_deps = [
- "//testing:test_scripts_shared",
-- "//third_party/catapult/third_party/typ/",
- ]
- }
---- a/src/3rdparty/chromium/testing/BUILD.gn
-+++ b/src/3rdparty/chromium/testing/BUILD.gn
-@@ -75,7 +75,6 @@
-
- data_deps = [
- ":test_scripts_shared",
-- "//third_party/catapult/tracing:convert_chart_json",
- ]
-
- if (is_android) {
---- a/src/3rdparty/chromium/third_party/angle/gni/angle.gni
-+++ b/src/3rdparty/chromium/third_party/angle/gni/angle.gni
-@@ -563,10 +563,6 @@
- if (angle_has_histograms) {
- sources +=
- [ "$angle_root/src/tests/test_utils/runner/HistogramWriter.cpp" ]
-- deps += [
-- "//third_party/catapult/tracing/tracing:histogram",
-- "//third_party/catapult/tracing/tracing:reserved_infos",
-- ]
- }
-
- if (is_mac) {
---- a/src/3rdparty/chromium/third_party/blink/tools/BUILD.gn
-+++ b/src/3rdparty/chromium/third_party/blink/tools/BUILD.gn
-@@ -38,7 +38,6 @@
- data_deps = [
- ":wpt_tests_mojo_bindings",
- "//testing:test_scripts_shared",
-- "//third_party/catapult/third_party/typ:typ",
- "//tools/imagediff",
- ]
- if (is_win) {
---- a/src/3rdparty/chromium/third_party/webrtc/test/BUILD.gn
-+++ b/src/3rdparty/chromium/third_party/webrtc/test/BUILD.gn
-@@ -395,10 +395,6 @@
- ]
- 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" ]
- }
-@@ -795,7 +791,6 @@
-
- if (rtc_enable_protobuf) {
- sources += [ "testsupport/perf_test_histogram_writer_unittest.cc" ]
-- deps += [ "//third_party/catapult/tracing/tracing:histogram" ]
- }
-
- 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 @@
- pydeps_file = "sizes.pydeps"
- data_deps = [
- "//build/util:test_results",
-- "//third_party/catapult/tracing:convert_chart_json",
- ]
- }
-
---- 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/",
- ]
- }
---- a/src/3rdparty/chromium/tools/gritsettings/resource_ids.spec
-+++ b/src/3rdparty/chromium/tools/gritsettings/resource_ids.spec
-@@ -1018,12 +1018,6 @@
- "content/test/web_ui_mojo_test_resources.grd": {
- "includes": [6340],
- },
--
-- # This file is generated during the build.
-- "<(SHARED_INTERMEDIATE_DIR)/content/browser/tracing/tracing_resources.grd": {
-- "META": {"sizes": {"includes": [20],}},
-- "includes": [6360],
-- },
- # END content/ 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 @@
- # 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",
---- a/src/3rdparty/chromium/tools/perf/chrome_telemetry_build/BUILD.gn
-+++ b/src/3rdparty/chromium/tools/perf/chrome_telemetry_build/BUILD.gn
-@@ -167,7 +167,6 @@
- ]
- data_deps = [
- "//testing:test_scripts_shared",
-- "//third_party/catapult:telemetry_chrome_test_support",
- "//tools/metrics:metrics_python_tests",
- ]
-
-@@ -219,7 +218,5 @@
- "//build/android:devil_chromium_py",
- "//build/android:stack_tools",
- ]
-- } else if (!is_fuchsia) {
-- data_deps += [ "//third_party/catapult/telemetry:bitmaptools" ]
- }
- }
---- 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 = [
-- "//third_party/catapult:telemetry_chrome_test_support",
- "//third_party/perfetto/src/trace_processor:trace_processor_shell",
- ]
- data = [
---- 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/",
-- "//third_party/catapult/third_party/typ/",
- ]
- data_deps = [ "//testing:test_scripts_shared" ]
- }
---- a/src/3rdparty/chromium/v8/tools/BUILD.gn
-+++ b/src/3rdparty/chromium/v8/tools/BUILD.gn
-@@ -37,10 +37,6 @@
-
- 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/",
-- ]
- }
- }
-
---- a/src/3rdparty/chromium/weblayer/shell/BUILD.gn
-+++ b/src/3rdparty/chromium/weblayer/shell/BUILD.gn
-@@ -182,9 +182,6 @@
- }
- if (is_android) {
- deps += [ "//ui/android:ui_java_resources" ]
-- } else {
-- deps += [ "//content/browser/tracing:resources" ]
-- sources += [ "$root_gen_dir/content/browser/tracing/tracing_resources.pak" ]
- }
- output = "$root_out_dir/weblayer_support.pak"
- }
diff --git a/debian/patches/remove_catapult_core.patch b/debian/patches/remove_catapult_core.patch
deleted file mode 100644
index afd118e..0000000
--- a/debian/patches/remove_catapult_core.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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
-@@ -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/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",
- "//mojo/public/js:resources",
- "//net:net_resources_grit",
diff --git a/debian/qt6-webengine.lintian-overrides b/debian/qt6-webengine.lintian-overrides
index 30e507c..5f28b04 100644
--- a/debian/qt6-webengine.lintian-overrides
+++ b/debian/qt6-webengine.lintian-overrides
@@ -1,6 +1,6 @@
qt6-webengine: package-name-doesnt-match-sonames libQt6Pdf6 libQt6PdfQuick6 libQt6PdfWidgets6 libQt6WebEngineCore6 libQt6WebEngineQuick6 libQt6WebEngineQuickDelegatesQml6 libQt6WebEngineWidgets6
-qt6-webengine: embedded-library freetype usr/lib/x86_64-linux-gnu/libQt6Pdf.so.6.*.*
-qt6-webengine: embedded-library lcms2 usr/lib/x86_64-linux-gnu/libQt6Pdf.so.6.*.*
-qt6-webengine: embedded-library libjsoncpp usr/lib/x86_64-linux-gnu/libQt6WebEngineCore.so.6.*.*
-qt6-webengine: embedded-library srtp usr/lib/x86_64-linux-gnu/libQt6WebEngineCore.so.6.*.*
+qt6-webengine: embedded-library freetype [usr/lib/x86_64-linux-gnu/libQt6Pdf.so.6.*.*]
+qt6-webengine: embedded-library lcms2 [usr/lib/x86_64-linux-gnu/libQt6Pdf.so.6.*.*]
+qt6-webengine: embedded-library libjsoncpp [usr/lib/x86_64-linux-gnu/libQt6WebEngineCore.so.6.*.*]
+qt6-webengine: embedded-library srtp [usr/lib/x86_64-linux-gnu/libQt6WebEngineCore.so.6.*.*]
More information about the Neon-commits
mailing list