From 36d818d646c2c5b01c092d88ba035d00c92e0f99 Mon Sep 17 00:00:00 2001 From: Carmelo Messina Date: Sun, 8 Oct 2023 19:16:12 +0200 Subject: [PATCH] v118 patch fix 118 build errors --- build/patches/00Fix-chromium-build-bugs.patch | 137 +++++++++++++++--- 1 file changed, 120 insertions(+), 17 deletions(-) diff --git a/build/patches/00Fix-chromium-build-bugs.patch b/build/patches/00Fix-chromium-build-bugs.patch index 37b6ce7b..7afc431f 100644 --- a/build/patches/00Fix-chromium-build-bugs.patch +++ b/build/patches/00Fix-chromium-build-bugs.patch @@ -3,41 +3,56 @@ Date: Wed, 6 Sep 2023 17:55:01 +0000 Subject: Fix chromium build bugs --- - android_webview/system_webview_bundle.gni | 4 ++++ + BUILD.gn | 1 - + .../AutofillSaveCardBottomSheetBridge.java | 2 +- .../org/chromium/chrome/browser/tab/TabImpl.java | 2 +- + ...me_browser_main_extra_parts_nacl_deprecation.cc | 2 ++ chrome/browser/download/download_ui_model.cc | 2 ++ .../api/autofill_private/autofill_util.cc | 2 ++ + .../api/reading_list/reading_list_event_router.h | 2 +- + .../navigation_predictor_metrics_document_data.h | 2 ++ chrome/browser/safe_browsing/BUILD.gn | 1 + ..._auction_consented_debugging_infobar_delegate.h | 2 +- + .../read_anything/read_anything_container_view.cc | 12 ++++++------ chrome/browser/ui/views/tabs/tab.cc | 2 +- chrome/browser/ui/views/tabs/tab_group_header.cc | 2 +- .../app_management/app_management_page_handler.cc | 2 ++ chrome/browser/usb/chrome_usb_delegate.cc | 2 ++ + .../autofill/core/browser/data_model/address.cc | 4 ++-- components/autofill/core/browser/form_structure.cc | 2 ++ .../core/browser/ui/suggestion_selection.cc | 12 +----------- .../core/browser/webdata/autofill_table.cc | 12 ++++++------ components/omnibox/browser/omnibox_field_trial.cc | 4 ++-- .../phishing_classifier/phishing_image_embedder.cc | 14 +++----------- content/browser/browser_interface_binders.cc | 1 + - crypto/BUILD.gn | 1 + + crypto/BUILD.gn | 3 +++ net/BUILD.gn | 1 + third_party/libevent/BUILD.gn | 2 ++ - 19 files changed, 36 insertions(+), 34 deletions(-) + 25 files changed, 48 insertions(+), 45 deletions(-) -diff --git a/android_webview/system_webview_bundle.gni b/android_webview/system_webview_bundle.gni ---- a/android_webview/system_webview_bundle.gni -+++ b/android_webview/system_webview_bundle.gni -@@ -85,6 +85,10 @@ template("system_webview_bundle") { - custom_assertion_handler = crash_reporting_assertion_handler - } +diff --git a/BUILD.gn b/BUILD.gn +--- a/BUILD.gn ++++ b/BUILD.gn +@@ -396,7 +396,6 @@ group("gn_all") { + "//android_webview:empty_group", + "//android_webview/test", + "//android_webview/tools/automated_ui_tests:webview_ui_test_app", +- "//android_webview/tools/captured_sites_tests:captured_sites_test_app", + "//android_webview/tools/system_webview_shell", + "//chrome/android:chrome_junit_tests", + "//chrome/android:chrome_public_apk", +diff --git a/chrome/android/java/src/org/chromium/chrome/browser/autofill/AutofillSaveCardBottomSheetBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/autofill/AutofillSaveCardBottomSheetBridge.java +--- a/chrome/android/java/src/org/chromium/chrome/browser/autofill/AutofillSaveCardBottomSheetBridge.java ++++ b/chrome/android/java/src/org/chromium/chrome/browser/autofill/AutofillSaveCardBottomSheetBridge.java +@@ -42,7 +42,7 @@ public class AutofillSaveCardBottomSheetBridge { + AutofillSaveCardBottomSheetCoordinator::new); } -+ } else { -+ not_needed(["_base_target_name", "_base_target_gen_dir", -+ "_base_module_build_config", "_rebased_base_module_build_config", -+ "_base_module_version_code"]) - } - android_app_bundle(target_name) { +- @CalledByNative ++ //@CalledByNative + @VisibleForTesting + /*package*/ AutofillSaveCardBottomSheetBridge(long nativeAutofillSaveCardBottomSheetBridge, + WindowAndroid window, TabModel tabModel, CoordinatorFactory coordinatorFactory) { diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.java --- a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.java @@ -50,6 +65,25 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.jav public int getId() { return mId; } +diff --git a/chrome/browser/chrome_browser_main_extra_parts_nacl_deprecation.cc b/chrome/browser/chrome_browser_main_extra_parts_nacl_deprecation.cc +--- a/chrome/browser/chrome_browser_main_extra_parts_nacl_deprecation.cc ++++ b/chrome/browser/chrome_browser_main_extra_parts_nacl_deprecation.cc +@@ -16,6 +16,7 @@ + + namespace { + ++#if BUILDFLAG(ENABLE_NACL) + bool ShouldNaClBeAllowed() { + // Enabled by policy. + if (g_browser_process->local_state()->GetBoolean( +@@ -24,6 +25,7 @@ bool ShouldNaClBeAllowed() { + } + return base::FeatureList::IsEnabled(kNaclAllow); + } ++#endif + + } // namespace + diff --git a/chrome/browser/download/download_ui_model.cc b/chrome/browser/download/download_ui_model.cc --- a/chrome/browser/download/download_ui_model.cc +++ b/chrome/browser/download/download_ui_model.cc @@ -88,6 +122,30 @@ diff --git a/chrome/browser/extensions/api/autofill_private/autofill_util.cc b/c // Gets the string corresponding to |type| from |profile|. std::string GetStringFromProfile(const autofill::AutofillProfile& profile, +diff --git a/chrome/browser/extensions/api/reading_list/reading_list_event_router.h b/chrome/browser/extensions/api/reading_list/reading_list_event_router.h +--- a/chrome/browser/extensions/api/reading_list/reading_list_event_router.h ++++ b/chrome/browser/extensions/api/reading_list/reading_list_event_router.h +@@ -33,7 +33,7 @@ class ReadingListEventRouter : public KeyedService, + + private: + // ReadingListModelObserver: +- void ReadingListModelLoaded(const ReadingListModel* model) override{}; ++ void ReadingListModelLoaded(const ReadingListModel* model) override {} + void ReadingListDidAddEntry(const ReadingListModel* model, + const GURL& url, + reading_list::EntrySource source) override; +diff --git a/chrome/browser/navigation_predictor/navigation_predictor_metrics_document_data.h b/chrome/browser/navigation_predictor/navigation_predictor_metrics_document_data.h +--- a/chrome/browser/navigation_predictor/navigation_predictor_metrics_document_data.h ++++ b/chrome/browser/navigation_predictor/navigation_predictor_metrics_document_data.h +@@ -68,6 +68,8 @@ class NavigationPredictorMetricsDocumentData + UserInteractionsData(); + UserInteractionsData(const UserInteractionsData&); + ++ UserInteractionsData& operator=(UserInteractionsData&&) noexcept = default; ++ + // True if the anchor element is still in viewport, otherwise false. + bool is_in_viewport = false; + // True if the pointer is still hovering over the anchor element, diff --git a/chrome/browser/safe_browsing/BUILD.gn b/chrome/browser/safe_browsing/BUILD.gn --- a/chrome/browser/safe_browsing/BUILD.gn +++ b/chrome/browser/safe_browsing/BUILD.gn @@ -111,6 +169,28 @@ diff --git a/chrome/browser/ui/startup/bidding_and_auction_consented_debugging_i // An infobar for Chrome for Testing, which displays a message saying that this // flavor of chrome is unsupported and does not auto-update. +diff --git a/chrome/browser/ui/views/side_panel/read_anything/read_anything_container_view.cc b/chrome/browser/ui/views/side_panel/read_anything/read_anything_container_view.cc +--- a/chrome/browser/ui/views/side_panel/read_anything/read_anything_container_view.cc ++++ b/chrome/browser/ui/views/side_panel/read_anything/read_anything_container_view.cc +@@ -23,12 +23,12 @@ + + namespace { + +-int GetNormalizedFontScale(double font_scale) { +- DCHECK(font_scale >= kReadAnythingMinimumFontScale && +- font_scale <= kReadAnythingMaximumFontScale); +- return (font_scale - kReadAnythingMinimumFontScale) * +- (1 / kReadAnythingFontScaleIncrement); +-} ++// int GetNormalizedFontScale(double font_scale) { ++// DCHECK(font_scale >= kReadAnythingMinimumFontScale && ++// font_scale <= kReadAnythingMaximumFontScale); ++// return (font_scale - kReadAnythingMinimumFontScale) * ++// (1 / kReadAnythingFontScaleIncrement); ++// } + + } // namespace + diff --git a/chrome/browser/ui/views/tabs/tab.cc b/chrome/browser/ui/views/tabs/tab.cc --- a/chrome/browser/ui/views/tabs/tab.cc +++ b/chrome/browser/ui/views/tabs/tab.cc @@ -119,7 +199,7 @@ diff --git a/chrome/browser/ui/views/tabs/tab.cc b/chrome/browser/ui/views/tabs/ bool Tab::OnMouseDragged(const ui::MouseEvent& event) { - controller_->ContinueDrag(this, event); -+ (void)controller_->ContinueDrag(this, event); ++ (void)controller_->ContinueDrag(this, event); // fix error: ignoring return value of function declared with 'nodiscard' attribute [-Werror,-Wunused-result] return true; } @@ -173,6 +253,27 @@ diff --git a/chrome/browser/usb/chrome_usb_delegate.cc b/chrome/browser/usb/chro #if BUILDFLAG(ENABLE_EXTENSIONS) // These extensions can claim the smart card USB class and automatically gain +diff --git a/components/autofill/core/browser/data_model/address.cc b/components/autofill/core/browser/data_model/address.cc +--- a/components/autofill/core/browser/data_model/address.cc ++++ b/components/autofill/core/browser/data_model/address.cc +@@ -30,7 +30,7 @@ + + namespace autofill { + +-Address::Address() : structured_address_(std::make_unique()){}; ++Address::Address() : structured_address_(std::make_unique()){} + + Address::Address(const Address& address) { + *this = address; +@@ -44,7 +44,7 @@ Address& Address::operator=(const Address& address) { + } + structured_address_->CopyFrom(address.GetStructuredAddress()); + return *this; +-}; ++} + + bool Address::operator==(const Address& other) const { + if (this == &other) diff --git a/components/autofill/core/browser/form_structure.cc b/components/autofill/core/browser/form_structure.cc --- a/components/autofill/core/browser/form_structure.cc +++ b/components/autofill/core/browser/form_structure.cc @@ -291,10 +392,12 @@ diff --git a/content/browser/browser_interface_binders.cc b/content/browser/brow diff --git a/crypto/BUILD.gn b/crypto/BUILD.gn --- a/crypto/BUILD.gn +++ b/crypto/BUILD.gn -@@ -14,6 +14,7 @@ buildflag_header("buildflags") { +@@ -14,6 +14,9 @@ buildflag_header("buildflags") { } component("crypto") { ++ # fix error ++ # [chromium-rawptr] Use raw_ptr instead of a raw pointer. + configs -= [ "//build/config/clang:find_bad_constructs" ] output_name = "crcrypto" # Avoid colliding with OpenSSL's libcrypto. sources = [