diff --git a/helpers/DATA/firefox/newtab/trisquel-packages.ico b/helpers/DATA/firefox/newtab/trisquel-packages.ico
new file mode 100644
index 0000000000000000000000000000000000000000..5a727c10e1198f86902f059494aef9917aa35bbe
Binary files /dev/null and b/helpers/DATA/firefox/newtab/trisquel-packages.ico differ
diff --git a/helpers/DATA/firefox/newtab/trisquel-packages.png b/helpers/DATA/firefox/newtab/trisquel-packages.png
new file mode 100644
index 0000000000000000000000000000000000000000..c55888dffc4571185f12d93f03f05f07dd087028
Binary files /dev/null and b/helpers/DATA/firefox/newtab/trisquel-packages.png differ
diff --git a/helpers/DATA/firefox/process-json-files.py b/helpers/DATA/firefox/process-json-files.py
index 53ee523f57aeb801e0aa19216b8c17e1edc387d3..28cd79a8eec46e7b61879f257b38350fd24c1d2d 100644
--- a/helpers/DATA/firefox/process-json-files.py
+++ b/helpers/DATA/firefox/process-json-files.py
@@ -176,6 +176,8 @@ class SearchConfig(RemoteSettings):
if 'included' in specifier and 'everywhere' in specifier[
'included'] and specifier['included']['everywhere']:
+ if search_engine['webExtension']['id'] == cls._DUCKDUCKGO_SEARCH_ENGINE_ID:
+ specifier['default'] = 'yes'
general_specifier = specifier
if not general_specifier:
diff --git a/helpers/DATA/firefox/searchplugins/trisquel-packages/favicon.ico b/helpers/DATA/firefox/searchplugins/trisquel-packages/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..5a727c10e1198f86902f059494aef9917aa35bbe
Binary files /dev/null and b/helpers/DATA/firefox/searchplugins/trisquel-packages/favicon.ico differ
diff --git a/helpers/DATA/firefox/searchplugins/trisquel-packages/manifest.json b/helpers/DATA/firefox/searchplugins/trisquel-packages/manifest.json
new file mode 100644
index 0000000000000000000000000000000000000000..33369ade719174c8295aaff604c37d4fd53a2eec
--- /dev/null
+++ b/helpers/DATA/firefox/searchplugins/trisquel-packages/manifest.json
@@ -0,0 +1,28 @@
+{
+ "name": "Trisquel Packages",
+ "description": "Search available software packages for Trisquel GNU/Linux",
+ "manifest_version": 2,
+ "version": "1.0",
+ "applications": {
+ "gecko": {
+ "id": "trisquel-packages@search.mozilla.org"
+ }
+ },
+ "hidden": true,
+ "icons": {
+ "16": "favicon.ico",
+ "32": "favicon.ico",
+ "48": "favicon.ico",
+ "256": "favicon.ico"
+ },
+ "web_accessible_resources": [
+ "favicon.ico"
+ ],
+ "chrome_settings_overrides": {
+ "search_provider": {
+ "name": "Trisquel Packages",
+ "search_url": "https://packages.trisquel.org/search?keywords={searchTerms}",
+ "search_form": "https://packages.trisquel.org/search?keywords={searchTerms}"
+ }
+ }
+}
diff --git a/helpers/DATA/firefox/searchplugins/trisquel/favicon.ico b/helpers/DATA/firefox/searchplugins/trisquel/favicon.ico
index 0c0408c1c39beaca4904137b0e715491211b5b86..4a0f9fd63aa44ac750f13f3a2f5044e3fee85c06 100644
Binary files a/helpers/DATA/firefox/searchplugins/trisquel/favicon.ico and b/helpers/DATA/firefox/searchplugins/trisquel/favicon.ico differ
diff --git a/helpers/DATA/firefox/searchplugins/trisquel/manifest.json b/helpers/DATA/firefox/searchplugins/trisquel/manifest.json
index c31364bf1a491c7903e76ee4563bf37a8f0189ba..7b1dbf3e97d115142216af103529fc028fc94a38 100644
--- a/helpers/DATA/firefox/searchplugins/trisquel/manifest.json
+++ b/helpers/DATA/firefox/searchplugins/trisquel/manifest.json
@@ -10,7 +10,10 @@
},
"hidden": true,
"icons": {
- "16": "favicon.ico"
+ "16": "favicon.ico",
+ "32": "favicon.ico",
+ "48": "favicon.ico",
+ "256": "favicon.ico"
},
"web_accessible_resources": [
"favicon.ico"
diff --git a/helpers/DATA/firefox/settings.js b/helpers/DATA/firefox/settings.js
index 8f52787920305fe7c45c312e95c9330633a29552..f11b9b1c0eb35d1e447e211a1fad64962f7cdcf6 100644
--- a/helpers/DATA/firefox/settings.js
+++ b/helpers/DATA/firefox/settings.js
@@ -92,7 +92,7 @@ pref("network.protocol-handler.external.apt+http",true);
// https://webdevelopmentaid.wordpress.com/2013/10/21/customize-privacy-settings-in-mozilla-firefox-part-1-aboutconfig/
// https://panopticlick.eff.org
// https://wiki.mozilla.org/Fingerprinting
-pref("browser.contentblocking.features.strict", "tp,tpPrivate,cookieBehavior1,cm,fp,stp");
+//pref("browser.contentblocking.features.strict", "tp,tpPrivate,cookieBehavior1,cm,fp,stp");
pref("privacy.donottrackheader.enabled", true);
pref("privacy.donottrackheader.value", 1);
pref("dom.ipc.plugins.flash.subprocess.crashreporter.enabled", false);
@@ -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://trisquel.info/,https://www.gnu.org/,https://www.fsf.org/,https://directory.fsf.org,https://libreplanet.org/,https://fsfe.org,https://www.wikipedia.org/wiki/,https://www.h-node.org/");
+pref("browser.newtabpage.activity-stream.default.sites", "https://trisquel.info/,https://packages.trisquel.org,https://www.gnu.org/,https://www.fsf.org/,https://directory.fsf.org,https://libreplanet.org/,https://fsfe.org,https://www.wikipedia.org/wiki/,https://www.h-node.org/");
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 7d19b4dbec999bf0407e3d62e907ce55baaec513..fa16c9c7ea99d7ae16e04b7a2079469b5eed1763 100644
--- a/helpers/make-firefox
+++ b/helpers/make-firefox
@@ -1,6 +1,6 @@
#!/bin/bash
#
-# Copyright (C) 2008-2022 Ruben Rodriguez <ruben@trisquel.info>
+# Copyright (C) 2008-2023 Ruben Rodriguez <ruben@trisquel.info>
# Copyright (C) 2015 Santiago Rodriguez <santi@trisquel.info>
# Copyright (C) 2023 Luis Guzman <ark@switnet.org>
#
@@ -19,7 +19,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-VERSION=96
+VERSION=97
EXTERNAL='deb-src http://ppa.launchpadcontent.net/mozillateam/ppa/ubuntu $UPSTREAM main'
REPOKEY=9BDB3D89CE49EC21
@@ -138,6 +138,11 @@ cat << EOF >> browser/components/newtab/data/content/tippytop/top_sites.json
"image_url": "images/trisquel.png",
"favicon_url": "favicons/trisquel.ico"
},
+ {
+ "domains": ["packages.trisquel.org"],
+ "image_url": "images/trisquel-packages.png",
+ "favicon_url": "favicons/trisquel-packages.ico"
+ },
{
"domains": ["gnu.org"],
"image_url": "images/gnu.png",
@@ -187,6 +192,13 @@ cat << TOP_JSON > services/settings/dumps/main/top-sites.json
"id": "ec7f4843-6be5-5e86-870a-1c8383500a4b",
"last_modified": $(date +%s%N | cut -b1-13)
},
+ {
+ "url": "https://packages.trisquel.org/",
+ "order": 0,
+ "title": "Trisquel Packages",
+ "id": "27a9b035-0b8b-4472-97cb-b1866aba0740",
+ "last_modified": $(date +%s%N | cut -b1-13)
+ },
{
"url": "https://www.gnu.org/",
"order": 1,