From 7a1b2ba54560a593eb02a3bf4d0462b66c50f2c3 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Mon, 28 Oct 2019 01:27:02 -0400 Subject: gnu: icecat: Update to 68.2.0-guix0-preview2. * gnu/packages/gnuzilla.scm (%icecat-version): Update. (%icecat-build-id): New variable. (icecat-source): Update gnuzilla repo commit and hash. (icecat)[arguments]: In the custom 'configure' phase, set the MOZ_BUILD_DATE environment variable to the value of %icecat-build-id. * gnu/packages/patches/icecat-gnuzilla-fixes.patch: Remove changes that are now in the upstream repository. Add more pending changes, including disabling the MOZ_SERVICES_HEALTHREPORT and MOZ_BLOCK_PROFILE_DOWNGRADE build flags, fixing a problem that prevented MOZ_DATA_REPORTING from being disabled, and fixes to the branding. * gnu/packages/patches/icecat-makeicecat.patch: Adapt to upstream changes, and changes in icecat-gnuzilla-fixes.patch. Remove a hunk that disabled rewrites to aboutRights.dtd in the l10n directory. --- gnu/packages/gnuzilla.scm | 8 +- gnu/packages/patches/icecat-gnuzilla-fixes.patch | 1369 ++++------------------ gnu/packages/patches/icecat-makeicecat.patch | 23 +- 3 files changed, 232 insertions(+), 1168 deletions(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 3902f490d0..16d3fe5db9 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -550,7 +550,8 @@ from forcing GEXP-PROMISE." #:system system #:guile-for-build guile))) -(define %icecat-version "68.2.0-guix0-preview1") +(define %icecat-version "68.2.0-guix0-preview2") +(define %icecat-build-id "20191028000000") ;must be of the form YYYYMMDDhhmmss ;; 'icecat-source' is a "computed" origin that generates an IceCat tarball ;; from the corresponding upstream Firefox ESR tarball, using the 'makeicecat' @@ -576,7 +577,7 @@ from forcing GEXP-PROMISE." (upstream-icecat-base-version "68.1.0") ; maybe older than base-version ;;(gnuzilla-commit (string-append "v" upstream-icecat-base-version)) - (gnuzilla-commit "395cc0798600cde44a30abaa3f5d08ce8b68f782") + (gnuzilla-commit "aa7ab9483a64c43e77736917dd83841ccc437300") (gnuzilla-source (origin (method git-fetch) @@ -586,7 +587,7 @@ from forcing GEXP-PROMISE." (file-name (git-file-name "gnuzilla" upstream-icecat-base-version)) (sha256 (base32 - "1ll3j2kpsfp1f9dxy67fay1cidsng02l8a3a23wdjqkxgrg1cf4g")))) + "03jygq1zna621y0ba6370cff4v2g9l57g3015y3vxbahnmzn9msa")))) (gnuzilla-fixes-patch (local-file (search-patch "icecat-gnuzilla-fixes.patch"))) @@ -1016,6 +1017,7 @@ from forcing GEXP-PROMISE." (setenv "CONFIG_SHELL" bash) (setenv "AUTOCONF" (which "autoconf")) ; must be autoconf-2.13 (setenv "CC" "gcc") ; apparently needed when Stylo is enabled + (setenv "MOZ_BUILD_DATE" ,%icecat-build-id) ; avoid timestamp (mkdir "../build") (chdir "../build") (format #t "build directory: ~s~%" (getcwd)) diff --git a/gnu/packages/patches/icecat-gnuzilla-fixes.patch b/gnu/packages/patches/icecat-gnuzilla-fixes.patch index f3ceaebd03..41f0d2e3a3 100644 --- a/gnu/packages/patches/icecat-gnuzilla-fixes.patch +++ b/gnu/packages/patches/icecat-gnuzilla-fixes.patch @@ -1,1164 +1,241 @@ +From 2676d4e1eb64e18d2e4722c0ea0babdc1f716fa4 Mon Sep 17 00:00:00 2001 +From: Mark H Weaver +Date: Mon, 28 Oct 2019 01:54:19 -0400 +Subject: [PATCH 1/4] Update to 68.2.0-gnu1. + +* makeicecat: Update to FFMINOR to 2, and update the expected +sha256sum of the firefox source tarball. +--- + makeicecat | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + diff --git a/makeicecat b/makeicecat -index b04c731..8e4947c 100644 +index 97ee473..1bcf465 100644 --- a/makeicecat +++ b/makeicecat -@@ -80,10 +80,10 @@ mv compare-locales $SOURCEDIR/l10n +@@ -21,7 +21,7 @@ + set -euxo pipefail - cd $SOURCEDIR + FFMAJOR=68 +-FFMINOR=1 ++FFMINOR=2 + FFSUB=0 + GNUVERSION=1 + FFVERSION=$FFMAJOR.$FFMINOR.$FFSUB +@@ -43,7 +43,7 @@ wget -N https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${FFVERSION}esr + wget -N https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${FFVERSION}esr/source/firefox-${FFVERSION}esr.source.tar.xz.asc + gpg --recv-keys --keyserver keyserver.ubuntu.com 14F26682D0916CDD81E37B6D61B7B526D98F0353 + gpg --verify firefox-${FFVERSION}esr.source.tar.xz.asc +-echo -n f56f5fa5a4744be0b9acf259cb991254d708a50b9a0a12d1d846ffa5a6c409ac firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c - ++echo -n 85f1c2eaf68ebedcbc0b78a342f6d16ef0865dedd426a1bba94b75c85f716f38 firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c - --#for patch in $DATA/patches/*; do --# echo Patching with file: $patch --# patch -p1 < $patch --#done -+for patch in $DATA/patches/*.patch; do -+ echo Patching with file: $patch -+ patch -p1 --force --no-backup-if-mismatch --input $patch -+done - - cp $DATA/Changelog.IceCat $DATA/README.IceCat . - -diff --git a/data/settings.js b/data/settings.js -index 03af220..7b2f33a 100644 ---- a/data/settings.js -+++ b/data/settings.js -@@ -211,6 +211,9 @@ pref("toolkit.telemetry.enabled", false); - pref("media.eme.enabled", false); - pref("media.eme.apiVisible", false); - -+// Firefox Accounts -+pref("identity.fxaccounts.enabled", false); -+ - // WebRTC - pref("media.peerconnection.enabled", true); - // Don't reveal your internal IP when WebRTC is enabled -diff --git a/data/patches/default-search-duckduckgo.patch b/data/patches/default-search-duckduckgo.patch + echo Extracting Firefox tarball + tar -xf firefox-${FFVERSION}esr.source.tar.xz +-- +2.23.0 + +From c3a7b761f11c75d3764779e731a7c7e86b072d2f Mon Sep 17 00:00:00 2001 +From: Mark H Weaver +Date: Mon, 28 Oct 2019 04:18:26 -0400 +Subject: [PATCH 2/4] Disable MOZ_SERVICES_HEALTHREPORT and MOZ_DATA_REPORTING. + +* data/patches/fix-data-reporting-check.patch: New file. +* data/patches/legacy-profiles.patch: Rename to ... +* data/patches/moz-configure-changes.patch: ... this, +and set MOZ_SERVICES_HEALTHREPORT to False. +--- + data/patches/fix-data-reporting-check.patch | 22 +++++++++++++++++++++ + data/patches/legacy-profiles.patch | 11 ----------- + data/patches/moz-configure-changes.patch | 14 +++++++++++++ + 3 files changed, 36 insertions(+), 11 deletions(-) + create mode 100644 data/patches/fix-data-reporting-check.patch + delete mode 100644 data/patches/legacy-profiles.patch + create mode 100644 data/patches/moz-configure-changes.patch + +diff --git a/data/patches/fix-data-reporting-check.patch b/data/patches/fix-data-reporting-check.patch new file mode 100644 -index 0000000..9eea07b +index 0000000..d586dc5 --- /dev/null -+++ b/data/patches/default-search-duckduckgo.patch -@@ -0,0 +1,1108 @@ -+--- a/browser/components/search/SearchTelemetry.jsm.orig 1980-01-01 18:59:51.000000000 -0500 -++++ b/browser/components/search/SearchTelemetry.jsm 2019-10-25 06:58:49.564335696 -0400 -+@@ -40,6 +40,12 @@ -+ * page mightbe an advert. -+ */ -+ const SEARCH_PROVIDER_INFO = { -++ duckduckgo: { -++ regexp: /^https:\/\/duckduckgo\.com\//, -++ queryParam: "q", -++ codeParam: "t", -++ codePrefixes: ["ff"], -++ }, -+ google: { -+ regexp: /^https:\/\/www\.google\.(?:.+)\/search/, -+ queryParam: "q", -+@@ -50,12 +56,6 @@ -+ /^https:\/\/www\.googleadservices\.com\/(?:pagead\/)?aclk/, -+ ], -+ }, -+- duckduckgo: { -+- regexp: /^https:\/\/duckduckgo\.com\//, -+- queryParam: "q", -+- codeParam: "t", -+- codePrefixes: ["ff"], -+- }, -+ yahoo: { -+ regexp: /^https:\/\/(?:.*)search\.yahoo\.com\/search/, -+ queryParam: "p", -+--- a/browser/components/search/extensions/list.json.orig 1980-01-01 18:59:51.000000000 -0500 -++++ b/browser/components/search/extensions/list.json 2019-10-25 07:27:58.209006756 -0400 -+@@ -1,9 +1,9 @@ -+ { -+ "default": { -+- "searchDefault": "Google", -+- "searchOrder": ["Google", "Bing"], -++ "searchDefault": "DuckDuckGo", -++ "searchOrder": ["DuckDuckGo", "Google", "Bing"], -+ "visibleDefaultEngines": [ -+- "google-b-d", "amazondotcom", "bing", "ddg", "ebay", "twitter", "wikipedia" -++ "ddg", "google-b-d", "amazondotcom", "bing", "ebay", "twitter", "wikipedia" -+ ] -+ }, -+ "regionOverrides": { -+@@ -54,32 +54,32 @@ -+ "en-US": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "amazondotcom", "bing", "ddg", "ebay", "twitter", "wikipedia" -++ "ddg", "google-b-d", "amazondotcom", "bing", "ebay", "twitter", "wikipedia" -+ ] -+ }, -+ "KZ": { -+ "visibleDefaultEngines": [ -+- "amazondotcom", "bing", "google", "twitter", "wikipedia", "ddg", "yandex-en" -++ "ddg", "amazondotcom", "bing", "google", "twitter", "wikipedia", "yandex-en" -+ ], -+- "searchDefault": "Yandex" -++ "searchDefault": "DuckDuckGo" -+ }, -+ "BY": { -+ "visibleDefaultEngines": [ -+- "amazondotcom", "bing", "google", "twitter", "wikipedia", "ddg", "yandex-en" -++ "ddg", "amazondotcom", "bing", "google", "twitter", "wikipedia", "yandex-en" -+ ], -+- "searchDefault": "Yandex" -++ "searchDefault": "DuckDuckGo" -+ }, -+ "RU": { -+ "visibleDefaultEngines": [ -+- "amazondotcom", "bing", "google", "twitter", "wikipedia", "ddg", "yandex-en" -++ "ddg", "amazondotcom", "bing", "google", "twitter", "wikipedia", "yandex-en" -+ ], -+- "searchDefault": "Yandex" -++ "searchDefault": "DuckDuckGo" -+ }, -+ "TR": { -+ "visibleDefaultEngines": [ -+- "amazondotcom", "bing", "google", "twitter", "wikipedia", "ddg", "yandex-en" -++ "ddg", "amazondotcom", "bing", "google", "twitter", "wikipedia", "yandex-en" -+ ], -+- "searchDefault": "Yandex" -++ "searchDefault": "DuckDuckGo" -+ }, -+ "experimental-hidden": { -+ "visibleDefaultEngines": [ -+@@ -90,131 +90,131 @@ -+ "ach": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia" -++ "ddg", "google-b-d", "bing", "amazondotcom", "twitter", "wikipedia" -+ ] -+ } -+ }, -+ "af": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "amazondotcom", "ddg", "wikipedia-af" -++ "ddg", "google-b-d", "bing", "amazondotcom", "wikipedia-af" -+ ] -+ } -+ }, -+ "an": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "ebay-es", "wikipedia-an", "ddg", "twitter" -++ "ddg", "google-b-d", "bing", "ebay-es", "wikipedia-an", "twitter" -+ ] -+ } -+ }, -+ "ar": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "amazondotcom", "ddg", "wikipedia-ar" -++ "ddg", "google-b-d", "bing", "amazondotcom", "wikipedia-ar" -+ ] -+ } -+ }, -+ "as": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "amazon-in", "ddg", "wikipedia-as" -++ "ddg", "google-b-d", "amazon-in", "wikipedia-as" -+ ] -+ } -+ }, -+ "ast": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "ddg", "ebay-es", "wikipedia-ast" -++ "ddg", "google-b-d", "bing", "ebay-es", "wikipedia-ast" -+ ] -+ } -+ }, -+ "az": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "amazondotcom", "azerdict", "bing", "ddg", "wikipedia-az", "yandex-az" -++ "ddg", "google-b-d", "amazondotcom", "azerdict", "bing", "wikipedia-az", "yandex-az" -+ ] -+ } -+ }, -+ "be": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "yandex-by", "google-b-d", "ddg", "wikipedia-be", "wikipedia-be-tarask" -++ "ddg", "yandex-by", "google-b-d", "wikipedia-be", "wikipedia-be-tarask" -+ ] -+ }, -+ "BY": { -+- "searchDefault": "Яндекс" -++ "searchDefault": "DuckDuckGo" -+ }, -+ "KZ": { -+- "searchDefault": "Яндекс" -++ "searchDefault": "DuckDuckGo" -+ }, -+ "RU": { -+- "searchDefault": "Яндекс" -++ "searchDefault": "DuckDuckGo" -+ }, -+ "TR": { -+- "searchDefault": "Яндекс" -++ "searchDefault": "DuckDuckGo" -+ } -+ }, -+ "bg": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "amazondotcom", "ddg", "pazaruvaj", "wikipedia-bg" -++ "ddg", "google-b-d", "amazondotcom", "pazaruvaj", "wikipedia-bg" -+ ] -+ } -+ }, -+ "bn": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "amazon-in", "bing", "ddg", "wikipedia-bn" -++ "ddg", "google-b-d", "amazon-in", "bing", "wikipedia-bn" -+ ] -+ } -+ }, -+ "bn-BD": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "ddg", "wikipedia-bn" -++ "ddg", "google-b-d", "bing", "wikipedia-bn" -+ ] -+ } -+ }, -+ "bn-IN": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "amazon-in", "bing", "ddg", "wikipedia-bn" -++ "ddg", "google-b-d", "amazon-in", "bing", "wikipedia-bn" -+ ] -+ } -+ }, -+ "br": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "amazon-france", "ddg", "ebay-fr", "freelang", "wikipedia-br" -++ "ddg", "google-b-d", "amazon-france", "ebay-fr", "freelang", "wikipedia-br" -+ ] -+ } -+ }, -+ "bs": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "ddg", "olx", "twitter", "wikipedia-bs" -++ "ddg", "google-b-d", "olx", "twitter", "wikipedia-bs" -+ ] -+ } -+ }, -+ "ca": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "diec2", "ddg", "ebay-es", "twitter", "wikipedia-ca" -++ "ddg", "google-b-d", "bing", "diec2", "ebay-es", "twitter", "wikipedia-ca" -+ ] -+ } -+ }, -+ "cak": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "amazondotcom", "ddg", "wikipedia-es" -++ "ddg", "google-b-d", "bing", "amazondotcom", "wikipedia-es" -+ ] -+ } -+ }, -+ "crh": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "ddg", "twitter", "wikipedia-crh" -++ "ddg", "google-b-d", "twitter", "wikipedia-crh" -+ ] -+ } -+ }, -+@@ -222,74 +222,74 @@ -+ "default": { -+ "searchOrder": ["Google", "Seznam"], -+ "visibleDefaultEngines": [ -+- "google-b-d", "seznam-cz", "ddg", "heureka-cz", "mapy-cz", "wikipedia-cz" -++ "ddg", "google-b-d", "seznam-cz", "heureka-cz", "mapy-cz", "wikipedia-cz" -+ ] -+ } -+ }, -+ "cy": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "amazon-en-GB", "ddg", "ebay-uk", "palasprint", "wikipedia-cy" -++ "ddg", "google-b-d", "amazon-en-GB", "ebay-uk", "palasprint", "wikipedia-cy" -+ ] -+ } -+ }, -+ "da": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "amazon-en-GB", "ddg", "wikipedia-da" -++ "ddg", "google-b-d", "bing", "amazon-en-GB", "wikipedia-da" -+ ] -+ } -+ }, -+ "de": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "amazon-de", "bing", "ddg", "ebay-de", "ecosia", "leo_ende_de", "wikipedia-de" -++ "ddg", "google-b-d", "amazon-de", "bing", "ebay-de", "ecosia", "leo_ende_de", "wikipedia-de" -+ ] -+ } -+ }, -+ "dsb": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "amazon-de", "ddg", "ebay-de", "leo_ende_de", "wikipedia-dsb" -++ "ddg", "google-b-d", "bing", "amazon-de", "ebay-de", "leo_ende_de", "wikipedia-dsb" -+ ] -+ } -+ }, -+ "el": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "amazon-en-GB", "bing", "ddg", "wikipedia-el" -++ "ddg", "google-b-d", "amazon-en-GB", "bing", "wikipedia-el" -+ ] -+ } -+ }, -+ "en-CA": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "amazon-ca", "bing", "ddg", "ebay-ca", "twitter", "wikipedia" -++ "ddg", "google-b-d", "amazon-ca", "bing", "ebay-ca", "twitter", "wikipedia" -+ ] -+ }, -+ "KZ": { -+ "visibleDefaultEngines": [ -+- "yandex-en", "google-b-d", "amazon-ca", "bing", "ddg", "ebay-ca", "twitter", "wikipedia" -++ "ddg", "yandex-en", "google-b-d", "amazon-ca", "bing", "ebay-ca", "twitter", "wikipedia" -+ ], -+- "searchDefault": "Yandex" -++ "searchDefault": "DuckDuckGo" -+ }, -+ "BY": { -+ "visibleDefaultEngines": [ -+- "yandex-en", "google-b-d", "amazon-ca", "bing", "ddg", "ebay-ca", "twitter", "wikipedia" -++ "ddg", "yandex-en", "google-b-d", "amazon-ca", "bing", "ebay-ca", "twitter", "wikipedia" -+ ], -+- "searchDefault": "Yandex" -++ "searchDefault": "DuckDuckGo" -+ }, -+ "RU": { -+ "visibleDefaultEngines": [ -+- "yandex-en", "google-b-d", "amazon-ca", "bing", "ddg", "ebay-ca", "twitter", "wikipedia" -++ "ddg", "yandex-en", "google-b-d", "amazon-ca", "bing", "ebay-ca", "twitter", "wikipedia" -+ ], -+- "searchDefault": "Yandex" -++ "searchDefault": "DuckDuckGo" -+ }, -+ "TR": { -+ "visibleDefaultEngines": [ -+- "yandex-en", "google-b-d", "amazon-ca", "bing", "ddg", "ebay-ca", "twitter", "wikipedia" -++ "ddg", "yandex-en", "google-b-d", "amazon-ca", "bing", "ebay-ca", "twitter", "wikipedia" -+ ], -+- "searchDefault": "Yandex" -++ "searchDefault": "DuckDuckGo" -+ }, -+ "experimental-hidden": { -+ "visibleDefaultEngines": [ -+@@ -300,32 +300,32 @@ -+ "en-GB": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ddg", "ebay-uk", "twitter", "wikipedia" -++ "ddg", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ebay-uk", "twitter", "wikipedia" -+ ] -+ }, -+ "KZ": { -+ "visibleDefaultEngines": [ -+- "yandex-en", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ddg", "ebay-uk", "twitter", "wikipedia" -++ "ddg", "yandex-en", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ebay-uk", "twitter", "wikipedia" -+ ], -+- "searchDefault": "Yandex" -++ "searchDefault": "DuckDuckGo" -+ }, -+ "BY": { -+ "visibleDefaultEngines": [ -+- "yandex-en", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ddg", "ebay-uk", "twitter", "wikipedia" -++ "ddg", "yandex-en", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ebay-uk", "twitter", "wikipedia" -+ ], -+- "searchDefault": "Yandex" -++ "searchDefault": "DuckDuckGo" -+ }, -+ "RU": { -+ "visibleDefaultEngines": [ -+- "yandex-en", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ddg", "ebay-uk", "twitter", "wikipedia" -++ "ddg", "yandex-en", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ebay-uk", "twitter", "wikipedia" -+ ], -+- "searchDefault": "Yandex" -++ "searchDefault": "DuckDuckGo" -+ }, -+ "TR": { -+ "visibleDefaultEngines": [ -+- "yandex-en", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ddg", "ebay-uk", "twitter", "wikipedia" -++ "ddg", "yandex-en", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ebay-uk", "twitter", "wikipedia" -+ ], -+- "searchDefault": "Yandex" -++ "searchDefault": "DuckDuckGo" -+ }, -+ "experimental-hidden": { -+ "visibleDefaultEngines": [ -+@@ -336,66 +336,66 @@ -+ "en-ZA": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia" -++ "ddg", "google-b-d", "bing", "amazondotcom", "twitter", "wikipedia" -+ ] -+ }, -+ "KZ": { -+ "visibleDefaultEngines": [ -+- "yandex-en", "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia" -++ "ddg", "yandex-en", "google-b-d", "bing", "amazondotcom", "twitter", "wikipedia" -+ ], -+- "searchDefault": "Yandex" -++ "searchDefault": "DuckDuckGo" -+ }, -+ "BY": { -+ "visibleDefaultEngines": [ -+- "yandex-en", "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia" -++ "ddg", "yandex-en", "google-b-d", "bing", "amazondotcom", "twitter", "wikipedia" -+ ], -+- "searchDefault": "Yandex" -++ "searchDefault": "DuckDuckGo" -+ }, -+ "RU": { -+ "visibleDefaultEngines": [ -+- "yandex-en", "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia" -++ "ddg", "yandex-en", "google-b-d", "bing", "amazondotcom", "twitter", "wikipedia" -+ ], -+- "searchDefault": "Yandex" -++ "searchDefault": "DuckDuckGo" -+ }, -+ "TR": { -+ "visibleDefaultEngines": [ -+- "yandex-en", "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia" -++ "ddg", "yandex-en", "google-b-d", "bing", "amazondotcom", "twitter", "wikipedia" -+ ], -+- "searchDefault": "Yandex" -++ "searchDefault": "DuckDuckGo" -+ } -+ }, -+ "eo": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "amazondotcom", "ddg", "wikipedia-eo" -++ "ddg", "google-b-d", "bing", "amazondotcom", "wikipedia-eo" -+ ] -+ } -+ }, -+ "es-AR": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "amazondotcom", "drae", "ddg", "mercadolibre-ar", "wikipedia-es" -++ "ddg", "google-b-d", "amazondotcom", "drae", "mercadolibre-ar", "wikipedia-es" -+ ] -+ } -+ }, -+ "es-CL": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "drae", "ddg", "mercadolibre-cl", "wikipedia-es" -++ "ddg", "google-b-d", "bing", "drae", "mercadolibre-cl", "wikipedia-es" -+ ] -+ } -+ }, -+ "es-ES": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "drae", "ddg", "ebay-es", "twitter", "wikipedia-es" -++ "ddg", "google-b-d", "bing", "drae", "ebay-es", "twitter", "wikipedia-es" -+ ] -+ } -+ }, -+ "es-MX": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "ddg", "mercadolibre-mx", "wikipedia-es" -++ "ddg", "google-b-d", "bing", "mercadolibre-mx", "wikipedia-es" -+ ] -+ }, -+ "experimental-hidden": { -+@@ -407,49 +407,49 @@ -+ "et": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "neti-ee", "ddg", "osta-ee", "wikipedia-et", "eki-ee" -++ "ddg", "google-b-d", "neti-ee", "osta-ee", "wikipedia-et", "eki-ee" -+ ] -+ } -+ }, -+ "eu": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "amazon-en-GB", "ddg", "ebay-es", "wikipedia-eu" -++ "ddg", "google-b-d", "bing", "amazon-en-GB", "ebay-es", "wikipedia-eu" -+ ] -+ } -+ }, -+ "fa": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "amazondotcom", "bing", "ddg", "wikipedia-fa" -++ "ddg", "google-b-d", "amazondotcom", "bing", "wikipedia-fa" -+ ] -+ } -+ }, -+ "ff": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "amazon-france", "ddg", "wikipedia-fr" -++ "ddg", "google-b-d", "bing", "amazon-france", "wikipedia-fr" -+ ] -+ } -+ }, -+ "fi": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "ddg", "wikipedia-fi" -++ "ddg", "google-b-d", "bing", "wikipedia-fi" -+ ] -+ } -+ }, -+ "fr": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "amazon-france", "ddg", "ebay-fr", "qwant", "wikipedia-fr" -++ "ddg", "google-b-d", "bing", "amazon-france", "ebay-fr", "qwant", "wikipedia-fr" -+ ] -+ } -+ }, -+ "fy-NL": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "bolcom-fy-NL", "ddg", "ebay-nl", "marktplaats-fy-NL", "wikipedia-fy-NL" -++ "ddg", "google-b-d", "bing", "bolcom-fy-NL", "ebay-nl", "marktplaats-fy-NL", "wikipedia-fy-NL" -+ ] -+ }, -+ "experimental-hidden": { -+@@ -461,105 +461,105 @@ -+ "ga-IE": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "amazon-en-GB", "ddg", "ebay-ie", "tearma", "twitter", "wikipedia-ga-IE" -++ "ddg", "google-b-d", "amazon-en-GB", "ebay-ie", "tearma", "twitter", "wikipedia-ga-IE" -+ ] -+ } -+ }, -+ "gd": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "amazon-en-GB", "bbc-alba", "ddg", "ebay-uk", "faclair-beag", "wikipedia-gd" -++ "ddg", "google-b-d", "amazon-en-GB", "bbc-alba", "ebay-uk", "faclair-beag", "wikipedia-gd" -+ ] -+ } -+ }, -+ "gl": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "amazon-en-GB", "ddg", "ebay-es", "wikipedia-gl" -++ "ddg", "google-b-d", "amazon-en-GB", "ebay-es", "wikipedia-gl" -+ ] -+ } -+ }, -+ "gn": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-gn" -++ "ddg", "google-b-d", "bing", "amazondotcom", "twitter", "wikipedia-gn" -+ ] -+ } -+ }, -+ "gu-IN": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "amazon-in", "ddg", "wikipedia-gu" -++ "ddg", "google-b-d", "bing", "amazon-in", "wikipedia-gu" -+ ] -+ } -+ }, -+ "he": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "ddg", "wikipedia-he", "morfix-dic" -++ "ddg", "google-b-d", "wikipedia-he", "morfix-dic" -+ ] -+ } -+ }, -+ "hi-IN": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "ddg", "wikipedia-hi" -++ "ddg", "google-b-d", "bing", "wikipedia-hi" -+ ] -+ } -+ }, -+ "hr": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "amazon-en-GB", "bing", "ddg", "eudict", "twitter", "wikipedia-hr" -++ "ddg", "google-b-d", "amazon-en-GB", "bing", "eudict", "twitter", "wikipedia-hr" -+ ] -+ } -+ }, -+ "hsb": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "amazon-de", "ddg", "ebay-de", "leo_ende_de", "wikipedia-hsb" -++ "ddg", "google-b-d", "bing", "amazon-de", "ebay-de", "leo_ende_de", "wikipedia-hsb" -+ ] -+ } -+ }, -+ "hu": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "ddg", "vatera", "wikipedia-hu" -++ "ddg", "google-b-d", "vatera", "wikipedia-hu" -+ ] -+ } -+ }, -+ "hy-AM": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "amazondotcom", "ddg", "list-am", "wikipedia-hy" -++ "ddg", "google-b-d", "amazondotcom", "list-am", "wikipedia-hy" -+ ] -+ } -+ }, -+ "ia": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-ia" -++ "ddg", "google-b-d", "bing", "amazondotcom", "twitter", "wikipedia-ia" -+ ] -+ } -+ }, -+ "id": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "ddg", "wikipedia-id" -++ "ddg", "google-b-d", "wikipedia-id" -+ ] -+ } -+ }, -+ "is": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "amazondotcom", "ddg", "wikipedia-is" -++ "ddg", "google-b-d", "bing", "amazondotcom", "wikipedia-is" -+ ] -+ } -+ }, -+ "it": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "amazon-it", "ddg", "ebay-it", "wikipedia-it" -++ "ddg", "google-b-d", "bing", "amazon-it", "ebay-it", "wikipedia-it" -+ ] -+ } -+ }, -+@@ -567,7 +567,7 @@ -+ "default": { -+ "searchOrder": ["Google", "Yahoo! JAPAN", "Bing", "Amazon.co.jp", "楽天市場", "ヤフオク!", "教えて！goo", "Twitter", "Wikipedia (ja)"], -+ "visibleDefaultEngines": [ -+- "google-b-d", "yahoo-jp", "bing", "amazon-jp", "rakuten", "yahoo-jp-auctions", "oshiete-goo", "twitter-ja", "wikipedia-ja", "ddg" -++ "ddg", "google-b-d", "yahoo-jp", "bing", "amazon-jp", "rakuten", "yahoo-jp-auctions", "oshiete-goo", "twitter-ja", "wikipedia-ja" -+ ] -+ } -+ }, -+@@ -575,159 +575,159 @@ -+ "default": { -+ "searchOrder": ["Google", "Yahoo! JAPAN", "Bing", "Amazon.co.jp", "楽天市場", "ヤフオク!", "教えて！goo", "Twitter", "Wikipedia (ja)"], -+ "visibleDefaultEngines": [ -+- "google-b-d", "yahoo-jp", "bing", "amazon-jp", "rakuten", "yahoo-jp-auctions", "oshiete-goo", "twitter-ja", "wikipedia-ja", "ddg" -++ "ddg", "google-b-d", "yahoo-jp", "bing", "amazon-jp", "rakuten", "yahoo-jp-auctions", "oshiete-goo", "twitter-ja", "wikipedia-ja" -+ ] -+ } -+ }, -+ "ka": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-ka" -++ "ddg", "google-b-d", "bing", "amazondotcom", "twitter", "wikipedia-ka" -+ ] -+ } -+ }, -+ "kab": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "ddg", "wikipedia-kab" -++ "ddg", "google-b-d", "bing", "wikipedia-kab" -+ ] -+ } -+ }, -+ "kk": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "yandex-kk", "google-b-d", "ddg", "flip", "twitter", "wikipedia-kk" -++ "ddg", "yandex-kk", "google-b-d", "flip", "twitter", "wikipedia-kk" -+ ] -+ }, -+ "KZ": { -+- "searchDefault": "Яндекс" -++ "searchDefault": "DuckDuckGo" -+ }, -+ "BY": { -+- "searchDefault": "Яндекс" -++ "searchDefault": "DuckDuckGo" -+ }, -+ "RU": { -+- "searchDefault": "Яндекс" -++ "searchDefault": "DuckDuckGo" -+ }, -+ "TR": { -+- "searchDefault": "Яндекс" -++ "searchDefault": "DuckDuckGo" -+ } -+ }, -+ "km": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-km" -++ "ddg", "google-b-d", "bing", "amazondotcom", "twitter", "wikipedia-km" -+ ] -+ } -+ }, -+ "kn": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "amazon-in", "ddg", "kannadastore", "wikipedia-kn" -++ "ddg", "google-b-d", "bing", "amazon-in", "kannadastore", "wikipedia-kn" -+ ] -+ } -+ }, -+ "ko": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "ddg", "naver-kr", "daum-kr", "wikipedia-kr" -++ "ddg", "google-b-d", "naver-kr", "daum-kr", "wikipedia-kr" -+ ] -+ } -+ }, -+ "lij": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "amazon-it", "ddg", "ebay-it", "wikipedia-lij" -++ "ddg", "google-b-d", "bing", "amazon-it", "ebay-it", "wikipedia-lij" -+ ] -+ } -+ }, -+ "lo": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "ddg", "wikipedia-lo", "twitter" -++ "ddg", "google-b-d", "bing", "wikipedia-lo", "twitter" -+ ] -+ } -+ }, -+ "lt": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "wikipedia-lt", "bing", "amazondotcom", "ddg", "twitter" -++ "ddg", "google-b-d", "wikipedia-lt", "bing", "amazondotcom", "twitter" -+ ] -+ } -+ }, -+ "ltg": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "ddg", "salidzinilv", "sslv", "wikipedia-ltg" -++ "ddg", "google-b-d", "salidzinilv", "sslv", "wikipedia-ltg" -+ ] -+ } -+ }, -+ "lv": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "ddg", "salidzinilv", "sslv", "wikipedia-lv" -++ "ddg", "google-b-d", "salidzinilv", "sslv", "wikipedia-lv" -+ ] -+ } -+ }, -+ "mai": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "amazon-in", "ddg", "twitter", "wikipedia-hi" -++ "ddg", "google-b-d", "bing", "amazon-in", "twitter", "wikipedia-hi" -+ ] -+ } -+ }, -+ "mk": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "amazondotcom", "ddg", "wikipedia-mk" -++ "ddg", "google-b-d", "bing", "amazondotcom", "wikipedia-mk" -+ ] -+ } -+ }, -+ "ml": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "amazon-in", "ddg", "wikipedia", "wikipedia-ml" -++ "ddg", "google-b-d", "bing", "amazon-in", "wikipedia", "wikipedia-ml" -+ ] -+ } -+ }, -+ "mr": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "amazon-in", "ddg", "wikipedia-mr" -++ "ddg", "google-b-d", "amazon-in", "wikipedia-mr" -+ ] -+ } -+ }, -+ "ms": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-ms" -++ "ddg", "google-b-d", "bing", "amazondotcom", "twitter", "wikipedia-ms" -+ ] -+ } -+ }, -+ "my": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-my" -++ "ddg", "google-b-d", "bing", "amazondotcom", "twitter", "wikipedia-my" -+ ] -+ } -+ }, -+ "nb-NO": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "amazon-en-GB", "bing", "ddg", "gulesider-NO", "bok-NO", "qxl-NO", "wikipedia-NO" -++ "ddg", "google-b-d", "amazon-en-GB", "bing", "gulesider-NO", "bok-NO", "qxl-NO", "wikipedia-NO" -+ ] -+ } -+ }, -+ "ne-NP": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "ddg", "twitter", "wikipedia-ne" -++ "ddg", "google-b-d", "bing", "twitter", "wikipedia-ne" -+ ] -+ } -+ }, -+ "nl": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "bolcom-nl", "ddg", "ebay-nl", "marktplaats-nl", "wikipedia-nl" -++ "ddg", "google-b-d", "bing", "bolcom-nl", "ebay-nl", "marktplaats-nl", "wikipedia-nl" -+ ] -+ }, -+ "experimental-hidden": { -+@@ -739,244 +739,244 @@ -+ "nn-NO": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "amazon-en-GB", "ddg", "gulesider-NO", "bok-NO", "qxl-NO", "wikipedia-NN" -++ "ddg", "google-b-d", "bing", "amazon-en-GB", "gulesider-NO", "bok-NO", "qxl-NO", "wikipedia-NN" -+ ] -+ } -+ }, -+ "oc": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "ddg", "twitter", "wikipedia-oc", "wiktionary-oc" -++ "ddg", "google-b-d", "bing", "twitter", "wikipedia-oc", "wiktionary-oc" -+ ] -+ } -+ }, -+ "or": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "amazon-in", "ddg", "wikipedia-or" -++ "ddg", "google-b-d", "bing", "amazon-in", "wikipedia-or" -+ ] -+ } -+ }, -+ "pa-IN": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "amazon-in", "ddg", "wikipedia-pa" -++ "ddg", "google-b-d", "bing", "amazon-in", "wikipedia-pa" -+ ] -+ } -+ }, -+ "pl": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "allegro-pl", "ddg", "pwn-pl", "wikipedia-pl", "wolnelektury-pl" -++ "ddg", "google-b-d", "allegro-pl", "pwn-pl", "wikipedia-pl", "wolnelektury-pl" -+ ] -+ } -+ }, -+ "pt-BR": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "ddg", "mercadolivre", "twitter", "wikipedia-pt" -++ "ddg", "google-b-d", "bing", "mercadolivre", "twitter", "wikipedia-pt" -+ ] -+ } -+ }, -+ "pt-PT": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "amazon-en-GB", "ddg", "priberam", "wikipedia-pt" -++ "ddg", "google-b-d", "amazon-en-GB", "priberam", "wikipedia-pt" -+ ] -+ } -+ }, -+ "rm": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "ddg", "ebay-ch", "leo_ende_de", "wikipedia-rm" -++ "ddg", "google-b-d", "bing", "ebay-ch", "leo_ende_de", "wikipedia-rm" -+ ] -+ } -+ }, -+ "ro": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "amazondotcom", "ddg", "wikipedia-ro" -++ "ddg", "google-b-d", "bing", "amazondotcom", "wikipedia-ro" -+ ] -+ } -+ }, -+ "ru": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "yandex-ru", "google-b-d", "ddg", "ozonru", "priceru", "wikipedia-ru", "mailru" -++ "ddg", "yandex-ru", "google-b-d", "ozonru", "priceru", "wikipedia-ru", "mailru" -+ ] -+ }, -+ "RU": { -+- "searchDefault": "Яндекс" -++ "searchDefault": "DuckDuckGo" -+ }, -+ "BY": { -+- "searchDefault": "Яндекс" -++ "searchDefault": "DuckDuckGo" -+ }, -+ "KZ": { -+- "searchDefault": "Яндекс" -++ "searchDefault": "DuckDuckGo" -+ }, -+ "TR": { -+- "searchDefault": "Яндекс" -++ "searchDefault": "DuckDuckGo" -+ } -+ }, -+ "si": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "amazondotcom", "ddg", "wikipedia-si" -++ "ddg", "google-b-d", "amazondotcom", "wikipedia-si" -+ ] -+ } -+ }, -+ "sk": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "azet-sk", "atlas-sk", "ddg", "wikipedia-sk", "zoznam-sk" -++ "ddg", "google-b-d", "azet-sk", "atlas-sk", "wikipedia-sk", "zoznam-sk" -+ ] -+ } -+ }, -+ "sl": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "ceneji", "ddg", "najdi-si", "odpiralni", "twitter", "wikipedia-sl" -++ "ddg", "google-b-d", "ceneji", "najdi-si", "odpiralni", "twitter", "wikipedia-sl" -+ ] -+ } -+ }, -+ "son": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "amazon-france", "ddg", "wikipedia-fr" -++ "ddg", "google-b-d", "bing", "amazon-france", "wikipedia-fr" -+ ] -+ } -+ }, -+ "sq": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "amazon-en-GB", "ddg", "wikipedia-sq" -++ "ddg", "google-b-d", "bing", "amazon-en-GB", "wikipedia-sq" -+ ] -+ } -+ }, -+ "sr": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "amazon-en-GB", "bing", "ddg", "wikipedia-sr", "pogodak" -++ "ddg", "google-b-d", "amazon-en-GB", "bing", "wikipedia-sr", "pogodak" -+ ] -+ } -+ }, -+ "sv-SE": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "allaannonser-sv-SE", "ddg", "prisjakt-sv-SE", "tyda-sv-SE", "wikipedia-sv-SE" -++ "ddg", "google-b-d", "bing", "allaannonser-sv-SE", "prisjakt-sv-SE", "tyda-sv-SE", "wikipedia-sv-SE" -+ ] -+ } -+ }, -+ "ta": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "amazon-in", "ddg", "wikipedia-ta" -++ "ddg", "google-b-d", "amazon-in", "wikipedia-ta" -+ ] -+ } -+ }, -+ "te": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "amazon-in", "ddg", "wikipedia-te", "wiktionary-te" -++ "ddg", "google-b-d", "amazon-in", "wikipedia-te", "wiktionary-te" -+ ] -+ } -+ }, -+ "th": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "amazondotcom", "bing", "ddg", "longdo", "wikipedia-th" -++ "ddg", "google-b-d", "amazondotcom", "bing", "longdo", "wikipedia-th" -+ ] -+ } -+ }, -+ "tl": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-tl" -++ "ddg", "google-b-d", "bing", "amazondotcom", "twitter", "wikipedia-tl" -+ ] -+ } -+ }, -+ "tr": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "yandex-tr", "google-b-d", "ddg", "twitter", "wikipedia-tr" -++ "ddg", "yandex-tr", "google-b-d", "twitter", "wikipedia-tr" -+ ] -+ }, -+ "TR": { -+- "searchDefault": "Yandex" -++ "searchDefault": "DuckDuckGo" -+ }, -+ "BY": { -+- "searchDefault": "Yandex" -++ "searchDefault": "DuckDuckGo" -+ }, -+ "KZ": { -+- "searchDefault": "Yandex" -++ "searchDefault": "DuckDuckGo" -+ }, -+ "RU": { -+- "searchDefault": "Yandex" -++ "searchDefault": "DuckDuckGo" -+ } -+ }, -+ "trs": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "amazondotcom", "ddg", "wikipedia-es" -++ "ddg", "google-b-d", "bing", "amazondotcom", "wikipedia-es" -+ ] -+ } -+ }, -+ "uk": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "ddg", "wikipedia-uk", "hotline-ua" -++ "ddg", "google-b-d", "bing", "wikipedia-uk", "hotline-ua" -+ ] -+ } -+ }, -+ "ur": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "amazon-in", "ddg", "twitter", "wikipedia-ur" -++ "ddg", "google-b-d", "bing", "amazon-in", "twitter", "wikipedia-ur" -+ ] -+ } -+ }, -+ "uz": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-uz" -++ "ddg", "google-b-d", "bing", "amazondotcom", "twitter", "wikipedia-uz" -+ ] -+ } -+ }, -+ "vi": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "coccoc", "ddg", "wikipedia-vi" -++ "ddg", "google-b-d", "coccoc", "wikipedia-vi" -+ ] -+ } -+ }, -+ "wo": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "amazon-france", "ddg", "ebay-fr", "twitter", "wikipedia-wo" -++ "ddg", "google-b-d", "bing", "amazon-france", "ebay-fr", "twitter", "wikipedia-wo" -+ ] -+ } -+ }, -+ "xh": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "ddg", "wikipedia" -++ "ddg", "google-b-d", "bing", "wikipedia" -+ ] -+ } -+ }, -+ "zh-CN": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "baidu", "google-b-d", "bing", "ddg", "wikipedia-zh-CN", "amazondotcn" -++ "ddg", "baidu", "google-b-d", "bing", "wikipedia-zh-CN", "amazondotcn" -+ ] -+ }, -+ "CN": { -+- "searchDefault": "百度" -++ "searchDefault": "DuckDuckGo" -+ } -+ }, -+ "zh-TW": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "ddg", "readmoo", "wikipedia-zh-TW" -++ "ddg", "google-b-d", "readmoo", "wikipedia-zh-TW" -+ ] -+ } -+ } ++++ b/data/patches/fix-data-reporting-check.patch +@@ -0,0 +1,22 @@ ++--- a/old-configure.in.orig 1980-01-01 18:59:51.000000000 -0500 +++++ b/old-configure.in 2019-10-28 04:13:17.343606008 -0400 ++@@ -3116,7 +3116,7 @@ ++ dnl If we have any service that uploads data (and requires data submission ++ dnl policy alert), set MOZ_DATA_REPORTING. ++ dnl We need SUBST for build system and DEFINE for xul preprocessor. ++-if test -n "$MOZ_TELEMETRY_REPORTING" || test -n "$MOZ_SERVICES_HEALTHREPORT" || test -n "$MOZ_CRASHREPORTER"; then +++if test "$MOZ_TELEMETRY_REPORTING" = 1 || test "$MOZ_SERVICES_HEALTHREPORT" = 1 || test "$MOZ_CRASHREPORTER" = 1; then ++ MOZ_DATA_REPORTING=1 ++ AC_DEFINE(MOZ_DATA_REPORTING) ++ AC_SUBST(MOZ_DATA_REPORTING) ++--- a/old-configure.orig 1980-01-01 18:59:51.000000000 -0500 +++++ b/old-configure 2019-10-28 04:15:41.772322191 -0400 ++@@ -12150,7 +12150,7 @@ ++ ++ ++ ++-if test -n "$MOZ_TELEMETRY_REPORTING" || test -n "$MOZ_SERVICES_HEALTHREPORT" || test -n "$MOZ_CRASHREPORTER"; then +++if test "$MOZ_TELEMETRY_REPORTING" = 1 || test "$MOZ_SERVICES_HEALTHREPORT" = 1 || test "$MOZ_CRASHREPORTER" = 1; then ++ MOZ_DATA_REPORTING=1 ++ cat >> confdefs.pytmp <<\EOF ++ (''' MOZ_DATA_REPORTING ''', ' 1 ') diff --git a/data/patches/legacy-profiles.patch b/data/patches/legacy-profiles.patch +deleted file mode 100644 +index 33e9e99..0000000 +--- a/data/patches/legacy-profiles.patch ++++ /dev/null +@@ -1,11 +0,0 @@ +---- a/browser/moz.configure.orig 1980-01-01 18:59:51.000000000 -0500 +-+++ b/browser/moz.configure 2019-10-26 21:58:37.719617701 -0400 +-@@ -7,7 +7,7 @@ +- imply_option('MOZ_PLACES', True) +- imply_option('MOZ_SERVICES_HEALTHREPORT', True) +- imply_option('MOZ_SERVICES_SYNC', True) +--imply_option('MOZ_DEDICATED_PROFILES', True) +-+imply_option('MOZ_DEDICATED_PROFILES', False) +- imply_option('MOZ_BLOCK_PROFILE_DOWNGRADE', True) +- +- with only_when(target_is_linux & compile_environment): +diff --git a/data/patches/moz-configure-changes.patch b/data/patches/moz-configure-changes.patch new file mode 100644 -index 0000000..33e9e99 +index 0000000..aa6f1a5 --- /dev/null -+++ b/data/patches/legacy-profiles.patch -@@ -0,0 +1,11 @@ ++++ b/data/patches/moz-configure-changes.patch +@@ -0,0 +1,14 @@ +--- a/browser/moz.configure.orig 1980-01-01 18:59:51.000000000 -0500 -++++ b/browser/moz.configure 2019-10-26 21:58:37.719617701 -0400 -+@@ -7,7 +7,7 @@ +++++ b/browser/moz.configure 2019-10-28 01:36:13.132873871 -0400 ++@@ -5,9 +5,9 @@ ++ # file, You can obtain one at http://mozilla.org/MPL/2.0/. ++ + imply_option('MOZ_PLACES', True) -+ imply_option('MOZ_SERVICES_HEALTHREPORT', True) ++-imply_option('MOZ_SERVICES_HEALTHREPORT', True) +++imply_option('MOZ_SERVICES_HEALTHREPORT', False) + imply_option('MOZ_SERVICES_SYNC', True) +-imply_option('MOZ_DEDICATED_PROFILES', True) ++imply_option('MOZ_DEDICATED_PROFILES', False) + imply_option('MOZ_BLOCK_PROFILE_DOWNGRADE', True) + + with only_when(target_is_linux & compile_environment): +-- +2.23.0 + +From 62f50f15abc91483c6aa7a2ac7ebb972e6f9affd Mon Sep 17 00:00:00 2001 +From: Mark H Weaver +Date: Mon, 28 Oct 2019 13:05:28 -0400 +Subject: [PATCH 3/4] Disable MOZ_BLOCK_PROFILE_DOWNGRADE. + +It would be desirable to prevent downgrades from one major version of +IceCat to another. However, as MOZ_BLOCK_PROFILE_DOWNGRADE is +currently implemented, it prevents downgrades from one build of +IceCat-68.2 to an earlier build of IceCat-68.2. Until we can find a +satisfactory solution, we disable this functionality entirely. + +* data/patches/moz-configure-changes.patch: Set +MOZ_BLOCK_PROFILE_DOWNGRADE to 'False'. +--- + data/patches/moz-configure-changes.patch | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/data/patches/moz-configure-changes.patch b/data/patches/moz-configure-changes.patch +index aa6f1a5..53091a4 100644 +--- a/data/patches/moz-configure-changes.patch ++++ b/data/patches/moz-configure-changes.patch +@@ -1,6 +1,6 @@ + --- a/browser/moz.configure.orig 1980-01-01 18:59:51.000000000 -0500 +-+++ b/browser/moz.configure 2019-10-28 01:36:13.132873871 -0400 +-@@ -5,9 +5,9 @@ +++++ b/browser/moz.configure 2019-10-28 13:04:11.469562089 -0400 ++@@ -5,10 +5,10 @@ + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + + imply_option('MOZ_PLACES', True) +@@ -8,7 +8,9 @@ + +imply_option('MOZ_SERVICES_HEALTHREPORT', False) + imply_option('MOZ_SERVICES_SYNC', True) + -imply_option('MOZ_DEDICATED_PROFILES', True) ++-imply_option('MOZ_BLOCK_PROFILE_DOWNGRADE', True) + +imply_option('MOZ_DEDICATED_PROFILES', False) +- imply_option('MOZ_BLOCK_PROFILE_DOWNGRADE', True) +++imply_option('MOZ_BLOCK_PROFILE_DOWNGRADE', False) + + with only_when(target_is_linux & compile_environment): ++ option(env='MOZ_NO_PIE_COMPAT', +-- +2.23.0 + +From 036f74092d223976054f9eafd8caa056f5975c54 Mon Sep 17 00:00:00 2001 +From: Mark H Weaver +Date: Mon, 28 Oct 2019 19:57:37 -0400 +Subject: [PATCH 4/4] Improve branding for version 68 ESR. + +* data/branding/icecat/locales/en-US/brand.dtd: Add brandProductName. +* data/branding/icecat/locales/en-US/brand.ftl: Add +brand-shorter-name, brand-full-name, brand-product-name, +vendor-short-name, and trademarkInfo. +* data/branding/icecat/locales/en-US/brand.properties: Add +brandProductName. +* makeicecat: Limit replacement of trademarkInfo.part1 of brand.dtd +files to only be done within l10n directory. Replace trademarkInfo of +brand.ftl files within l10n directory. +--- + data/branding/icecat/locales/en-US/brand.dtd | 1 + + data/branding/icecat/locales/en-US/brand.ftl | 5 +++++ + data/branding/icecat/locales/en-US/brand.properties | 1 + + makeicecat | 3 ++- + 4 files changed, 9 insertions(+), 1 deletion(-) + +diff --git a/data/branding/icecat/locales/en-US/brand.dtd b/data/branding/icecat/locales/en-US/brand.dtd +index 3788266..475ce7d 100644 +--- a/data/branding/icecat/locales/en-US/brand.dtd ++++ b/data/branding/icecat/locales/en-US/brand.dtd +@@ -5,5 +5,6 @@ + + + ++ + + +diff --git a/data/branding/icecat/locales/en-US/brand.ftl b/data/branding/icecat/locales/en-US/brand.ftl +index bd7fbe0..7c9fcc8 100644 +--- a/data/branding/icecat/locales/en-US/brand.ftl ++++ b/data/branding/icecat/locales/en-US/brand.ftl +@@ -2,4 +2,9 @@ + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + ++-brand-shorter-name = IceCat + -brand-short-name = IceCat ++-brand-full-name = GNU IceCat ++-brand-product-name = IceCat ++-vendor-short-name = GNU ++trademarkInfo = The IceCat logo is Copyright 2008-2015 Free Software Foundation, released under the terms of the GNU Lesser General Public License, version 3 or any later version. +diff --git a/data/branding/icecat/locales/en-US/brand.properties b/data/branding/icecat/locales/en-US/brand.properties +index 85e2894..9b9cf97 100644 +--- a/data/branding/icecat/locales/en-US/brand.properties ++++ b/data/branding/icecat/locales/en-US/brand.properties +@@ -5,6 +5,7 @@ + brandShorterName=IceCat + brandShortName=IceCat + brandFullName=IceCat ++brandProductName=IceCat + vendorShortName=GNU + + syncBrandShortName=Sync +diff --git a/makeicecat b/makeicecat +index 1bcf465..3ff2ead 100644 +--- a/makeicecat ++++ b/makeicecat +@@ -226,7 +226,8 @@ cp $DATA/bookmarks.html.in browser/locales/generic/profile/bookmarks.html.in + + # Custom legal about pages + +-find -wholename '*/brand.dtd' |xargs /bin/sed 's/trademarkInfo.part1.*/trademarkInfo.part1 "">/' -i ++find l10n -wholename '*/brand.dtd' |xargs /bin/sed 's/trademarkInfo.part1.*/trademarkInfo.part1 "">/' -i ++find l10n -wholename '*/brand.ftl' |xargs /bin/sed 's/^trademarkInfo = .*/trademarkInfo = The IceCat logo is Copyright 2008-2015 Free Software Foundation, released under the terms of the GNU Lesser General Public License, version 3 or any later version./' -i + + for STRING in rights.intro-point3-unbranded rights.intro-point4a-unbranded rights.intro-point4b-unbranded rights.intro-point4c-unbranded + do +-- +2.23.0 + diff --git a/gnu/packages/patches/icecat-makeicecat.patch b/gnu/packages/patches/icecat-makeicecat.patch index a9920d6474..90a79eebc9 100644 --- a/gnu/packages/patches/icecat-makeicecat.patch +++ b/gnu/packages/patches/icecat-makeicecat.patch @@ -25,7 +25,7 @@ index b04c731..06d1f3f 100644 -wget -N https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${FFVERSION}esr/source/firefox-${FFVERSION}esr.source.tar.xz.asc -gpg --recv-keys --keyserver keyserver.ubuntu.com 14F26682D0916CDD81E37B6D61B7B526D98F0353 -gpg --verify firefox-${FFVERSION}esr.source.tar.xz.asc --echo -n f56f5fa5a4744be0b9acf259cb991254d708a50b9a0a12d1d846ffa5a6c409ac firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c - +-echo -n 85f1c2eaf68ebedcbc0b78a342f6d16ef0865dedd426a1bba94b75c85f716f38 firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c - - -echo Extracting Firefox tarball -tar -xf firefox-${FFVERSION}esr.source.tar.xz @@ -37,7 +37,7 @@ index b04c731..06d1f3f 100644 +# wget -N https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${FFVERSION}esr/source/firefox-${FFVERSION}esr.source.tar.xz.asc +# gpg --recv-keys --keyserver keyserver.ubuntu.com 14F26682D0916CDD81E37B6D61B7B526D98F0353 +# gpg --verify firefox-${FFVERSION}esr.source.tar.xz.asc -+# echo -n f56f5fa5a4744be0b9acf259cb991254d708a50b9a0a12d1d846ffa5a6c409ac firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c - ++# echo -n 85f1c2eaf68ebedcbc0b78a342f6d16ef0865dedd426a1bba94b75c85f716f38 firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c - +# +# echo Extracting Firefox tarball +# tar -xf firefox-${FFVERSION}esr.source.tar.xz @@ -96,24 +96,9 @@ index b04c731..06d1f3f 100644 -cd $SOURCEDIR +# cd $SOURCEDIR + shopt -s nullglob for patch in $DATA/patches/*.patch; do - echo Patching with file: $patch -@@ -226,10 +226,10 @@ cp $DATA/bookmarks.html.in browser/locales/generic/profile/bookmarks.html.in - - find -wholename '*/brand.dtd' |xargs /bin/sed 's/trademarkInfo.part1.*/trademarkInfo.part1 "">/' -i - --for STRING in rights.intro-point3-unbranded rights.intro-point4a-unbranded rights.intro-point4b-unbranded rights.intro-point4c-unbranded --do -- find -name aboutRights.dtd | xargs sed -i "s/ENTITY $STRING.*/ENTITY $STRING \"\">/" --done -+# for STRING in rights.intro-point3-unbranded rights.intro-point4a-unbranded rights.intro-point4b-unbranded rights.intro-point4c-unbranded -+# do -+# find -name aboutRights.dtd | xargs sed -i "s/ENTITY $STRING.*/ENTITY $STRING \"\">/" -+# done - - for STRING in rights-intro-point-2 rights-intro-point-3 rights-intro-point-4 rights-intro-point-5 rights-intro-point-6 rights-webservices rights-safebrowsing - do -@@ -595,6 +595,6 @@ sed 's/777/755/;' -i toolkit/crashreporter/google-breakpad/Makefile.in +@@ -598,6 +598,6 @@ sed 's/777/755/;' -i toolkit/crashreporter/google-breakpad/Makefile.in # Fix CVE-2012-3386 /bin/sed 's/chmod a+w/chmod u+w/' -i ./js/src/ctypes/libffi/Makefile.in ./toolkit/crashreporter/google-breakpad/Makefile.in ./toolkit/crashreporter/google-breakpad/src/third_party/glog/Makefile.in || true -- cgit v1.2.3