Update GNU IceCat to 91.2.0

* data/files-to-append/browser/locales/en-US/browser/preferences/preferences.ftl
(detect-network-connectivity-option)
(detect-network-connectivity-description): Add label and description
for new IceCat-specific preference for toggling the network
connectivity service.
* data/newtab/directory.png:
* data/newtab/fsf.ico:
* data/newtab/fsf.png:
* data/newtab/gnu.ico:
* data/newtab/gnu.png:
* data/newtab/libreplanet.ico:
* data/newtab/libreplanet.png:
* data/newtab/trisquel.ico:
* data/newtab/trisquel.png:
* data/newtab/wikinews.ico:
* data/newtab/wikinews.png:
* data/newtab/wikipedia-org@2x.png:
* data/newtab/wikipedia.ico:
* data/newtab/wikipedia.png: New files, imported from Trisquel's
Abrowser build helper.  These will be used for the "top sites"
displayed on the newtab page.
* data/patches/default-search-duckduckgo.patch:
* data/patches/duckduckgo-no-params.patch: Remove.  The search engine
machinery has been completely changed upstream, yet again.
* data/patches/disable-settings-services.patch:
* data/patches/hide-protections-dashboard.patch:
* data/patches/icecat-about-dialog.patch:
* data/patches/moz-configure-changes.patch: Adapt to v91.
* data/patches/icecat-preferences.patch: Change the preference key for
the captive portal toggle from 'captivedetect.canonicalURL' to
'network.captive-portal-service.enabled'.  There was at least one
report from several years back that
'network.captive-portal-service.enabled' was not respected:
    https://bugzilla.mozilla.org/show_bug.cgi?id=1481085
But it seems to have been a rare occurrence/bug.  As such, I believe
it's okay to toggle this preference instead of changing the address
'captivedetect.canonicalURL' points to.
* data/settings.js: Set several preferencess to try and disable new
annoying VPN- and mobile-related promos.
* makeicecat: Adapt to v91.  Update FFMAJOR, FFMINOR,
SOURCEBALL_CHECKSUM, and L10N_CMP_REV.  We now require Python 3 and
the jsonschema Python library as build dependencies.  So check for
their existence and error out if they don't.  Given that the search
engine machinery has been completely changed yet again, add a
'configure_search' function to make relevant changes, and ultimately
run the new 'tools/process-json-files.py' Python script.  Also comment
out the 'configure_mobile', to be removed soon, as Mozilla has long
since removed the parts of the firefox code base for mobile builds,
and their mobile browser is now a separate project and code base.
* tools/process-json-files.py: New file, from packagers/maintainers of
Trisquel's Abrowser and Parabola's Iceweasel, for processing and
modifying various JSON files -- such as those relating to search
engines -- in the firefox code base.

1 files changed, 142 insertions, 8 deletions

diff --git a/makeicecat b/makeicecat
index 1912555..bf2b7a6 100755
--- a/makeicecat
+++ b/makeicecat
@@ -21,11 +21,11 @@
 
 
 # metadata
-readonly FFMAJOR=78
-readonly FFMINOR=15
+readonly FFMAJOR=91
+readonly FFMINOR=2
 readonly FFSUB=0
 readonly GNUVERSION=1
-readonly SOURCEBALL_CHECKSUM='a4438d84d95171a6d4fea9c9f02c2edbf0475a9c614d968ebe2eedc25a672151'
+readonly SOURCEBALL_CHECKSUM='3ef3cfd321d0c2c80ee1b41b8baf7a1ea4daf93c29e1377274933440ff5e42c3'
 readonly SOURCEBALL_SIGNINGKEY='14F26682D0916CDD81E37B6D61B7B526D98F0353'
 readonly FFVERSION=${FFMAJOR}.${FFMINOR}.${FFSUB}
 readonly SOURCEBALL=firefox-${FFVERSION}esr.source.tar.xz
@@ -41,7 +41,7 @@ readonly LIST_URL=lists.gnu.org/mailman/listinfo/bug-gnuzilla
 # l10n
 readonly L10N_URL=https://hg.mozilla.org/l10n-central
 readonly L10N_CMP_URL=https://hg.mozilla.org/l10n/compare-locales
