Update Yandex patch

i9e-gost-119.0.6045.159 changed/i9e/chromium-119.0.6045.105-1.el9.inferit
Arkady L. Shane 1 year ago
parent d514f1172f
commit 21e3b52a8a

@ -1,7 +1,18 @@
diff -urN chromium-114.0.5735.133.orig/components/search_engines/prepopulated_engines.json chromium-114.0.5735.133/components/search_engines/prepopulated_engines.json From a3f478e7c8b93c6aad5db97f43560db46492c5ea Mon Sep 17 00:00:00 2001
--- chromium-114.0.5735.133.orig/components/search_engines/prepopulated_engines.json 2023-06-30 16:00:39.781216875 +0300 From: tigro <arkadiy.sheyn@softline.com>
+++ chromium-114.0.5735.133/components/search_engines/prepopulated_engines.json 2023-06-30 16:10:06.030718785 +0300 Date: Thu, 2 Nov 2023 18:55:06 +0300
@@ -560,7 +560,7 @@ Subject: [PATCH] Yandex as default search engine
---
.../search_engines/prepopulated_engines.json | 11 +++++----
.../template_url_prepopulate_data.cc | 24 +++++++++++--------
2 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/components/search_engines/prepopulated_engines.json b/components/search_engines/prepopulated_engines.json
index 8ab6a40d2e..eded2b55e1 100644
--- a/components/search_engines/prepopulated_engines.json
+++ b/components/search_engines/prepopulated_engines.json
@@ -639,7 +639,7 @@
"suggest_url": "https://suggest.yandex.by/suggest-ff.cgi?part={searchTerms}&{google:cursorPosition}", "suggest_url": "https://suggest.yandex.by/suggest-ff.cgi?part={searchTerms}&{google:cursorPosition}",
"image_url": "https://yandex.by/images/search/?rpt=imageview", "image_url": "https://yandex.by/images/search/?rpt=imageview",
"image_url_post_params": "upfile={google:imageThumbnail},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight},prg=1", "image_url_post_params": "upfile={google:imageThumbnail},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight},prg=1",
@ -10,7 +21,7 @@ diff -urN chromium-114.0.5735.133.orig/components/search_engines/prepopulated_en
"type": "SEARCH_ENGINE_YANDEX", "type": "SEARCH_ENGINE_YANDEX",
"id": 15 "id": 15
}, },
@@ -573,6 +573,7 @@ @@ -652,6 +652,7 @@
"suggest_url": "https://suggest.yandex.com/suggest-ff.cgi?part={searchTerms}&{google:cursorPosition}&uil=en&v=3&sn=5", "suggest_url": "https://suggest.yandex.com/suggest-ff.cgi?part={searchTerms}&{google:cursorPosition}&uil=en&v=3&sn=5",
"image_url": "https://yandex.com/images/search?rpt=imageview", "image_url": "https://yandex.com/images/search?rpt=imageview",
"image_url_post_params": "upfile={google:imageThumbnail},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight},prg=1", "image_url_post_params": "upfile={google:imageThumbnail},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight},prg=1",
@ -18,7 +29,7 @@ diff -urN chromium-114.0.5735.133.orig/components/search_engines/prepopulated_en
"type": "SEARCH_ENGINE_YANDEX", "type": "SEARCH_ENGINE_YANDEX",
"id": 15 "id": 15
}, },
@@ -586,7 +587,7 @@ @@ -665,7 +666,7 @@
"suggest_url": "https://suggest.yandex.kz/suggest-ff.cgi?part={searchTerms}&{google:cursorPosition}", "suggest_url": "https://suggest.yandex.kz/suggest-ff.cgi?part={searchTerms}&{google:cursorPosition}",
"image_url": "https://yandex.kz/images/search/?rpt=imageview", "image_url": "https://yandex.kz/images/search/?rpt=imageview",
"image_url_post_params": "upfile={google:imageThumbnail},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight},prg=1", "image_url_post_params": "upfile={google:imageThumbnail},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight},prg=1",
@ -27,7 +38,7 @@ diff -urN chromium-114.0.5735.133.orig/components/search_engines/prepopulated_en
"type": "SEARCH_ENGINE_YANDEX", "type": "SEARCH_ENGINE_YANDEX",
"id": 15 "id": 15
}, },
@@ -600,7 +601,7 @@ @@ -679,7 +680,7 @@
"suggest_url": "https://suggest.yandex.ru/suggest-ff.cgi?part={searchTerms}&{google:cursorPosition}", "suggest_url": "https://suggest.yandex.ru/suggest-ff.cgi?part={searchTerms}&{google:cursorPosition}",
"image_url": "https://yandex.ru/images/search/?rpt=imageview", "image_url": "https://yandex.ru/images/search/?rpt=imageview",
"image_url_post_params": "upfile={google:imageThumbnail},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight},prg=1", "image_url_post_params": "upfile={google:imageThumbnail},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight},prg=1",
@ -36,7 +47,7 @@ diff -urN chromium-114.0.5735.133.orig/components/search_engines/prepopulated_en
"type": "SEARCH_ENGINE_YANDEX", "type": "SEARCH_ENGINE_YANDEX",
"id": 15 "id": 15
}, },
@@ -613,7 +614,7 @@ @@ -692,7 +693,7 @@
"suggest_url": "https://suggest.yandex.com.tr/suggest-ff.cgi?part={searchTerms}&{google:cursorPosition}", "suggest_url": "https://suggest.yandex.com.tr/suggest-ff.cgi?part={searchTerms}&{google:cursorPosition}",
"image_url": "https://yandex.com.tr/gorsel/search?rpt=imageview", "image_url": "https://yandex.com.tr/gorsel/search?rpt=imageview",
"image_url_post_params": "upfile={google:imageThumbnail},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight},prg=1", "image_url_post_params": "upfile={google:imageThumbnail},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight},prg=1",
@ -45,7 +56,7 @@ diff -urN chromium-114.0.5735.133.orig/components/search_engines/prepopulated_en
"type": "SEARCH_ENGINE_YANDEX", "type": "SEARCH_ENGINE_YANDEX",
"id": 15 "id": 15
}, },
@@ -627,7 +628,7 @@ @@ -706,7 +707,7 @@
"suggest_url": "https://suggest.yandex.ua/suggest-ff.cgi?part={searchTerms}&{google:cursorPosition}", "suggest_url": "https://suggest.yandex.ua/suggest-ff.cgi?part={searchTerms}&{google:cursorPosition}",
"image_url": "https://yandex.ua/images/search/?rpt=imageview", "image_url": "https://yandex.ua/images/search/?rpt=imageview",
"image_url_post_params": "upfile={google:imageThumbnail},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight},prg=1", "image_url_post_params": "upfile={google:imageThumbnail},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight},prg=1",
@ -54,62 +65,62 @@ diff -urN chromium-114.0.5735.133.orig/components/search_engines/prepopulated_en
"type": "SEARCH_ENGINE_YANDEX", "type": "SEARCH_ENGINE_YANDEX",
"id": 15 "id": 15
}, },
diff -urN chromium-114.0.5735.133.orig/components/search_engines/template_url_prepopulate_data.cc chromium-114.0.5735.133/components/search_engines/template_url_prepopulate_data.cc diff --git a/components/search_engines/template_url_prepopulate_data.cc b/components/search_engines/template_url_prepopulate_data.cc
--- chromium-114.0.5735.133.orig/components/search_engines/template_url_prepopulate_data.cc 2023-06-30 16:00:39.780216890 +0300 index 315fa0bc59..08952eec6d 100644
+++ chromium-114.0.5735.133/components/search_engines/template_url_prepopulate_data.cc 2023-06-30 16:12:58.769100093 +0300 --- a/components/search_engines/template_url_prepopulate_data.cc
@@ -29,6 +29,7 @@ +++ b/components/search_engines/template_url_prepopulate_data.cc
@@ -56,6 +56,7 @@ struct EngineAndTier {
// Default (for countries with no better engine set) // Default (for countries with no better engine set)
const PrepopulatedEngine* const engines_default[] = { constexpr EngineAndTier engines_default[] = {
+ &yandex_com, + {SearchEngineTier::kTopEngines, &yandex_com},
&google, {SearchEngineTier::kTopEngines, &google},
&bing, {SearchEngineTier::kTopEngines, &bing},
&yahoo, {SearchEngineTier::kTopEngines, &yahoo},
@@ -156,8 +157,8 @@ @@ -209,8 +210,8 @@ constexpr EngineAndTier engines_BR[] = {
// Belarus // Belarus
const PrepopulatedEngine* const engines_BY[] = { constexpr EngineAndTier engines_BY[] = {
- &google, - {SearchEngineTier::kTopEngines, &google},
&yandex_by, {SearchEngineTier::kTopEngines, &yandex_by},
+ &google, + {SearchEngineTier::kTopEngines, &google},
&mail_ru, {SearchEngineTier::kTopEngines, &bing},
&bing, {SearchEngineTier::kTopEngines, &duckduckgo},
&duckduckgo, {SearchEngineTier::kTopEngines, &mail_ru},
@@ -435,10 +436,10 @@ @@ -597,9 +598,9 @@ constexpr EngineAndTier engines_IN[] = {
// Iraq // Iraq
const PrepopulatedEngine* const engines_IQ[] = { constexpr EngineAndTier engines_IQ[] = {
+ &yandex_tr, + {SearchEngineTier::kTopEngines, &yandex_tr},
&google, {SearchEngineTier::kTopEngines, &google},
&bing, {SearchEngineTier::kTopEngines, &bing},
&yahoo, - {SearchEngineTier::kTopEngines, &yandex_tr},
- &yandex_tr, {SearchEngineTier::kTopEngines, &yahoo},
&petal_search, {SearchEngineTier::kTopEngines, &duckduckgo},
}; };
@@ -702,8 +703,8 @@ constexpr EngineAndTier engines_KW[] = {
@@ -525,8 +526,8 @@
// Kazakhstan // Kazakhstan
const PrepopulatedEngine* const engines_KZ[] = { constexpr EngineAndTier engines_KZ[] = {
- &google, - {SearchEngineTier::kTopEngines, &google},
&yandex_kz, {SearchEngineTier::kTopEngines, &yandex_kz},
+ &google, + {SearchEngineTier::kTopEngines, &google},
&mail_ru, {SearchEngineTier::kTopEngines, &bing},
&bing, {SearchEngineTier::kTopEngines, &mail_ru},
&duckduckgo, {SearchEngineTier::kTopEngines, &yahoo},
@@ -894,8 +895,8 @@ @@ -1172,8 +1173,8 @@ constexpr EngineAndTier engines_TN[] = {
// Turkey // Turkey
const PrepopulatedEngine* const engines_TR[] = { constexpr EngineAndTier engines_TR[] = {
- &google, - {SearchEngineTier::kTopEngines, &google},
&yandex_tr, {SearchEngineTier::kTopEngines, &yandex_tr},
+ &google, + {SearchEngineTier::kTopEngines, &google},
&yahoo_tr, {SearchEngineTier::kTopEngines, &yahoo_tr},
&bing, {SearchEngineTier::kTopEngines, &bing},
&duckduckgo, {SearchEngineTier::kTopEngines, &duckduckgo},
@@ -1382,12 +1383,15 @@ @@ -1774,12 +1775,15 @@ std::vector<std::unique_ptr<TemplateURLData>> GetPrepopulatedEngines(
t_urls = GetPrepopulationSetFromCountryID( }
country_codes::GetCountryIDFromPrefs(prefs)); }
} }
- if (default_search_provider_index) { - if (default_search_provider_index) {
- const auto itr = - const auto itr =
@ -129,3 +140,6 @@ diff -urN chromium-114.0.5735.133.orig/components/search_engines/template_url_pr
return t_urls; return t_urls;
} }
--
2.41.0

Loading…
Cancel
Save