From 7a5973bca3efcf56408b306a240032a4d658cec8 Mon Sep 17 00:00:00 2001 From: Chris Xiong Date: Sun, 13 Mar 2022 03:47:10 -0400 Subject: it would be good if we actually add the patch. --- www-client/chromium/Manifest | 2 + .../files/chromium-101-AccountInfo-noexcept.patch | 49 ++++++++++++++++++++++ ...m-101-WebURLLoaderFactory-incomplete-type.patch | 26 ++++++++++++ 3 files changed, 77 insertions(+) create mode 100644 www-client/chromium/files/chromium-101-AccountInfo-noexcept.patch create mode 100644 www-client/chromium/files/chromium-101-WebURLLoaderFactory-incomplete-type.patch diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index 6fffc56..8d3bb2e 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -7,6 +7,8 @@ AUX chromium-100-SCTHashdanceMetadata-move.patch 1720 BLAKE2B 41e5c8e9ff38f18cec AUX chromium-100-compiler.patch 7540 BLAKE2B 6eb402c14f1c7018a73f90cabea6cfb5eb8fb5b79fa22ab81c9dbd769160061c4655f1c76e197d8f1af35eb5ad394e9a46015348a1e75bdb687b40fa564f8548 SHA512 9ee5e32e8e90c4a124195fdf9b87a6409e180ddf1bcde249efe058b83fc031a86c7df1f6883faca997ee26f55300c9225bde1bf0cbdd2e55d89abe11cbf27854 AUX chromium-100-macro-typo.patch 920 BLAKE2B 635abc889ae56dc63f0f33d12b218e356fa2c61f5de47c0b7882a3103cde31f2ee3dc88908dc094b40065a01b20ff766ee3834690a2357e6718252558c33c572 SHA512 bb2454731e00bc26f82d56926e8bdf0319e36b03d3515d5d3fb7b8b0ef29db111b436559644f48cbf10ae35ef3f49217897265c971b816eb0fc72ceed208ce1f AUX chromium-100-sandbox-include.patch 387 BLAKE2B d0c70de564edd46bdd91240871bf7730fda22fb371ac5714e833a06bc42495203a16cb01652f009cf492f09eebb7b9659b446f7557fcca4f65fc52d6c13013d8 SHA512 ddc5bfc7181d99846fa0682d24902ceb4c0dc9a1ee4337da9f98a57cb2e448cf72567816f8243f0e9be325a6b897192cdc46669edc91f0d60ed0906013aa9472 +AUX chromium-101-AccountInfo-noexcept.patch 2395 BLAKE2B 8e83452f128778b4d1a2aff1fbd68f5ca009705c32dc20bb072f95d90728a824db369d80b8ee3d13a0c530f22bd30b9f72c00a08f7421bc80d96b65afc9de826 SHA512 fcf2254950e5889ca0be397bd1a3a1de986cf52476640a348d1a7162b937147185b146948640d290f7dde07efdf623280e71273f8605a60d994da8ced4868bc5 +AUX chromium-101-WebURLLoaderFactory-incomplete-type.patch 1272 BLAKE2B 0704488b8e2736a9dccb9cf75eac3f69751654f1bef4ed824407ebabdc049541354571b2732bdd182ebb665de3723dad9765c2f75f995956841d33d103a340c1 SHA512 072968960845138632b43a280ed72641c8bd37dfe91a5629a4598446d5bb33dd528fc0624a76556fc637dfa33a35f52f989c94901022d0081b47f5049ffddb10 AUX chromium-101-libxml-unbundle.patch 309 BLAKE2B 2d09555cab85db032c80778664efcad59f7ccba2acb7b4ed2d04a4f06167f9a14c9d0414559b71f8a58fd7421c339d3125552fd01eced7e5774a76ab4df7e7b2 SHA512 325c25e86d995deaaeb185c3b38dc21ac49eb1649b92905c2f370654249ef323421fd45591e90601fbe9ad6d18b3d1615f5b3d8c6232d0874076b3d4032ebbcd AUX chromium-71-gcc-0.patch 2531 BLAKE2B 141886b7e9c6b627ba562d33729b60bc8b9cefd7792175e542527cb97c16a772f8b7a868fb3bdef8d2e89bec5e991b88a5fb074afc7dd2467de20cc6acdeeb47 SHA512 1c9875c087776b1675049bdfb132b55ea74a6015ebbbcfa9be412017bc877469ddde35ddb775338d8598fcc045de7e3c6c39d5b8a1d59c82447eb4bf5214b2bc AUX chromium-73-gcc-0.patch 4483 BLAKE2B b0759cf95146f483bf246c20d3c62956f6ddb5138c9436f9bf823956eaaab06de150eb90ec1d535d86965077a1d0e051e81d00a49d8674b836085d8a69f75570 SHA512 de7101ba00d8c1f00cd3f557574653cb9df80e59efe869c4fb127736b0f0793b20157169af74c8e38057c460e29a7e90e05274c749dbb6a30aa0aa7886b74b36 diff --git a/www-client/chromium/files/chromium-101-AccountInfo-noexcept.patch b/www-client/chromium/files/chromium-101-AccountInfo-noexcept.patch new file mode 100644 index 0000000..5aff2f8 --- /dev/null +++ b/www-client/chromium/files/chromium-101-AccountInfo-noexcept.patch @@ -0,0 +1,49 @@ +From f5743bfaa6b02bc12d040a59f95bbe3abe7081d9 Mon Sep 17 00:00:00 2001 +From: Stephan Hartmann +Date: Sat, 5 Mar 2022 08:40:55 +0000 +Subject: [PATCH] GCC: fix noexcept in AccountInfo + +Move constructor and move assignment operator for AccountInfo +is marked noexcept. However, move constructor and assignment operator +of member AccountCapabilities are not noexcept. Therefore, GCC fails to +compile AccountInfo. Fix this by adding noexcept to move +constructor and assignment operator of AccountCapabilities. +--- + .../signin/public/identity_manager/account_capabilities.cc | 4 ++++ + .../signin/public/identity_manager/account_capabilities.h | 2 ++ + 2 files changed, 6 insertions(+) + +diff --git a/components/signin/public/identity_manager/account_capabilities.cc b/components/signin/public/identity_manager/account_capabilities.cc +index 1fe703d..9005e94 100644 +--- a/components/signin/public/identity_manager/account_capabilities.cc ++++ b/components/signin/public/identity_manager/account_capabilities.cc +@@ -16,8 +16,12 @@ AccountCapabilities::AccountCapabilities() = default; + AccountCapabilities::~AccountCapabilities() = default; + AccountCapabilities::AccountCapabilities(const AccountCapabilities& other) = + default; ++AccountCapabilities::AccountCapabilities(AccountCapabilities&& other) noexcept = ++ default; + AccountCapabilities& AccountCapabilities::operator=( + const AccountCapabilities& other) = default; ++AccountCapabilities& AccountCapabilities::operator=( ++ AccountCapabilities&& other) noexcept = default; + + // static + const std::vector& +diff --git a/components/signin/public/identity_manager/account_capabilities.h b/components/signin/public/identity_manager/account_capabilities.h +index a9f74c4..153ca4d 100644 +--- a/components/signin/public/identity_manager/account_capabilities.h ++++ b/components/signin/public/identity_manager/account_capabilities.h +@@ -23,7 +23,9 @@ class AccountCapabilities { + AccountCapabilities(); + ~AccountCapabilities(); + AccountCapabilities(const AccountCapabilities& other); ++ AccountCapabilities(AccountCapabilities&& other) noexcept; + AccountCapabilities& operator=(const AccountCapabilities& other); ++ AccountCapabilities& operator=(AccountCapabilities&& other) noexcept; + + // Chrome can offer extended promos for turning on Sync to accounts with this + // capability. +-- +2.34.1 + diff --git a/www-client/chromium/files/chromium-101-WebURLLoaderFactory-incomplete-type.patch b/www-client/chromium/files/chromium-101-WebURLLoaderFactory-incomplete-type.patch new file mode 100644 index 0000000..a331868 --- /dev/null +++ b/www-client/chromium/files/chromium-101-WebURLLoaderFactory-incomplete-type.patch @@ -0,0 +1,26 @@ +From a092650bfece8a67cddffc7983dce06146f81ffb Mon Sep 17 00:00:00 2001 +From: Stephan Hartmann +Date: Sun, 6 Mar 2022 11:03:11 +0000 +Subject: [PATCH] libstdc++: fix incomplete type of blink::WebURLLoaderFactory + +std::unique_ptr of libstdc++ uses sizeof() which requires full +definition of blink::WebURLLoaderFactory in blink::EmptyChromeClient. +--- + third_party/blink/renderer/core/loader/empty_clients.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/third_party/blink/renderer/core/loader/empty_clients.h b/third_party/blink/renderer/core/loader/empty_clients.h +index d91e67a..e23de75 100644 +--- a/third_party/blink/renderer/core/loader/empty_clients.h ++++ b/third_party/blink/renderer/core/loader/empty_clients.h +@@ -43,6 +43,7 @@ + #include "third_party/blink/public/mojom/input/focus_type.mojom-blink-forward.h" + #include "third_party/blink/public/platform/web_spell_check_panel_host_client.h" + #include "third_party/blink/public/platform/web_url_loader.h" ++#include "third_party/blink/public/platform/web_url_loader_factory.h" + #include "third_party/blink/renderer/core/core_export.h" + #include "third_party/blink/renderer/core/frame/local_frame_client.h" + #include "third_party/blink/renderer/core/frame/remote_frame_client.h" +-- +2.34.1 + -- cgit v1.2.3