-readonly L10N_CMP_REV=RELEASE_8_0_0
+readonly L10N_CMP_REV=RELEASE_8_1_0
 readonly L10N_PREFS_DIR=browser/chrome/browser/preferences
 readonly L10N_DTD_FILE=${L10N_PREFS_DIR}/advanced-scripts.dtd
 readonly PREFS_IN_FILE=browser/locales/en-US/browser/preferences/preferences.ftl
@@ -164,6 +164,26 @@ validate_env()
        'wget' from the Trisquel 'wget' package"
         return 1
     fi
+
+    # verify that Python 3 is available
+    if ! which python3 &> /dev/null
+    then
+        echo -e "\nERROR: This script requires Python 3:
+ e.g.: 'python3' from the Guix 'python' package
+       'python3' from the Parabola 'python' package
+       'python3' from the Trisquel 'python3' package"
+        return 1
+    fi
+
+    # verify that Python 3 jsonschema is available
+    if ! python3 -c 'import jsonschema' &> /dev/null
+    then
+        echo -e "\nERROR: This script requires Python 3 jsonschema:
+ e.g.: 'jsonschema' from the Guix 'python-jsonschema' package
+       'jsonschema' from the Parabola 'python-jsonschema' package
+       'jsonschema' from the Trisquel 'python3-jsonschema' package"
+        return 1
+    fi
 }
 
 prepare_env()
@@ -312,7 +332,7 @@ configure()
     # These are not condensed into a single sed script so that it
     # fails on individual commands that didn't change the source
     local activity_stream=browser/components/newtab/lib/ActivityStream.jsm
-    sed '/^const DEFAULT_SITES/,/^])\;/c const DEFAULT_SITES = new Map\([[""]]\);' -i $activity_stream
+    sed '/^const DEFAULT_SITES/,/^])\;/c const DEFAULT_SITES = new Map\([[""]]\);' -i browser/components/newtab/lib/DefaultSites.jsm
     sed '/"showSponsored"/,/value/s/value: true/value: false/' -i $activity_stream
     sed '/  "telemetry"/,/value/s/value: true/value: false/' -i $activity_stream
     sed '/"section\.highlights\.includePocket"/,/value/s/value: true/value: false/' -i $activity_stream
@@ -320,12 +340,126 @@ configure()
     sed '/stories_endpoint: `/,/}`,/c stories_endpoint: "",' -i $activity_stream
     sed 's/\(stories_referrer:\) .http.*/\1 "",/' -i $activity_stream
     sed 's/\(topics_endpoint:\) .http.*/\1 "",/' -i $activity_stream
-    sed '/"telemetry\.structuredIngestion"/,/value/s/value: .*/value: false,/' -i $activity_stream
     sed '/"telemetry\.structuredIngestion\.endpoint"/,/value/s/value: .*/value: "",/' -i $activity_stream
     sed '/layout_endpoint:/,/http/s/"http.*/"",/' -i $activity_stream
     sed '/name: "telemetry"/,/value/s/value: true/value: false/' -i $activity_stream
     sed '/name: "system\.topstories"/,/},/s/.*!!locales.*/false/' -i $activity_stream
     sed 's/.Ubuntu., //' -i browser/components/newtab/css/activity-stream*.css
