From f4a348e3560774b930d0ebbddb4deea4edec7bee Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Tue, 20 Oct 2015 14:47:22 -0300 Subject: ice{cat,weasel}: use Free Software Directory preferences for the Get Add-ons panel --- libre/icecat/PKGBUILD | 13 ------------- libre/iceweasel/PKGBUILD | 11 +---------- libre/iceweasel/vendor.js | 4 ++++ 3 files changed, 5 insertions(+), 23 deletions(-) diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD index e09de2525..ba25fe111 100644 --- a/libre/icecat/PKGBUILD +++ b/libre/icecat/PKGBUILD @@ -84,19 +84,6 @@ prepare() { sed -i '\|abouthome/snippet|d ' browser/base/jar.mn - # Replace common URLs - sed -i '\|extensions[.]getAddons[.]get[.]url| s|https://services[.]addons[.]mozilla[.]org.\+["][)][;]|https://trisquel.info/en/browser");|g; - \|extensions[.]getAddons[.]search[.]browseURL| s|https://addons[.]mozilla[.]org.\+["][)][;]|https://trisquel.info/en/browser");|g; - \|extensions[.]getAddons[.]search[.]url| s|https://services[.]addons[.]mozilla[.]org.\+["][)][;]|https://trisquel.info/en/browser");|g; - \|extensions[.]getAddons[.]search[.]url| s|https://directory[.]fsf[.]org.\+["][)][;]|https://trisquel.info/en/browser");|g; - \|extensions[.]webservice[.]discoverURL| s|https://services[.]addons[.]mozilla[.]org.\+["][)][;]|https://trisquel.info/en/browser");|g; - \|extensions[.]webservice[.]discoverURL| s|https://directory[.]fsf[.]org.\+["][)][;]|https://trisquel.info/en/browser");|g; - \|browser[.]search[.]searchEnginesURL| s|https://addons[.]mozilla[.]org.\+["][)][;]|https://trisquel.info/en/browser");|g; - \|browser[.]search[.]searchEnginesURL| s|https://mycroft[.]mozdev[.]org.\+["][)][;]|https://trisquel.info/en/browser");|g; - \|plugins[.]update[.]url| s|https://www[.]mozilla[.]org/[%]LOCALE[%]/plugincheck/["][)][;]|https://trisquel.info/en/browser");|g; - \|plugins[.]update[.]url| s|https://www[.]gnu[.]org/software/gnuzilla/["][)][;]|https://trisquel.info/en/browser");|g; - ' browser/app/profile/icecat.js - # Load our build config, disable SafeSearch cp "$srcdir/mozconfig" .mozconfig diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index ad28c4bfe..5db8dd1b4 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -61,7 +61,7 @@ sha256sums=('707d44ac9a73868c5f2fe1832945ae66b297a8b7eaee3d45a43ab767fe9447cc' '56eba484179c7f498076f8dc603d8795e99dce8c6ea1da9736318c59d666bff6' '2257dc69886bd0b72c48675a27c3a88b9cf6b598252c9e9f1c99763180684fc3' '3aea6676f1e53a09673b6ae219d281fc28054beb6002b09973611c02f827651d' - 'b078b1abbbcda77a0d116878b999496e65f6cff9cf60e0fbb7ce6977f767f1de' + 'af4e91893aa01d5f1cbd16f48ed118b344b86bedf5d1d52e68ff19ffec03e1d6' '68e3a5b47c6d175cc95b98b069a15205f027cab83af9e075818d38610feb6213') prepare() { @@ -97,15 +97,6 @@ prepare() { sed -i '\|abouthome/snippet|d ' browser/base/jar.mn - # Replace common URLs - sed -i '\|extensions[.]getAddons[.]get[.]url| s|https://services[.]addons[.]mozilla[.]org.\+["][)][;]|https://trisquel.info/en/browser");|g; - \|extensions[.]getAddons[.]search[.]browseURL| s|https://addons[.]mozilla[.]org.\+["][)][;]|https://trisquel.info/en/browser");|g; - \|extensions[.]getAddons[.]search[.]url| s|https://services[.]addons[.]mozilla[.]org.\+["][)][;]|https://trisquel.info/en/browser");|g; - \|extensions[.]webservice[.]discoverURL| s|https://services[.]addons[.]mozilla[.]org.\+["][)][;]|https://trisquel.info/en/browser");|g; - \|browser[.]search[.]searchEnginesURL| s|https://addons[.]mozilla[.]org.\+["][)][;]|https://trisquel.info/en/browser");|g; - \|plugins[.]update[.]url| s|https://www[.]mozilla[.]org/[%]LOCALE[%]/plugincheck/["][)][;]|https://trisquel.info/en/browser");|g; - ' browser/app/profile/firefox.js - # Load our build config, disable SafeSearch cp "$srcdir/mozconfig" .mozconfig diff --git a/libre/iceweasel/vendor.js b/libre/iceweasel/vendor.js index 39f38088f..a32721594 100644 --- a/libre/iceweasel/vendor.js +++ b/libre/iceweasel/vendor.js @@ -149,6 +149,10 @@ pref("browser.search.update", false); pref("app.update.enabled", false); pref("app.update.auto", false); +// Preferences for the Get Add-ons panel +pref ("extensions.webservice.discoverURL", "https://directory.fsf.org/wiki/GNU_IceCat"); +pref ("extensions.getAddons.search.url", "https://directory.fsf.org/wiki/GNU_IceCat"); + // Mobile pref("privacy.announcements.enabled", false); pref("browser.snippets.enabled", false); -- cgit v1.2.3-54-g00ecf