From 81881d89b2bf7d502dd14fcccdb471fec6f6b206 Mon Sep 17 00:00:00 2001 From: Ruben Rodriguez 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 0000000..30d56ad --- /dev/null +++ b/helpers/DATA/firefox/reprocess-search-config.py @@ -0,0 +1,52 @@ +#! /usr/bin/python3 + +# Copyright (C) 2020 Ruben Rodriguez +# +# 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 3d336ea..0000000 --- a/helpers/DATA/firefox/searchplugins/trisquel-packages.xml +++ /dev/null @@ -1,9 +0,0 @@ - -Trisquel Packages -Search packages.trisquel.info -UTF-8 -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 -http://packages.trisquel.info/ - - - diff --git a/helpers/DATA/firefox/searchplugins/trisquel.xml b/helpers/DATA/firefox/searchplugins/trisquel.xml deleted file mode 100644 index 610d8a9..0000000 --- a/helpers/DATA/firefox/searchplugins/trisquel.xml +++ /dev/null @@ -1,9 +0,0 @@ - -Trisquel -Trisquel GNU/Linux -UTF-8 -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 - - - - 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 0000000..c31364b --- /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 2daf059..481a8c2 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 9a1b0a6..26cc725 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