Djam/firefox-esr91
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/firefox-esr91.git synced 2025-02-23 09:02:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

To return Russian search services and messengers that firefox refused

Browse source
This commit is contained in:
slava86 2022-04-12 18:07:11 +03:00
parent 6f05156e8d
commit cb00509366
2 changed files with 907 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

903
Russian-services.patch Normal file
View file

@ -0,0 +1,903 @@
diff --git a/browser/components/search/extensions/google/_locales/region-by/messages.json b/browser/components/search/extensions/google/_locales/region-by/messages.json
deleted file mode 100644
index 60e5ed5..0000000
--- a/browser/components/search/extensions/google/_locales/region-by/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "extensionName": {
- "message": "Google"
- },
- "extensionDescription": {
- "message": "Google Search"
- },
- "searchUrl": {
- "message": "https://www.google.by/search"
- },
- "searchForm": {
- "message": "https://www.google.by/search?q={searchTerms}"
- },
- "suggestUrl": {
- "message": "https://www.google.by/complete/search?client=firefox&q={searchTerms}"
- },
- "searchUrlGetParams": {
- "message": "q={searchTerms}"
- }
-}
diff --git a/browser/components/search/extensions/google/_locales/region-kz/messages.json b/browser/components/search/extensions/google/_locales/region-kz/messages.json
deleted file mode 100644
index 8e64096..0000000
--- a/browser/components/search/extensions/google/_locales/region-kz/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "extensionName": {
- "message": "Google"
- },
- "extensionDescription": {
- "message": "Google Search"
- },
- "searchUrl": {
- "message": "https://www.google.kz/search"
- },
- "searchForm": {
- "message": "https://www.google.kz/search?q={searchTerms}"
- },
- "suggestUrl": {
- "message": "https://www.google.kz/complete/search?client=firefox&q={searchTerms}"
- },
- "searchUrlGetParams": {
- "message": "q={searchTerms}"
- }
-}
diff --git a/browser/components/search/extensions/google/_locales/region-ru/messages.json b/browser/components/search/extensions/google/_locales/region-ru/messages.json
deleted file mode 100644
index 8a78bb4..0000000
--- a/browser/components/search/extensions/google/_locales/region-ru/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "extensionName": {
- "message": "Google"
- },
- "extensionDescription": {
- "message": "Google Search"
- },
- "searchUrl": {
- "message": "https://www.google.ru/search"
- },
- "searchForm": {
- "message": "https://www.google.ru/search?q={searchTerms}"
- },
- "suggestUrl": {
- "message": "https://www.google.ru/complete/search?client=firefox&q={searchTerms}"
- },
- "searchUrlGetParams": {
- "message": "q={searchTerms}"
- }
-}
diff --git a/browser/components/search/extensions/google/_locales/region-tr/messages.json b/browser/components/search/extensions/google/_locales/region-tr/messages.json
deleted file mode 100644
index 8e373a4..0000000
--- a/browser/components/search/extensions/google/_locales/region-tr/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "extensionName": {
- "message": "Google"
- },
- "extensionDescription": {
- "message": "Google Search"
- },
- "searchUrl": {
- "message": "https://www.google.com.tr/search"
- },
- "searchForm": {
- "message": "https://www.google.com.tr/search?q={searchTerms}"
- },
- "suggestUrl": {
- "message": "https://www.google.com.tr/complete/search?client=firefox&q={searchTerms}"
- },
- "searchUrlGetParams": {
- "message": "q={searchTerms}"
- }
-}
diff --git a/services/settings/dumps/main/search-config.json b/services/settings/dumps/main/search-config.json
index 1ba0c74..8c64c25 100644
--- a/services/settings/dumps/main/search-config.json
+++ b/services/settings/dumps/main/search-config.json
@@ -1,5 +1,420 @@
{
"data": [
+ {
+ "schema": 1639069022290,
+ "appliesTo": [
+ {
+ "params": {
+ "searchUrlGetParams": [
+ {
+ "name": "text",
+ "value": "{searchTerms}"
+ }
+ ]
+ },
+ "default": "yes",
+ "override": true,
+ "application": {
+ "distributions": [
+ "yandex-drp"
+ ]
+ },
+ "extraParams": [
+ {
+ "name": "clid",
+ "value": "2039342",
+ "purpose": "searchbar",
+ "condition": "purpose"
+ }
+ ]
+ },
+ {
+ "params": {
+ "searchUrlGetParams": [
+ {
+ "name": "text",
+ "value": "{searchTerms}"
+ }
+ ]
+ },
+ "default": "yes",
+ "override": true,
+ "application": {
+ "distributions": [
+ "yandex-planb"
+ ]
+ },
+ "extraParams": [
+ {
+ "name": "clid",
+ "value": "1857376",
+ "purpose": "searchbar",
+ "condition": "purpose"
+ }
+ ]
+ },
+ {
+ "params": {
+ "searchUrlGetParams": [
+ {
+ "name": "text",
+ "value": "{searchTerms}"
+ }
+ ]
+ },
+ "default": "yes",
+ "override": true,
+ "application": {
+ "distributions": [
+ "yandex-portals"
+ ]
+ },
+ "extraParams": [
+ {
+ "name": "clid",
+ "value": "1923034",
+ "purpose": "searchbar",
+ "condition": "purpose"
+ }
+ ]
+ },
+ {
+ "params": {
+ "searchUrlGetParams": [
+ {
+ "name": "text",
+ "value": "{searchTerms}"
+ }
+ ]
+ },
+ "default": "yes",
+ "override": true,
+ "application": {
+ "distributions": [
+ "yandex-ru"
+ ]
+ },
+ "extraParams": [
+ {
+ "name": "clid",
+ "value": "1923018",
+ "purpose": "searchbar",
+ "condition": "purpose"
+ }
+ ]
+ },
+ {
+ "params": {
+ "searchUrlGetParams": [
+ {
+ "name": "text",
+ "value": "{searchTerms}"
+ }
+ ]
+ },
+ "default": "yes",
+ "override": true,
+ "application": {
+ "distributions": [
+ "yandex-tr"
+ ]
+ },
+ "extraParams": [
+ {
+ "name": "clid",
+ "value": "1953197",
+ "purpose": "searchbar",
+ "condition": "purpose"
+ }
+ ]
+ },
+ {
+ "params": {
+ "searchUrlGetParams": [
+ {
+ "name": "text",
+ "value": "{searchTerms}"
+ }
+ ]
+ },
+ "default": "yes",
+ "override": true,
+ "application": {
+ "distributions": [
+ "yandex-tr-gezginler"
+ ]
+ },
+ "extraParams": [
+ {
+ "name": "clid",
+ "value": "1945716",
+ "purpose": "searchbar",
+ "condition": "purpose"
+ }
+ ]
+ },
+ {
+ "params": {
+ "searchUrlGetParams": [
+ {
+ "name": "text",
+ "value": "{searchTerms}"
+ }
+ ]
+ },
+ "default": "yes",
+ "override": true,
+ "application": {
+ "distributions": [
+ "yandex-tr-tamindir"
+ ]
+ },
+ "extraParams": [
+ {
+ "name": "clid",
+ "value": "1945686",
+ "purpose": "searchbar",
+ "condition": "purpose"
+ }
+ ]
+ },
+ {
+ "default": "yes",
+ "included": {
+ "locales": {
+ "matches": [
+ "uk"
+ ]
+ }
+ },
+ "application": {
+ "distributions": [
+ "yandex-uk"
+ ]
+ },
+ "extraParams": [
+ {
+ "name": "clid",
+ "value": "1923018",
+ "purpose": "searchbar",
+ "condition": "purpose"
+ }
+ ],
+ "webExtension": {
+ "locales": [
+ "ua"
+ ]
+ }
+ },
+ {
+ "params": {
+ "searchUrlGetParams": [
+ {
+ "name": "text",
+ "value": "{searchTerms}"
+ }
+ ]
+ },
+ "default": "yes",
+ "override": true,
+ "application": {
+ "distributions": [
+ "yandex-ru-mz"
+ ]
+ },
+ "extraParams": [
+ {
+ "name": "clid",
+ "value": "2320519",
+ "purpose": "searchbar",
+ "condition": "purpose"
+ }
+ ]
+ },
+ {
+ "default": "yes",
+ "included": {
+ "locales": {
+ "matches": [
+ "ru",
+ "tr",
+ "be",
+ "kk"
+ ],
+ "startsWith": [
+ "en"
+ ]
+ },
+ "regions": [
+ "ru",
+ "tr",
+ "by",
+ "kz"
+ ]
+ },
+ "telemetryId": "yandex-en",
+ "webExtension": {
+ "locales": [
+ "en"
+ ]
+ }
+ },
+ {
+ "included": {
+ "locales": {
+ "matches": [
+ "az"
+ ]
+ }
+ },
+ "telemetryId": "yandex-az",
+ "webExtension": {
+ "locales": [
+ "az"
+ ]
+ }
+ },
+ {
+ "included": {
+ "locales": {
+ "matches": [
+ "be"
+ ]
+ }
+ },
+ "telemetryId": "yandex-by",
+ "webExtension": {
+ "locales": [
+ "by"
+ ]
+ }
+ },
+ {
+ "included": {
+ "locales": {
+ "matches": [
+ "kk"
+ ]
+ }
+ },
+ "telemetryId": "yandex-kk",
+ "webExtension": {
+ "locales": [
+ "kk"
+ ]
+ }
+ },
+ {
+ "included": {
+ "locales": {
+ "matches": [
+ "ru"
+ ]
+ }
+ },
+ "telemetryId": "yandex-ru",
+ "webExtension": {
+ "locales": [
+ "ru"
+ ]
+ }
+ },
+ {
+ "included": {
+ "locales": {
+ "matches": [
+ "tr"
+ ]
+ }
+ },
+ "telemetryId": "yandex-tr",
+ "webExtension": {
+ "locales": [
+ "tr"
+ ]
+ }
+ },
+ {
+ "default": "no",
+ "override": true,
+ "application": {
+ "distributions": [
+ "mailru-001",
+ "okru-001"
+ ]
+ }
+ },
+ {
+ "params": {
+ "searchUrlGetParams": [
+ {
+ "name": "text",
+ "value": "{searchTerms}"
+ }
+ ]
+ },
+ "default": "yes",
+ "override": true,
+ "application": {
+ "distributions": [
+ "mint-001"
+ ]
+ },
+ "extraParams": [
+ {
+ "name": "clid",
+ "value": "2508838",
+ "purpose": "searchbar",
+ "condition": "purpose"
+ },
+ {
+ "name": "clid",
+ "value": "2508841",
+ "purpose": "keyword",
+ "condition": "purpose"
+ }
+ ],
+ "telemetryId": "yandex-mint"
+ }
+ ],
+ "extraParams": [
+ {
+ "name": "clid",
+ "value": "2186618",
+ "purpose": "searchbar",
+ "condition": "purpose"
+ },
+ {
+ "name": "clid",
+ "value": "2186621",
+ "purpose": "keyword",
+ "condition": "purpose"
+ },
+ {
+ "name": "clid",
+ "value": "2186623",
+ "purpose": "contextmenu",
+ "condition": "purpose"
+ },
+ {
+ "name": "clid",
+ "value": "2186617",
+ "purpose": "homepage",
+ "condition": "purpose"
+ },
+ {
+ "name": "clid",
+ "value": "2186620",
+ "purpose": "newtab",
+ "condition": "purpose"
+ }
+ ],
+ "webExtension": {
+ "id": "yandex@search.mozilla.org"
+ },
+ "id": "a0e7f96a-14e0-4d56-9f54-e0c7e49fd306",
+ "last_modified": 1639155658146
+ },
{
"params": {
"searchUrlGetParams": [
@@ -17,14 +432,6 @@
"appliesTo": [
{
"default": "yes-if-no-other",
- "excluded": {
- "regions": [
- "ru",
- "tr",
- "by",
- "kz"
- ]
- },
"included": {
"everywhere": true
}
@@ -61,26 +468,69 @@
},
"telemetryId": "google-b-e"
},
+ {
+ "default": "no",
+ "included": {
+ "locales": {
+ "matches": [
+ "ru",
+ "tr",
+ "be",
+ "kk"
+ ],
+ "startsWith": [
+ "en"
+ ]
+ },
+ "regions": [
+ "ru",
+ "tr",
+ "by",
+ "kz"
+ ],
+ "telemetryId": "google"
+ }
+ },
{
"params": {
"searchUrlGetParams": [
+ {
+ "name": "client",
+ "value": "firefox-b-e"
+ },
{
"name": "q",
"value": "{searchTerms}"
}
]
},
- "default": "yes",
+ "default": "no",
"included": {
+ "locales": {
+ "matches": [
+ "ru",
+ "tr",
+ "be",
+ "kk"
+ ],
+ "startsWith": [
+ "en"
+ ]
+ },
"regions": [
"ru",
"tr",
"by",
"kz"
- ]
- },
- "telemetryId": "google-com-nocodes"
+ ],
+ "telemetryId": "google"
},
+ "application": {
+ "channel": [
+ "esr"
+ ]
+ }
+ },
{
"default": "no",
"included": {
@@ -2182,6 +2632,225 @@
"id": "f59fddbc-580b-4672-9cda-32941ceec730",
"last_modified": 1589299342073
},
+ {
+ "schema": 1588177656482,
+ "appliesTo": [
+ {
+ "included": {
+ "locales": {
+ "matches": [
+ "ru"
+ ]
+ }
+ }
+ },
+ {
+ "default": "yes",
+ "included": {
+ "locales": {
+ "matches": [
+ "ru"
+ ]
+ }
+ },
+ "application": {
+ "distributions": [
+ "mailru-001"
+ ]
+ },
+ "webExtension": {
+ "locales": [
+ "mailru001"
+ ]
+ }
+ },
+ {
+ "default": "yes",
+ "included": {
+ "locales": {
+ "matches": [
+ "az"
+ ]
+ }
+ },
+ "application": {
+ "distributions": [
+ "okru-001"
+ ]
+ },
+ "webExtension": {
+ "locales": [
+ "okru-az"
+ ]
+ }
+ },
+ {
+ "default": "yes",
+ "included": {
+ "locales": {
+ "matches": [
+ "en-US"
+ ]
+ }
+ },
+ "application": {
+ "distributions": [
+ "okru-001"
+ ]
+ },
+ "webExtension": {
+ "locales": [
+ "okru-en-US"
+ ]
+ }
+ },
+ {
+ "default": "yes",
+ "included": {
+ "locales": {
+ "matches": [
+ "hy-AM"
+ ]
+ }
+ },
+ "application": {
+ "distributions": [
+ "okru-001"
+ ]
+ },
+ "webExtension": {
+ "locales": [
+ "okru-hy-AM"
+ ]
+ }
+ },
+ {
+ "default": "yes",
+ "included": {
+ "locales": {
+ "matches": [
+ "kk"
+ ]
+ }
+ },
+ "application": {
+ "distributions": [
+ "okru-001"
+ ]
+ },
+ "webExtension": {
+ "locales": [
+ "okru-kk"
+ ]
+ }
+ },
+ {
+ "default": "yes",
+ "included": {
+ "locales": {
+ "matches": [
+ "ro"
+ ]
+ }
+ },
+ "application": {
+ "distributions": [
+ "okru-001"
+ ]
+ },
+ "webExtension": {
+ "locales": [
+ "okru-ro"
+ ]
+ }
+ },
+ {
+ "default": "yes",
+ "included": {
+ "locales": {
+ "matches": [
+ "ru"
+ ]
+ }
+ },
+ "application": {
+ "distributions": [
+ "okru-001"
+ ]
+ },
+ "webExtension": {
+ "locales": [
+ "okru-ru"
+ ]
+ }
+ },
+ {
+ "default": "yes",
+ "included": {
+ "locales": {
+ "matches": [
+ "tr"
+ ]
+ }
+ },
+ "application": {
+ "distributions": [
+ "okru-001"
+ ]
+ },
+ "webExtension": {
+ "locales": [
+ "okru-tr"
+ ]
+ }
+ },
+ {
+ "default": "yes",
+ "included": {
+ "locales": {
+ "matches": [
+ "uk"
+ ]
+ }
+ },
+ "application": {
+ "distributions": [
+ "okru-001"
+ ]
+ },
+ "webExtension": {
+ "locales": [
+ "okru-uk"
+ ]
+ }
+ },
+ {
+ "default": "yes",
+ "included": {
+ "locales": {
+ "matches": [
+ "uz"
+ ]
+ }
+ },
+ "application": {
+ "distributions": [
+ "okru-001"
+ ]
+ },
+ "webExtension": {
+ "locales": [
+ "okru-uz"
+ ]
+ }
+ }
+ ],
+ "webExtension": {
+ "id": "mailru@search.mozilla.org"
+ },
+ "id": "e0ca4964-e324-44e7-80b6-16a831706d17",
+ "last_modified": 1589299342033
+ },
{
"schema": 1588177653636,
"appliesTo": [
diff --git a/services/settings/dumps/main/top-sites.json b/services/settings/dumps/main/top-sites.json
index 855ef94..ca4c04a 100644
--- a/services/settings/dumps/main/top-sites.json
+++ b/services/settings/dumps/main/top-sites.json
@@ -64,6 +64,25 @@
"id": "354690ae-3d9d-4745-a82b-7ac43e4b3213",
"last_modified": 1623959042903
},
+ {
+ "url": "https://yandex.ru/",
+ "order": 0,
+ "title": "Yandex",
+ "schema": 1618500265732,
+ "include_regions": [
+ "BY",
+ "KZ",
+ "RU",
+ "TR"
+ ],
+ "search_shortcut": true,
+ "exclude_experiments": [
+ "yandex-2021-1"
+ ],
+ "include_experiments": [],
+ "id": "49e408ae-41c9-400c-9d9a-b871e0ef8db4",
+ "last_modified": 1619451115264
+ },
{
"url": "https://www.amazon.fr/",
"order": 40,
@@ -317,6 +336,26 @@
"id": "7fcb96b5-b24f-4bb0-8b0d-c363ef24973b",
"last_modified": 1599146777426
},
+ {
+ "url": "https://vk.com/",
+ "order": 5,
+ "schema": 1599056213323,
+ "include_regions": [
+ "RU"
+ ],
+ "id": "ac72a188-802a-447b-9a79-0a4835136240",
+ "last_modified": 1599146777420
+ },
+ {
+ "url": "https://ok.ru/",
+ "order": 11,
+ "schema": 1599056214142,
+ "include_regions": [
+ "RU"
+ ],
+ "id": "2db41cb5-c87b-4fef-9583-d2d3d85fa182",
+ "last_modified": 1599146777416
+ },
{
"url": "https://www.avito.ru/",
"order": 12,

4
firefox-esr91.spec
View file

@ -80,6 +80,8 @@ Source80: loffice-libcxx-wrapper.sh
# version 0.19.0
Source12: cbindgen-vendor.tar.xz
Source13: gen_cbindgen-vendor.sh
# To return Russian search services and messengers that firefox refused
Patch1: Russian-services.patch
# Patches for kde integration of FF
# http://www.rosenauer.org/hg/mozilla/summary
Patch11: mozilla-kde.patch
@ -241,6 +243,8 @@ Files and macros mainly for building Firefox extensions.
%prep
%setup -qn %{oname}-%{version}
%patch -p1
## KDE INTEGRATION
%patch11 -p1 -b .kdepatch
%patch12 -p1 -b .kdemoz