From f5f5c5448137d08bce2acdfaf107dfa972c2811b Mon Sep 17 00:00:00 2001 From: Alexander David Frick Date: Sun, 11 Sep 2022 18:38:31 -0500 Subject: [PATCH] Update trunk.sh --- trunk.sh | 87 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) diff --git a/trunk.sh b/trunk.sh index c47d8f2e..a36612dd 100755 --- a/trunk.sh +++ b/trunk.sh @@ -58,6 +58,49 @@ gsyncShallow () { rm -v -r -f $HOME/chromium/src/third_party/pak && + rm -r -f -v chrome/browser/bromite_flag_choices.h && + rm -r -f -v chrome/browser/bromite_flag_entries.h && + rm -r -f -v chrome/browser/ungoogled_flag_choices.h && + rm -r -f -v chrome/browser/ungoogled_flag_entries.h && + rm -r -f -v chrome/browser/ungoogled_platform_flag_choices.h && + rm -r -f -v chrome/browser/ungoogled_platform_flag_entries.h && + rm -r -f -v components/ungoogled/ && + rm -r -f -v net/url_request/trk_protocol_handler.cc && + rm -r -f -v net/url_request/trk_protocol_handler.h && + + rm -r -f -v chrome/browser/BUILD.gn.rej && + rm -r -f -v chrome/browser/browser_process.h.rej && + rm -r -f -v chrome/browser/browser_process_impl.cc.rej && + rm -r -f -v chrome/browser/browser_process_impl.h.rej && + rm -r -f -v chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc.rej && + rm -r -f -v chrome/browser/chrome_content_browser_client.cc.rej && + rm -r -f -v chrome/browser/component_updater/file_type_policies_component_installer.cc.rej && + rm -r -f -v chrome/browser/download/chrome_download_manager_delegate.cc.rej && + rm -r -f -v chrome/browser/download/download_item_model.cc.rej && + rm -r -f -v chrome/browser/download/download_prefs.cc.rej && + rm -r -f -v chrome/browser/download/download_target_determiner.cc.rej && + rm -r -f -v chrome/browser/extensions/api/downloads/downloads_api.cc.rej && + rm -r -f -v chrome/browser/extensions/api/downloads/downloads_api.h.rej && + rm -r -f -v chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_api.cc.rej && + rm -r -f -v chrome/browser/extensions/api/webstore_private/webstore_private_api.cc.rej && + rm -r -f -v chrome/browser/extensions/blocklist_state_fetcher.cc.rej && + rm -r -f -v chrome/browser/extensions/blocklist_state_fetcher.h.rej && + rm -r -f -v chrome/browser/metrics/chrome_metrics_service_client.cc.rej && + rm -r -f -v chrome/browser/net/trial_comparison_cert_verifier_controller.cc.rej && + rm -r -f -v chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.rej && + rm -r -f -v chrome/browser/profiles/profile_impl.cc.rej && + rm -r -f -v chrome/browser/profiles/profiles_state.cc.rej && + rm -r -f -v chrome/browser/safe_browsing/BUILD.gn.rej && + rm -r -f -v chrome/browser/ssl/security_state_tab_helper.cc.rej && + rm -r -f -v chrome/browser/ui/BUILD.gn.rej && + rm -r -f -v chrome/browser/ui/tab_helpers.cc.rej && + rm -r -f -v chrome/browser/ui/webui/downloads/downloads_dom_handler.cc.rej && + rm -r -f -v chrome/browser/ui/webui/downloads/downloads_dom_handler.h.rej && + rm -r -f -v chrome/browser/ui/webui/interstitials/interstitial_ui.cc.rej && + rm -r -f -v chrome/renderer/chrome_content_renderer_client.cc.rej && + rm -r -f -v components/security_interstitials/content/cert_report_helper.cc.rej && + rm -r -f -v chrome/browser/safe_browsing/safe_browsing_dummy.cc && + git checkout -f origin/main && git rebase-update --current && @@ -152,6 +195,49 @@ rm -v -f $HOME/chromium/src/chrome/browser/thorium_flag_choices.h && rm -v -r -f $HOME/chromium/src/third_party/pak && +rm -r -f -v chrome/browser/bromite_flag_choices.h && +rm -r -f -v chrome/browser/bromite_flag_entries.h && +rm -r -f -v chrome/browser/ungoogled_flag_choices.h && +rm -r -f -v chrome/browser/ungoogled_flag_entries.h && +rm -r -f -v chrome/browser/ungoogled_platform_flag_choices.h && +rm -r -f -v chrome/browser/ungoogled_platform_flag_entries.h && +rm -r -f -v components/ungoogled/ && +rm -r -f -v net/url_request/trk_protocol_handler.cc && +rm -r -f -v net/url_request/trk_protocol_handler.h && + +rm -r -f -v chrome/browser/BUILD.gn.rej && +rm -r -f -v chrome/browser/browser_process.h.rej && +rm -r -f -v chrome/browser/browser_process_impl.cc.rej && +rm -r -f -v chrome/browser/browser_process_impl.h.rej && +rm -r -f -v chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc.rej && +rm -r -f -v chrome/browser/chrome_content_browser_client.cc.rej && +rm -r -f -v chrome/browser/component_updater/file_type_policies_component_installer.cc.rej && +rm -r -f -v chrome/browser/download/chrome_download_manager_delegate.cc.rej && +rm -r -f -v chrome/browser/download/download_item_model.cc.rej && +rm -r -f -v chrome/browser/download/download_prefs.cc.rej && +rm -r -f -v chrome/browser/download/download_target_determiner.cc.rej && +rm -r -f -v chrome/browser/extensions/api/downloads/downloads_api.cc.rej && +rm -r -f -v chrome/browser/extensions/api/downloads/downloads_api.h.rej && +rm -r -f -v chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_api.cc.rej && +rm -r -f -v chrome/browser/extensions/api/webstore_private/webstore_private_api.cc.rej && +rm -r -f -v chrome/browser/extensions/blocklist_state_fetcher.cc.rej && +rm -r -f -v chrome/browser/extensions/blocklist_state_fetcher.h.rej && +rm -r -f -v chrome/browser/metrics/chrome_metrics_service_client.cc.rej && +rm -r -f -v chrome/browser/net/trial_comparison_cert_verifier_controller.cc.rej && +rm -r -f -v chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.rej && +rm -r -f -v chrome/browser/profiles/profile_impl.cc.rej && +rm -r -f -v chrome/browser/profiles/profiles_state.cc.rej && +rm -r -f -v chrome/browser/safe_browsing/BUILD.gn.rej && +rm -r -f -v chrome/browser/ssl/security_state_tab_helper.cc.rej && +rm -r -f -v chrome/browser/ui/BUILD.gn.rej && +rm -r -f -v chrome/browser/ui/tab_helpers.cc.rej && +rm -r -f -v chrome/browser/ui/webui/downloads/downloads_dom_handler.cc.rej && +rm -r -f -v chrome/browser/ui/webui/downloads/downloads_dom_handler.h.rej && +rm -r -f -v chrome/browser/ui/webui/interstitials/interstitial_ui.cc.rej && +rm -r -f -v chrome/renderer/chrome_content_renderer_client.cc.rej && +rm -r -f -v components/security_interstitials/content/cert_report_helper.cc.rej && +rm -r -f -v chrome/browser/safe_browsing/safe_browsing_dummy.cc && + git checkout -f origin/main && git rebase-update && @@ -212,3 +298,4 @@ printf "\n" printf "${c7} Long Live Chromium\041\n${c0}\n" && exit 0 +