diff --git a/.chromium.metadata b/.chromium.metadata index 75f087ff..5f4f7b8e 100644 --- a/.chromium.metadata +++ b/.chromium.metadata @@ -1,10 +1,10 @@ -37d022fd3347653b81c0c3159814438118aa9282 SOURCES/chromium-127.0.6533.99.tar.xz +ccd15016324e640c40f6fc01ab076dc52196ea54 SOURCES/msspi-e91bd46306cc7044b2903cd07b788c13c36481e3.tar.xz +9bd36edf9f2e882aad828ad88faa7b9d02566cea SOURCES/Chromium-Gost-648cc5b901f2447b9b12bc5b09b962ec802b025a.tar.xz +81fc28ecc7beed0dcfc5208c492865ed447c3389 SOURCES/chromium-128.0.6613.113.tar.xz dea187019741602d57aaf189a80abba261fbd2aa SOURCES/linux-x64-0.19.2.tgz 7e5d2c7864c5c83ec789b59c77cd9c20d2594916 SOURCES/linux-arm64-0.19.2.tgz 769196d081c6a0ad37f1c63dec56febfff3370de SOURCES/node-v20.6.1-linux-x64.tar.xz 3e94bb4f999c636293bc745b02d98e7925da5616 SOURCES/node-v20.6.1-linux-arm64.tar.xz 8e9bc55cce3899627b2810ecfe87116c5a9147b5 SOURCES/chromium-browser-gost-icons.tar.xz -a2a9663fa5c46439dafbc1b0f23825b2a8c68acf SOURCES/msspi-2e626e5a5605cc4c03fa4bfc0145e459864e897a.tar.xz -4543172087b8a3971b37ddaa4cf1fc91a575bfae SOURCES/Chromium-Gost-3224c62bcc360b80de98da20358cbbe16d773c10.tar.xz b66519ed49abdd4712315ae3a4645830073c09cf SOURCES/bindgen-cli-aarch64.tar.xz 107a886d1095bb01268e6cd51f1878385e694229 SOURCES/bindgen-cli-x86_64.tar.xz diff --git a/.gitignore b/.gitignore index 671a6c76..1fd8b0ad 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,10 @@ -SOURCES/chromium-127.0.6533.99.tar.xz +SOURCES/chromium-128.0.6613.113.tar.xz SOURCES/linux-x64-0.19.2.tgz SOURCES/linux-arm64-0.19.2.tgz SOURCES/node-v20.6.1-linux-x64.tar.xz SOURCES/node-v20.6.1-linux-arm64.tar.xz SOURCES/chromium-browser-gost-icons.tar.xz -SOURCES/msspi-2e626e5a5605cc4c03fa4bfc0145e459864e897a.tar.xz -SOURCES/Chromium-Gost-3224c62bcc360b80de98da20358cbbe16d773c10.tar.xz +SOURCES/msspi-e91bd46306cc7044b2903cd07b788c13c36481e3.tar.xz +SOURCES/Chromium-Gost-648cc5b901f2447b9b12bc5b09b962ec802b025a.tar.xz SOURCES/bindgen-cli-aarch64.tar.xz SOURCES/bindgen-cli-x86_64.tar.xz diff --git a/SOURCES/0001-Added-Yandex-search-bar-as-default-on-newtab-and-new.patch b/SOURCES/0001-Added-Yandex-search-bar-as-default-on-newtab-and-new.patch index 68931576..4adac614 100644 --- a/SOURCES/0001-Added-Yandex-search-bar-as-default-on-newtab-and-new.patch +++ b/SOURCES/0001-Added-Yandex-search-bar-as-default-on-newtab-and-new.patch @@ -1,38 +1,39 @@ -From d3529c6a229e229a13e942540ab7d53cbc485cc6 Mon Sep 17 00:00:00 2001 +From 24fca3c63c8240c9e4214163947f71a404300ac1 Mon Sep 17 00:00:00 2001 From: tigro -Date: Thu, 25 Jul 2024 18:22:15 +0300 +Date: Tue, 27 Aug 2024 14:43:09 +0300 Subject: [PATCH] Added Yandex search bar as default on newtab and new-tab-page --- - chrome/app/generated_resources.grd | 2 -- - .../app/resources/generated_resources_be.xtb | 2 +- - .../resources/generated_resources_en-GB.xtb | 2 +- - .../app/resources/generated_resources_ru.xtb | 2 +- - .../app/resources/generated_resources_uk.xtb | 2 +- - chrome/browser/history/top_sites_factory.cc | 4 ++-- - .../resources/new_tab_page/lens_form.html | 1 + - .../resources/new_tab_page/lens_form.ts | 19 ++++++++++++++++++- - .../new_tab_page/lens_upload_dialog.html | 10 +++++----- - .../browser/resources/new_tab_page/logo.html | 5 +---- - chrome/browser/resources/new_tab_page/logo.ts | 2 +- - chrome/browser/search/search.cc | 7 +++++++ - chrome/browser/search/search.h | 2 ++ - .../ui/webui/new_tab_page/new_tab_page_ui.cc | 5 +++++ - components/search/search.cc | 14 ++++++++++++++ - components/search/search.h | 7 +++++++ - components/search_engines/keyword_table.cc | 4 ++++ - .../search_engines/prepopulated_engines.json | 11 ++++++----- - .../search_engine_countries-inc.cc | 9 +++++---- - .../search_engines/template_url_data_util.cc | 6 +++++- - .../template_url_prepopulate_data.cc | 9 ++++++++- - .../cr_components/searchbox/realbox.html | 7 +++++++ - 22 files changed, 102 insertions(+), 30 deletions(-) + chrome/app/generated_resources.grd | 2 -- + chrome/app/resources/generated_resources_be.xtb | 4 ++-- + chrome/app/resources/generated_resources_en-GB.xtb | 2 +- + chrome/app/resources/generated_resources_ru.xtb | 2 +- + chrome/app/resources/generated_resources_uk.xtb | 2 +- + chrome/browser/history/top_sites_factory.cc | 4 ++-- + .../browser/resources/new_tab_page/lens_form.html | 1 + + chrome/browser/resources/new_tab_page/lens_form.ts | 6 +++--- + .../resources/new_tab_page/lens_upload_dialog.css | 2 +- + .../resources/new_tab_page/lens_upload_dialog.html | 8 ++++---- + chrome/browser/resources/new_tab_page/logo.css | 5 +---- + chrome/browser/resources/new_tab_page/logo.ts | 2 +- + chrome/browser/search/search.cc | 7 +++++++ + chrome/browser/search/search.h | 2 ++ + .../ui/webui/new_tab_page/new_tab_page_ui.cc | 5 +++++ + components/search/search.cc | 14 ++++++++++++++ + components/search/search.h | 7 +++++++ + components/search_engines/keyword_table.cc | 4 ++++ + .../search_engines/prepopulated_engines.json | 11 ++++++----- + .../search_engines/search_engine_countries-inc.cc | 9 +++++---- + .../search_engines/template_url_data_util.cc | 6 +++++- + .../template_url_prepopulate_data.cc | 9 ++++++++- + .../resources/cr_components/searchbox/realbox.html | 7 +++++++ + 23 files changed, 88 insertions(+), 33 deletions(-) diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd -index 3a9f1ea3d2..ae7b29fe19 100644 +index 366de3cb51..f1b7148608 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd -@@ -7733,10 +7733,8 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -7742,10 +7742,8 @@ Keep your key file in a safe place. You will need it to create new versions of y @@ -44,23 +45,30 @@ index 3a9f1ea3d2..ae7b29fe19 100644 Add to your search diff --git a/chrome/app/resources/generated_resources_be.xtb b/chrome/app/resources/generated_resources_be.xtb -index b0de6288a7..08a8252694 100644 +index cf57c86031..5c700fad3d 100644 --- a/chrome/app/resources/generated_resources_be.xtb +++ b/chrome/app/resources/generated_resources_be.xtb -@@ -9507,7 +9507,7 @@ +@@ -9669,7 +9669,7 @@ Стварайце рэзервовыя копіі сваіх даных, каб іх можна было выкарыстоўваць на іншых прыладах Стварыце ярлык на працоўным стале прылады, каб мець прамы доступ да гэтага профілю Падключыце клавіятуру або мыш. Калі вы выкарыстоўваеце прылады з Bluetooth, упэўніцеся, што яны гатовыя да спалучэння. --Шукайце відарысы з дапамогай Google Аб'ектыва +-Шукайце відарысы з дапамогай Google Аб’ектыва +Шукайце відарысы У Google пашырэнне "" абазначана як шкоднае. Яго ўсталяванне было прадухілена Адваротная прагортка сэнсарнай панэллю Камерцыйнае падпісванне кода ў Microsoft +@@ -11412,4 +11412,4 @@ + Пры наведванні сайтаў яны будуць аўтаматычна ўлічваць гэту наладу. Звычайна сайты адпраўляюць апавяшчэнні, каб паведаміць вам пра экстранныя навіны або новыя паведамленні ў чаце. + Каб выкарыстоўваць функцыю сінхранізацыі параметраў Wi-Fi, уключыце Сінхранізацыю Chrome. Даведацца больш + Пра&верыць +- +\ No newline at end of file ++ diff --git a/chrome/app/resources/generated_resources_en-GB.xtb b/chrome/app/resources/generated_resources_en-GB.xtb -index 9e06a084c2..e87dd7bf09 100644 +index c637034755..94eb5e6a86 100644 --- a/chrome/app/resources/generated_resources_en-GB.xtb +++ b/chrome/app/resources/generated_resources_en-GB.xtb -@@ -9518,7 +9518,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -9680,7 +9680,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Back up your stuff and use it on any device Create a desktop shortcut on your device to access directly to this profile Connect a keyboard or mouse. If you are using Bluetooth devices, make sure that your devices are ready to pair. @@ -70,10 +78,10 @@ index 9e06a084c2..e87dd7bf09 100644 Touchpad reverse scrolling Microsoft Commercial Code Signing diff --git a/chrome/app/resources/generated_resources_ru.xtb b/chrome/app/resources/generated_resources_ru.xtb -index dd0110ed61..fe6b05c22d 100644 +index 759b1346db..27e6f4b72c 100644 --- a/chrome/app/resources/generated_resources_ru.xtb +++ b/chrome/app/resources/generated_resources_ru.xtb -@@ -9512,7 +9512,7 @@ +@@ -9673,7 +9673,7 @@ Создайте резервную копию данных и используйте их на любом устройстве. Чтобы быстро переключаться на этот профиль, создайте ярлык на рабочем столе Подключите мышь или клавиатуру. Если вы используете устройства Bluetooth, убедитесь, что они готовы к подключению. @@ -83,10 +91,10 @@ index dd0110ed61..fe6b05c22d 100644 Обратное направление прокрутки с помощью сенсорной панели Подписывание коммерческого кода Microsoft diff --git a/chrome/app/resources/generated_resources_uk.xtb b/chrome/app/resources/generated_resources_uk.xtb -index 369b16c102..2873728092 100644 +index 34039a1a6d..84b33f4e51 100644 --- a/chrome/app/resources/generated_resources_uk.xtb +++ b/chrome/app/resources/generated_resources_uk.xtb -@@ -9522,7 +9522,7 @@ +@@ -9683,7 +9683,7 @@ Створюйте резервні копії даних і використовуйте їх на будь-якому пристрої Створити ярлик на робочому столі, щоб відразу переходити до цього профілю Підключіть клавіатуру або мишу. Якщо ви користуєтеся пристроями з Bluetooth, переконайтеся, що вони готові до підключення. @@ -96,7 +104,7 @@ index 369b16c102..2873728092 100644 Зворотне прокручування на сенсорній панелі Підписування комерційного коду Microsoft diff --git a/chrome/browser/history/top_sites_factory.cc b/chrome/browser/history/top_sites_factory.cc -index 8f20a76a66..d1a13e7046 100644 +index 0da9ce7baf..7ade1ebfe1 100644 --- a/chrome/browser/history/top_sites_factory.cc +++ b/chrome/browser/history/top_sites_factory.cc @@ -54,7 +54,7 @@ struct RawPrepopulatedPage { @@ -118,156 +126,103 @@ index 8f20a76a66..d1a13e7046 100644 PrefService* pref_service = profile->GetPrefs(); bool hide_web_store_icon = diff --git a/chrome/browser/resources/new_tab_page/lens_form.html b/chrome/browser/resources/new_tab_page/lens_form.html -index 57c6387c7e..0f31a59767 100644 +index 72bd92c5ab..2604d9c0dd 100644 --- a/chrome/browser/resources/new_tab_page/lens_form.html +++ b/chrome/browser/resources/new_tab_page/lens_form.html -@@ -18,6 +18,7 @@ -
-+ - - - +@@ -11,6 +11,7 @@ + ++ + + + diff --git a/chrome/browser/resources/new_tab_page/lens_form.ts b/chrome/browser/resources/new_tab_page/lens_form.ts -index bf24f4c495..167b57bc5e 100644 +index db3180269e..5a30a2de0d 100644 --- a/chrome/browser/resources/new_tab_page/lens_form.ts +++ b/chrome/browser/resources/new_tab_page/lens_form.ts -@@ -12,11 +12,14 @@ import {getTemplate} from './lens_form.html.js'; +@@ -11,14 +11,14 @@ import {getCss} from './lens_form.css.js'; + import {getHtml} from './lens_form.html.js'; + /** Lens service endpoint for the Upload by File action. */ - const SCOTTY_UPLOAD_FILE_ACTION: string = 'https://lens.google.com/upload'; - const DIRECT_UPLOAD_FILE_ACTION: string = 'https://lens.google.com/v3/upload'; -+const SCOTTY_UPLOAD_FILE_ACTION_YA: string = 'https://yandex.ru/images/search'; -+const DIRECT_UPLOAD_FILE_ACTION_YA: string = 'https://yandex.ru/images/search'; +-const SCOTTY_UPLOAD_FILE_ACTION: string = 'https://lens.google.com/upload'; +-const DIRECT_UPLOAD_FILE_ACTION: string = 'https://lens.google.com/v3/upload'; ++const SCOTTY_UPLOAD_FILE_ACTION: string = 'https://yandex.ru/images/search'; ++const DIRECT_UPLOAD_FILE_ACTION: string = 'https://yandex.ru/images/search'; /** Entrypoint for the upload by file action. */ const UPLOAD_FILE_ENTRYPOINT: string = 'cntpubb'; /** Lens service endpoint for the Upload by URL action. */ -+const UPLOAD_BY_URL_ACTION_YA: string = 'https://yandex.ru/images/search'; - const UPLOAD_BY_URL_ACTION: string = 'https://lens.google.com/uploadbyurl'; +-const UPLOAD_BY_URL_ACTION: string = 'https://lens.google.com/uploadbyurl'; ++const UPLOAD_BY_URL_ACTION: string = 'https://yandex.ru/images/search'; /** Entrypoint for the upload by url action. */ -@@ -74,6 +77,7 @@ export class LensFormElement extends PolymerElement { - } - - static get properties() { -+ let isYandex = loadTimeData.getBoolean('googleLensForYandex'); - return { - supportedFileTypes_: { - type: String, -@@ -99,7 +103,7 @@ export class LensFormElement extends PolymerElement { - uploadUrlAction_: { - type: String, - readOnly: true, -- value: UPLOAD_BY_URL_ACTION, -+ value: ((isYandex == true)?UPLOAD_BY_URL_ACTION_YA:UPLOAD_BY_URL_ACTION), - }, - uploadUrl_: String, - uploadUrlEntrypoint_: { -@@ -117,6 +121,11 @@ export class LensFormElement extends PolymerElement { - readOnly: true, - value: loadTimeData.getString('realboxLensVariations'), - }, -+ useYandexForPics_: { -+ type: Boolean, -+ readOnly: true, -+ value: isYandex, -+ }, - }; - } - -@@ -126,6 +135,7 @@ export class LensFormElement extends PolymerElement { - private startTime_: string|null = null; - private clientData_: string; - private useDirectUpload_: boolean; -+ private isYandexProp_: boolean = loadTimeData.getBoolean('googleLensForYandex'); - - openSystemFilePicker() { - this.$.fileInput.click(); -@@ -153,6 +163,11 @@ export class LensFormElement extends PolymerElement { - } - - private async submitFile_(file: File) { -+ -+ if (this.isYandexProp_ == true) { -+ return; -+ } else { -+ - if (!SUPPORTED_FILE_TYPES.includes(file.type)) { - this.dispatchError_(LensErrorType.FILE_TYPE); - return; -@@ -194,8 +209,10 @@ export class LensFormElement extends PolymerElement { - processedFile.imageWidth ? processedFile.imageWidth.toString() : ''); - this.uploadFileAction_ = action.toString(); - -+ - this.dispatchLoading_(LensSubmitType.FILE); - this.$.fileForm.submit(); -+ } - } - - submitUrl(urlString: string) { + const UPLOAD_URL_ENTRYPOINT: string = 'cntpubu'; +diff --git a/chrome/browser/resources/new_tab_page/lens_upload_dialog.css b/chrome/browser/resources/new_tab_page/lens_upload_dialog.css +index bde20d9920..ef6dfbdd24 100644 +--- a/chrome/browser/resources/new_tab_page/lens_upload_dialog.css ++++ b/chrome/browser/resources/new_tab_page/lens_upload_dialog.css +@@ -109,7 +109,7 @@ + display: flex; + flex-direction: column; + flex-grow: 1; +- height: 280px; ++ height: 110px; + padding: 20px; + position: relative; + width: 100%; diff --git a/chrome/browser/resources/new_tab_page/lens_upload_dialog.html b/chrome/browser/resources/new_tab_page/lens_upload_dialog.html -index a6eb910711..703311b280 100644 +index c406c42ed3..3ab96ac7ca 100644 --- a/chrome/browser/resources/new_tab_page/lens_upload_dialog.html +++ b/chrome/browser/resources/new_tab_page/lens_upload_dialog.html -@@ -99,7 +99,7 @@ - display: flex; - flex-direction: column; - flex-grow: 1; -- height: 280px; -+ height: 110px; - padding: 20px; - position: relative; - width: 100%; -@@ -365,7 +365,7 @@ - +@@ -22,7 +22,7 @@ + ` : ''} -