diff options
author | CoprDistGit <infra@openeuler.org> | 2025-01-11 07:17:39 +0000 |
---|---|---|
committer | CoprDistGit <infra@openeuler.org> | 2025-01-11 07:17:39 +0000 |
commit | 644c757ffb94ff2f452976228fee9bbdfba762fa (patch) | |
tree | 205f3dbf342b9ae0c59e71ddbc9394b2dd415951 /chromium-127-constexpr.patch | |
parent | e9abc6c72d6b470c59f4c9e9b5af6dfe5d1a75b2 (diff) |
automatic import of chromium
Diffstat (limited to 'chromium-127-constexpr.patch')
-rw-r--r-- | chromium-127-constexpr.patch | 93 |
1 files changed, 93 insertions, 0 deletions
diff --git a/chromium-127-constexpr.patch b/chromium-127-constexpr.patch new file mode 100644 index 0000000..01149f2 --- /dev/null +++ b/chromium-127-constexpr.patch @@ -0,0 +1,93 @@ +author: Andres Salomon <dilinger@debian.org> + +../../services/network/shared_dictionary/simple_url_pattern_matcher.cc:31:34: error: constexpr variable 'kDefaultOptions' must be initialized by a constant expression + 31 | constexpr liburlpattern::Options kDefaultOptions = {.delimiter_list = "", + | ^ ~~~~~~~~~~~~~~~~~~~~~~ + 32 | .prefix_list = "", + | ~~~~~~~~~~~~~~~~~~ + 33 | .sensitive = true, + | ~~~~~~~~~~~~~~~~~~ + 34 | .strict = true}; + | ~~~~~~~~~~~~~~~ + +--- a/services/network/shared_dictionary/simple_url_pattern_matcher.cc ++++ b/services/network/shared_dictionary/simple_url_pattern_matcher.cc +@@ -28,17 +28,17 @@ namespace network { + namespace { + + // https://urlpattern.spec.whatwg.org/#default-options +-constexpr liburlpattern::Options kDefaultOptions = {.delimiter_list = "", ++const liburlpattern::Options kDefaultOptions = {.delimiter_list = "", + .prefix_list = "", + .sensitive = true, + .strict = true}; + // https://urlpattern.spec.whatwg.org/#hostname-options +-constexpr liburlpattern::Options kHostnameOptions = {.delimiter_list = ".", ++const liburlpattern::Options kHostnameOptions = {.delimiter_list = ".", + .prefix_list = "", + .sensitive = true, + .strict = true}; + // https://urlpattern.spec.whatwg.org/#pathname-options +-constexpr liburlpattern::Options kPathnameOptions = {.delimiter_list = "/", ++const liburlpattern::Options kPathnameOptions = {.delimiter_list = "/", + .prefix_list = "/", + .sensitive = true, + .strict = true}; +--- a/components/autofill/core/browser/data_model/autofill_i18n_api.h ++++ b/components/autofill/core/browser/data_model/autofill_i18n_api.h +@@ -16,8 +16,8 @@ namespace autofill::i18n_model_definitio + // Country code that represents autofill's legacy address hierarchy model as + // stored `kAutofillModelRules`. As a workaround for GCC we declare the + // std::string constexpr first. +-constexpr inline std::string kLegacyHierarchyCountryCodeString{"XX"}; +-constexpr AddressCountryCode kLegacyHierarchyCountryCode = ++const inline std::string kLegacyHierarchyCountryCodeString{"XX"}; ++const AddressCountryCode kLegacyHierarchyCountryCode = + AddressCountryCode(kLegacyHierarchyCountryCodeString); + + // Creates an instance of the address hierarchy model corresponding to the +--- a/components/omnibox/browser/on_device_tail_model_service.cc ++++ b/components/omnibox/browser/on_device_tail_model_service.cc +@@ -26,7 +26,7 @@ + + namespace { + // Constants for TFlite model validation. +-constexpr std::string kTestPrefix = "google m"; ++const std::string kTestPrefix = "google m"; + constexpr std::string_view kModelValidationSwitchName = + "omnibox-on-device-tail-model-validation"; + +--- a/chrome/browser/ui/lens/lens_overlay_url_builder.cc ++++ b/chrome/browser/ui/lens/lens_overlay_url_builder.cc +@@ -78,7 +78,7 @@ inline constexpr char kXSRFTokenQueryPar + inline constexpr char kSecActQueryParamKey[] = "sec_act"; + + // The list of query parameters to ignore when comparing search URLs. +-inline constexpr std::string kIgnoredSearchUrlQueryParameters[] = { ++inline const std::string kIgnoredSearchUrlQueryParameters[] = { + kViewportWidthQueryParamKey, kViewportHeightQueryParamKey, + kXSRFTokenQueryParamKey, kSecActQueryParamKey}; + +--- a/content/public/test/prefetch_test_util.h ++++ b/content/public/test/prefetch_test_util.h +@@ -15,7 +15,7 @@ namespace content::test { + + using PrefetchContainerIdForTesting = + base::StrongAlias<class PrefetchContainerIdForTestingTag, std::string>; +-static constexpr PrefetchContainerIdForTesting ++static const PrefetchContainerIdForTesting + InvalidPrefetchContainerIdForTesting = PrefetchContainerIdForTesting(""); + + class TestPrefetchWatcherImpl; +--- a/components/history_embeddings/ml_answerer.cc ++++ b/components/history_embeddings/ml_answerer.cc +@@ -24,7 +24,7 @@ + + namespace { + +-static constexpr std::string kPassageIdToken = "ID"; ++static const std::string kPassageIdToken = "ID"; + + std::string GetPassageIdStr(size_t id) { + return base::StringPrintf("%04d", static_cast<int>(id)); + |