From 41c31d823235baf54a4ec40a9760e0f490cee474 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sat, 18 May 2013 14:01:23 -0300 Subject: iceweasel-libre: fix some issues... --- libre/iceweasel-libre/PKGBUILD | 4 ++-- libre/iceweasel-libre/libre.patch | 39 +++++++++++++++++++++++++++++++++++++-- libre/iceweasel-libre/vendor.js | 16 ---------------- 3 files changed, 39 insertions(+), 20 deletions(-) (limited to 'libre/iceweasel-libre') diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index f84c8e745..c78bdc6d1 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -55,10 +55,10 @@ md5sums=('0a7c51bb494463c327af918bae6c4ee4' 'c17121a4ffd40f463e16d7828445d96e' 'e1e903ca91997f18b428c54ef604f27d' '383e8e2a97a8b13fe56d153adb6878b6' - '1c6b47e2123c684c1da1e08bd0a107d9' + '98a433139ffcbf6b3018f18dcaacdb4c' '7b9e5996dd9fe0b186a43a297db1c6b5' 'abf5ecb74caa857abb42bcfbb3442d9c' - 'e7e915720aaf6883ab4b706fe2195dda' + '0c26941504d3f2abed759221e9bb5de1' '52e52f840a49eb1d14be1c0065b03a93' '85e67561e0e491cd538ce018dfc2d948') diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch index 9e4b75e36..0588fa632 100644 --- a/libre/iceweasel-libre/libre.patch +++ b/libre/iceweasel-libre/libre.patch @@ -1,7 +1,42 @@ diff -ruN mozilla-release.orig/browser/app/profile/firefox.js mozilla-release/browser/app/profile/firefox.js --- mozilla-release.orig/browser/app/profile/firefox.js 2013-05-11 16:19:20.000000000 -0300 -+++ mozilla-release/browser/app/profile/firefox.js 2013-05-16 21:59:28.314070275 -0300 -@@ -1203,12 +1200,6 @@ ++++ mozilla-release/browser/app/profile/firefox.js 2013-05-18 13:47:28.091097903 -0300 +@@ -37,11 +37,11 @@ + // Preferences for AMO integration + pref("extensions.getAddons.cache.enabled", true); + pref("extensions.getAddons.maxResults", 15); +-pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/guid:%IDS%?src=firefox&appOS=%OS%&appVersion=%VERSION%"); +-pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/guid:%IDS%?src=firefox&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%"); +-pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/firefox/search?q=%TERMS%&platform=%OS%&appver=%VERSION%"); +-pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%?src=firefox"); +-pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/firefox/discovery/pane/%VERSION%/%OS%/%COMPATIBILITY_MODE%"); ++pref("extensions.getAddons.get.url", "https://trisquel.info/browser-plain"); ++pref("extensions.getAddons.getWithPerformance.url", "https://trisquel.info/browser-plain"); ++pref("extensions.getAddons.search.browseURL", "https://trisquel.info/browser-plain"); ++pref("extensions.getAddons.search.url", "https://trisquel.info/browser-plain"); ++pref("extensions.webservice.discoverURL", "https://trisquel.info/browser-plain"); + + // Blocklist preferences + pref("extensions.blocklist.enabled", true); +@@ -64,7 +64,7 @@ + pref("extensions.autoDisableScopes", 3); + + // Dictionary download preference +-pref("browser.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/firefox/dictionaries/"); ++pref("browser.dictionaries.download.url", "https://trisquel.info/browser-plain"); + + // The minimum delay in seconds for the timer to fire. + // default=2 minutes +@@ -601,7 +601,7 @@ + pref("accessibility.typeaheadfind.flashBar", 1); + + // plugin finder service url +-pref("pfs.datasource.url", "https://pfs.mozilla.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS=%CLIENT_OS%&chromeLocale=%CHROME_LOCALE%&appRelease=%APP_RELEASE%"); ++pref("pfs.datasource.url", "http://trisquel.info/sites/pfs.php?mime=%PLUGIN_MIMETYPE%"); + + // by default we show an infobar message when pages require plugins the user has not installed, or are outdated + pref("plugins.hide_infobar_for_missing_plugin", false); +@@ -1203,12 +1203,6 @@ // (This is intentionally on the high side; see bug 746055.) pref("image.mem.max_decoded_image_kb", 256000); diff --git a/libre/iceweasel-libre/vendor.js b/libre/iceweasel-libre/vendor.js index 5e17c00d0..bd8bcb148 100644 --- a/libre/iceweasel-libre/vendor.js +++ b/libre/iceweasel-libre/vendor.js @@ -19,19 +19,3 @@ pref("dom.storage.enabled", false); // Enable gstreamer support pref("media.gstreamer.enabled", true); - -// Preferences for the Get Add-ons panel -pref ("extensions.update.notifyUser", false); -pref ("extensions.getAddons.showPane", false); -pref ("extensions.getAddons.browseAddons", "http://trisquel.info/browser-plain"); -pref ("extensions.getAddons.maxResults", 5); -pref ("extensions.getAddons.recommended.browseURL", "http://trisquel.info/browser-plain"); -pref ("extensions.getAddons.recommended.url", "http://trisquel.info/browser-plain"); -pref ("extensions.getAddons.search.browseURL", "http://trisquel.info/browser-plain"); -pref ("extensions.getAddons.search.url", "http://trisquel.info/browser-plain"); -pref ("extensions.getMoreExtensionsURL" , "http://trisquel.info/browser-plain"); -pref ("extensions.getMorePluginsURL" , "http://trisquel.info/browser-plain"); -pref ("extensions.getMoreThemesURL" , "http://trisquel.info/browser-plain"); - -// Dictionary download preference -pref("browser.dictionaries.download.url", "http://trisquel.info/browser-plain"); -- cgit v1.2.3-54-g00ecf