From 81881d89b2bf7d502dd14fcccdb471fec6f6b206 Mon Sep 17 00:00:00 2001
From: Ruben Rodriguez <ruben@trisquel.info>
Date: Thu, 6 Aug 2020 21:38:01 -0400
Subject: [PATCH] Abrowser: changes for v79
---
.../DATA/firefox/reprocess-search-config.py | 52 ++++++++++++++++++
.../searchplugins/trisquel-packages.xml | 9 ---
.../DATA/firefox/searchplugins/trisquel.xml | 9 ---
.../searchplugins/trisquel/favicon.ico | Bin 0 -> 11630 bytes
.../searchplugins/trisquel/manifest.json | 25 +++++++++
helpers/DATA/firefox/settings.js | 2 +-
helpers/make-firefox | 46 +++++-----------
7 files changed, 92 insertions(+), 51 deletions(-)
create mode 100644 helpers/DATA/firefox/reprocess-search-config.py
delete mode 100644 helpers/DATA/firefox/searchplugins/trisquel-packages.xml
delete mode 100644 helpers/DATA/firefox/searchplugins/trisquel.xml
create mode 100644 helpers/DATA/firefox/searchplugins/trisquel/favicon.ico
create mode 100644 helpers/DATA/firefox/searchplugins/trisquel/manifest.json
diff --git a/helpers/DATA/firefox/reprocess-search-config.py b/helpers/DATA/firefox/reprocess-search-config.py
new file mode 100644
index 00000000..30d56ad2
--- /dev/null
+++ b/helpers/DATA/firefox/reprocess-search-config.py
@@ -0,0 +1,52 @@
+#! /usr/bin/python3
+
+# Copyright (C) 2020 Ruben Rodriguez <ruben@trisquel.info>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+import json
+import sys
+
+data={}
+
+with open(sys.argv[1]) as f:
+ data=json.load(f)
+
+ whitelist=['ddg@search.mozilla.org','google@search.mozilla.org','wikipedia@search.mozilla.org','bing@search.mozilla.org']
+
+ i=0
+ newdata={"data":[]}
+ trisquel={}
+
+ for item in data["data"]:
+ if item["webExtension"]["id"] in whitelist:
+ item["appliesTo"][0]["included"]["everywhere"]=True
+ item["appliesTo"][0]["default"]="no"
+ if item["webExtension"]["id"] == 'ddg@search.mozilla.org':
+ item["appliesTo"][0]["default"]="yes"
+ item["appliesTo"][1]["application"]["orderHint"]=5000
+ item["appliesTo"][1]["application"]["override"]=True
+ del item["appliesTo"][1]["application"]["distributions"]
+ del item["appliesTo"][1]["extraParams"]
+ del item["extraParams"]
+ newdata["data"].append(item)
+ i+=1
+ trisquel={u'webExtension': {u'id': u'trisquel@search.mozilla.org'}, u'appliesTo': [{u'included': {u'everywhere': True}, 'default': 'no'}, {u'override': True, u'application': {'override': True, 'orderHint': 4000}}], u'id': u'4341e834-7290-4d33-beb0-377c04a49566', u'last_modified': 1595254832054, u'telemetryId': u'trisquel', u'schema': 1594312388241}
+ ddghtml={u'webExtension': {u'id': u'ddg-html@search.mozilla.org'}, u'appliesTo': [{u'included': {u'everywhere': True}, 'default': 'no'}, {u'override': True, u'application': {'override': True, 'orderHint': 3000}}], u'id': u'55bf6437-3b82-41a6-98be-09c3b53b5b4d', u'last_modified': 1595254832054, u'telemetryId': u'ddg-html', u'schema': 1594312388241}
+ newdata["data"].append(trisquel)
+ newdata["data"].append(ddghtml)
+
+with open(sys.argv[1], 'w') as outfile:
+ json.dump(newdata, outfile, indent=4)
diff --git a/helpers/DATA/firefox/searchplugins/trisquel-packages.xml b/helpers/DATA/firefox/searchplugins/trisquel-packages.xml
deleted file mode 100644
index 3d336ea6..00000000
--- a/helpers/DATA/firefox/searchplugins/trisquel-packages.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/">
-<os:ShortName>Trisquel Packages</os:ShortName>
-<os:Description>Search packages.trisquel.info</os:Description>
-<os:InputEncoding>UTF-8</os:InputEncoding>
-<os:Image width="16" height="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACi0lEQVQ4jY2T3UtTARiH92/0DxR0E10EZTeBF3VhBEqF9EEXUURUpn2AmohNS60oUrRMQ1D86ItKKz+atjmd25w5S82zlXPOqfNsc27nzOPOeboQJlakL/xuXnifi+d9Xx1bLEVZxTHhxzjsRZJXkn3dVob9gQhp+d1kFhs5rv9C6s1ufnjEjQDHhJ+bNXbOlJsprHfwyxdMAgrrHbzvcxONxXF7F6l47eRUaR+qqq4BWgwCO85+5KjeyMm7Jraf62DnhU5aDZMA3KodJByR0DSNmjdDCFML7L/Wy4IYQReNxUm52oXB7sEzG6Lb5sEx7uNgXi8pOT04JuYwO308bB3mrclNfbuTFoNAWoGJmLSCzusPcij3M6GlGJUvhzDYpymuH6Tvq5cDuX0cKzHjW1jCMxtk1DWPecRLZqkFfcPwmoNgOMrhgl5m5sJJu2UNVqZnRY7oLaSXWDlRZuFGjZ3LlVYOFpg5c6+fxVB0XeLjV07OP7LwosfFs7YxGjvGsI3Nkl5iJTW/nz3Zvey+1Mm+rA7y6uyEI9LGNWqahlOY59Ogh1HXPAA51Va2ne4gv86GazqQlPhn/fMOFCXB3qxOMu+YCASXud80RNFzC7Yx/9YAYijKrotd1LZP8OTtKG6viCSvcL16AGF6cXNATFohJbubqnffefruG+M/51FVlWaDQE3b+OYAgOyqQTKKTATEZT6YXQieAOXNIzR2Tf4N0DQNVVVZXV1FURQURcHrF8m4beTsgwFaewTKm0c4qjcy5RNJJBJJoTpN04jH40QiEUKhEKIoJuOemuFBs40rFWbuN9kYFzwEg0HC4TCSJK3/QiKRQJZlZFkmHo//N7IsI0kSiqKgaRq/AbKDgxgo7zYPAAAAAElFTkSuQmCC</os:Image>
-<SearchForm>http://packages.trisquel.info/</SearchForm>
-<os:Url type="text/html" method="GET" template="http://packages.trisquel.info/search?suite=default&section=all&arch=any&searchon=names&keywords={searchTerms}">
-</os:Url>
-</SearchPlugin>
diff --git a/helpers/DATA/firefox/searchplugins/trisquel.xml b/helpers/DATA/firefox/searchplugins/trisquel.xml
deleted file mode 100644
index 610d8a95..00000000
--- a/helpers/DATA/firefox/searchplugins/trisquel.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/">
-<os:ShortName>Trisquel</os:ShortName>
-<os:Description>Trisquel GNU/Linux</os:Description>
-<os:InputEncoding>UTF-8</os:InputEncoding>
-<os:Image width="16" height="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACi0lEQVQ4jY2T3UtTARiH92/0DxR0E10EZTeBF3VhBEqF9EEXUURUpn2AmohNS60oUrRMQ1D86ItKKz+atjmd25w5S82zlXPOqfNsc27nzOPOeboQJlakL/xuXnifi+d9Xx1bLEVZxTHhxzjsRZJXkn3dVob9gQhp+d1kFhs5rv9C6s1ufnjEjQDHhJ+bNXbOlJsprHfwyxdMAgrrHbzvcxONxXF7F6l47eRUaR+qqq4BWgwCO85+5KjeyMm7Jraf62DnhU5aDZMA3KodJByR0DSNmjdDCFML7L/Wy4IYQReNxUm52oXB7sEzG6Lb5sEx7uNgXi8pOT04JuYwO308bB3mrclNfbuTFoNAWoGJmLSCzusPcij3M6GlGJUvhzDYpymuH6Tvq5cDuX0cKzHjW1jCMxtk1DWPecRLZqkFfcPwmoNgOMrhgl5m5sJJu2UNVqZnRY7oLaSXWDlRZuFGjZ3LlVYOFpg5c6+fxVB0XeLjV07OP7LwosfFs7YxGjvGsI3Nkl5iJTW/nz3Zvey+1Mm+rA7y6uyEI9LGNWqahlOY59Ogh1HXPAA51Va2ne4gv86GazqQlPhn/fMOFCXB3qxOMu+YCASXud80RNFzC7Yx/9YAYijKrotd1LZP8OTtKG6viCSvcL16AGF6cXNATFohJbubqnffefruG+M/51FVlWaDQE3b+OYAgOyqQTKKTATEZT6YXQieAOXNIzR2Tf4N0DQNVVVZXV1FURQURcHrF8m4beTsgwFaewTKm0c4qjcy5RNJJBJJoTpN04jH40QiEUKhEKIoJuOemuFBs40rFWbuN9kYFzwEg0HC4TCSJK3/QiKRQJZlZFkmHo//N7IsI0kSiqKgaRq/AbKDgxgo7zYPAAAAAElFTkSuQmCC</os:Image>
-<os:Url type="text/html" method="GET" template="http://trisquel.info/search/node/{searchTerms}?page={startPage}">
-</os:Url><os:Url type="application/rss+xml" method="GET" template="http://trisquel.info/opensearch/node/{searchTerms}?page={startPage}">
-</os:Url>
-</SearchPlugin>
diff --git a/helpers/DATA/firefox/searchplugins/trisquel/favicon.ico b/helpers/DATA/firefox/searchplugins/trisquel/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..0c0408c1c39beaca4904137b0e715491211b5b86
GIT binary patch
literal 11630
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
WyBXVlPy1qj2k}AT<#l1=`@aCod?Yvk
literal 0
HcmV?d00001
diff --git a/helpers/DATA/firefox/searchplugins/trisquel/manifest.json b/helpers/DATA/firefox/searchplugins/trisquel/manifest.json
new file mode 100644
index 00000000..c31364bf
--- /dev/null
+++ b/helpers/DATA/firefox/searchplugins/trisquel/manifest.json
@@ -0,0 +1,25 @@
+{
+ "name": "Trisquel",
+ "description": "Search Trisquel GNU/Linux site",
+ "manifest_version": 2,
+ "version": "1.0",
+ "applications": {
+ "gecko": {
+ "id": "trisquel@search.mozilla.org"
+ }
+ },
+ "hidden": true,
+ "icons": {
+ "16": "favicon.ico"
+ },
+ "web_accessible_resources": [
+ "favicon.ico"
+ ],
+ "chrome_settings_overrides": {
+ "search_provider": {
+ "name": "Trisquel",
+ "search_url": "https://trisquel.info/search/node/{searchTerms}",
+ "search_form": "https://trisquel.info/search/node/{searchTerms}"
+ }
+ }
+}
diff --git a/helpers/DATA/firefox/settings.js b/helpers/DATA/firefox/settings.js
index 2daf059d..481a8c2a 100644
--- a/helpers/DATA/firefox/settings.js
+++ b/helpers/DATA/firefox/settings.js
@@ -232,7 +232,7 @@ pref("browser.onboarding.updatetour", "performance,library,singlesearch,customiz
pref("browser.onboarding.enabled", false);
// New tab settings
-pref("browser.newtabpage.activity-stream.default.sites", "https://www.trisquel.info/,https://www.gnu.org/,https://www.fsf.org/,https://libreplanet.org/,https://www.wikipedia.org/,https://www.wikinews.org/");
+pref("browser.newtabpage.activity-stream.default.sites", "https://trisquel.info/,https://www.gnu.org/,https://www.fsf.org/,https://libreplanet.org/,https://www.wikipedia.org/wiki/,https://www.wikinews.org/wiki/");
pref("browser.newtabpage.activity-stream.showTopSites",true);
pref("browser.newtabpage.activity-stream.feeds.section.topstories",false);
pref("browser.newtabpage.activity-stream.feeds.snippets",false);
diff --git a/helpers/make-firefox b/helpers/make-firefox
index 9a1b0a67..26cc725b 100644
--- a/helpers/make-firefox
+++ b/helpers/make-firefox
@@ -18,13 +18,10 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-VERSION=73
+VERSION=74
. ./config
-patch -p1 < debian/patches/partially-revert-google-search-update.patch
-patch -p1 < debian/patches/no-region-overrides-for-google-search.patch
-
sed 's/clang-10 |//' -i debian/control.in
sed 's/libclang-10-dev |//' -i debian/control.in
sed 's/llvm-10-dev |//' -i debian/control.in
@@ -89,21 +86,22 @@ sed "s/iceweasel,/iceweasel, firefox,/" -i debian/control.in
sed -i /ubuntu-bookmarks/d debian/patches/series
rm debian/patches/ubuntu-bookmarks*
-#Unbrand url codes for google and amazon
-find debian/searchplugins |grep google| xargs -i /bin/sed '/ubuntu/d; /channel/d' -i {}
-find debian/searchplugins |grep amazon| xargs -i /bin/sed '/canoniccom/d;' -i {}
-
-#Disable canonical referrer on DDG
-sed 's/&t=canonical//' -i debian/searchplugins/ddg.xml
-
# Make DuckDuckGo the default engine
-rm debian/patches/no-region-overrides-for-google-search.patch debian/patches/partially-revert-google-search-update.patch
-sed '/no-region-overrides-for-google-search/d; /partially-revert-google-search-update/d' -i debian/patches/series
sed '/searchDefault/s/: \".*\"/: "DuckDuckGo"/g' -i browser/components/search/extensions/list.json
sed '/visibleDefaultEngines/{n; s/"ddg",//; s/\"/"ddg", "/}' -i browser/components/search/extensions/list.json
+sed '/searchOrder/s/"Google", "Bing"/"DuckDuckGo", "Google"/' -i browser/components/search/extensions/list.json
-# contact link
-#sed 's_https://input.mozilla.org/feedback_https://trisquel.info/contact_' -i browser/base/content/utilityOverlay.js
+# Custom DDG
+sed '/"params"/,/],/d' -i browser/components/search/extensions/ddg/manifest.json
+cp browser/components/search/extensions/ddg browser/components/search/extensions/ddg-html -a
+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
+# disable ads, disable redirect
+#sed '/search/s|q=|k1=-1\&kd=-1\&ko=1\&q=|' -i browser/components/search/extensions/ddg/manifest.json
+
+# Reprocess search preconfiguration dump
+python $DATA/reprocess-search-config.py ./services/settings/dumps/main/search-config.json
cat << EOF > debian/distribution.ini
[Global]
@@ -176,23 +174,7 @@ rm -rf ./browser/metro ./addon-sdk/source/doc/static-files/media ./browser/theme
cp $DATA/bookmarks.html.in browser/locales/generic/profile/bookmarks.html.in
#Trisquel custom search engines
-cp $DATA/searchplugins/*.xml debian/searchplugins/
-sed '/additions/,$d' debian/config/searchplugins.conf -i
-cat << EOF >> debian/config/searchplugins.conf
- "additions": [
- {
- "name": "Trisquel",
- "include_locales": [ "*" ],
- "engine": "trisquel"
- },
- {
- "name": "Trisquel packages",
- "include_locales": [ "*" ],
- "engine": "trisquel-packages"
- }
- ]
-}
-EOF
+cp -a $DATA/searchplugins/* browser/components/search/extensions/
# install extensions
for extension in $(ls -1 $DATA/extensions/); do
--
GitLab