+
+    sed '/^]$/d' -i browser/components/newtab/data/content/tippytop/top_sites.json
+    sed 's/}$/},/' -i browser/components/newtab/data/content/tippytop/top_sites.json
+    cat << EOF >> browser/components/newtab/data/content/tippytop/top_sites.json
+{
+  "domains": ["gnu.org"],
+  "image_url": "images/gnu.png",
+  "favicon_url": "favicons/gnu.ico"
+},
+{
+  "domains": ["fsf.org"],
+  "image_url": "images/fsf.png",
+  "favicon_url": "favicons/fsf.ico"
+},
+{
+  "domains": ["directory.fsf.org"],
+  "image_url": "images/directory.png",
+  "favicon_url": "favicons/fsf.ico"
+},
+{
+  "domains": ["libreplanet.org"],
+  "image_url": "images/libreplanet.png",
+  "favicon_url": "favicons/libreplanet.ico"
+},
+{
+  "domains": ["trisquel.info"],
+  "image_url": "images/trisquel.png",
+  "favicon_url": "favicons/trisquel.ico"
+},
+{
+  "domains": ["wikipedia.org"],
+  "image_url": "images/wikipedia.png",
+  "favicon_url": "favicons/wikipedia.ico"
+},
+{
+  "domains": ["wikinews.org"],
+  "image_url": "images/wikinews.png",
+  "favicon_url": "favicons/wikinews.ico"
+}
+]
+EOF
+
+    cat << EOF > services/settings/dumps/main/top-sites.json
+{
+  "data": [
+    {
+      "url": "https://www.gnu.org/",
+      "order": 0,
+      "title": "GNU",
+      "id": "2a833806-e5c1-58e9-8b7c-69d9417a1253",
+      "last_modified": 1633983928584
+    },
+    {
+      "url": "https://www.fsf.org/",
+      "order": 1,
+      "title": "FSF",
+      "id": "d4e3e7e2-64d3-5bac-9c59-3c5c8e1efd8c",
+      "last_modified": 1633983928585
+    },
+    {
+      "url": "https://directory.fsf.org/",
+      "order": 2,
+      "title": "Free Software Directory",
+      "id": "dbff6206-2ada-57ad-8091-8a62ac37be4c",
+      "last_modified": 1633983928586
+    },
+    {
+      "url": "https://libreplanet.org/",
+      "order": 3,
+      "title": "LibrePlanet",
+      "id": "6f586839-4063-58b8-95ed-62e034e1915e",
+      "last_modified": 1633983928587
+    },
+    {
+      "url": "https://trisquel.info",
+      "order": 4,
+      "title": "Trisquel",
+      "id": "17aeb24c-da88-53bc-8915-c3e3d458070d",
+      "last_modified": 1633983928588
+    },
+    {
+      "url": "https://www.wikipedia.org/",
+      "order": 5,
+      "title": "Wikipedia",
+      "id": "5a18acd7-0440-5512-b3a4-20a35bdc9a1d",
+      "last_modified": 1633983928589
+    },
+    {
+      "url": "https://www.wikinews.org/",
+      "order": 6,
+      "title": "Wikinews",
+      "id": "3bb633ba-0823-4501-b3b5-bc1b8670e3e1",
+      "last_modified": 1633983928590
+    }
+  ]
+}
+EOF
+
+    cp "${DATADIR}"/newtab/*.ico browser/components/newtab/data/content/tippytop/favicons/
+    cp "${DATADIR}"/newtab/*.png browser/components/newtab/data/content/tippytop/images/
+}
+
+configure_search()
+{
+    # Leak less info to DuckDuckGo.
+    sed '/"params"/,/],/d' -i browser/components/search/extensions/ddg/manifest.json
+
+    # Add a DDG HTML search.
+    cp -a browser/components/search/extensions/ddg browser/components/search/extensions/ddg-html
+    sed 's|/duckduckgo.com/|/html.duckduckgo.com/html/|' -i browser/components/search/extensions/ddg-html/manifest.json
+    sed 's|DuckDuckGo|DuckDuckGo (HTML)|' -i browser/components/search/extensions/ddg-html/manifest.json
+    sed 's|ddg@|ddg-html@|' -i browser/components/search/extensions/ddg-html/manifest.json
+
+    # Process various JSON pre-configuration dumps.
+    python3 ../../tools/process-json-files.py . browser/components/extensions/schemas/
 }
 
 configure_mobile()
@@ -430,7 +564,6 @@ apply_batch_branding()
 {
     find . | tac | grep -i fennec  | ${RENAME_CMD} --nofullpath -E 's/fennec/icecatmobile/;' -E 's/Fennec/IceCatMobile/;'
     find . | tac | grep -i firefox | ${RENAME_CMD} --nofullpath -E 's/firefox/icecat/;' -E 's/Firefox/IceCat/;'
-    find services/fxaccounts/rust-bridge | tac | ${RENAME_CMD} --nofullpath -E 's/icecat-accounts/firefox-accounts/;' -E 's/IceCatAccounts/FirefoxAccounts/;'
 
     echo "Running batch rebranding (this will take a while)"
     local sed_script="
@@ -730,7 +863,8 @@ extract_sources
 fetch_l10n
 apply_patches
 configure
-configure_mobile
+configure_search
+# configure_mobile
 apply_branding
 apply_batch_branding
 apply_icons_branding