summaryrefslogtreecommitdiff
path: root/www/firefox-esr/files/patch-addon-search
diff options
context:
space:
mode:
authorJan Beich <jbeich@FreeBSD.org>2018-06-20 00:19:29 +0000
committerJan Beich <jbeich@FreeBSD.org>2018-06-20 00:19:29 +0000
commit1ffba2ac4cb0152f6bea9c944279dd0c9b399151 (patch)
tree06db800746c0920701662665f78f38b492d43fbf /www/firefox-esr/files/patch-addon-search
parentwww/firefox-esr: update to 52.9.0 (diff)
www/firefox-esr: remove in preparation for update
$ svn ci Sending Mk/Uses/gecko.mk Replacing www/firefox-esr Sending www/firefox-esr/Makefile Deleting www/firefox-esr/Makefile.options Sending www/firefox-esr/distinfo Deleting www/firefox-esr/files/patch-bug1435212 Sending www/firefox-esr/files/patch-z-bug1436911 Deleting www/firefox-esr/files/pkg-deinstall.in Deleting www/firefox-esr/files/pkg-install.in Replacing www/firefox-esr-i18n Sending www/firefox-esr-i18n/Makefile Sending www/firefox-esr-i18n/distinfo Transmitting file data ......done Committing transaction... svn: E165001: Commit failed (details follow): svn: E165001: Commit blocked by pre-commit hook (exit code 1) with output: Do not replace a file. This can lose history. Path: "/head/www/firefox-esr" == Additional errors may compound and may not be accurate == Do not replace a file. This can lose history. Path: "/head/www/firefox-esr-i18n" Do not replace a file. This can lose history. Path: "/head/www/firefox-esr-i18n" Do not replace a file. This can lose history. Path: "/head/www/firefox-esr" Do not replace a file. This can lose history. Path: "/head/www/firefox-esr-i18n" Do not replace a file. This can lose history. Path: "/head/www/firefox-esr" Do not replace a file. This can lose history. Path: "/head/www/firefox-esr-i18n" Do not replace a file. This can lose history. Path: "/head/www/firefox-esr" Do not replace a file. This can lose history. Path: "/head/www/firefox-esr-i18n" Do not replace a file. This can lose history. Path: "/head/www/firefox-esr" Do not replace a file. This can lose history. Path: "/head/www/firefox-esr" Do not replace a file. This can lose history. Path: "/head/www/firefox-esr-i18n" == Pre-commit problem count: 12 svn: E165001: Your commit message was left in a temporary file: svn: E165001: '/path/to/head/svn-commit.tmp'
Diffstat (limited to 'www/firefox-esr/files/patch-addon-search')
-rw-r--r--www/firefox-esr/files/patch-addon-search72
1 files changed, 0 insertions, 72 deletions
diff --git a/www/firefox-esr/files/patch-addon-search b/www/firefox-esr/files/patch-addon-search
deleted file mode 100644
index 4167cf9e23dd..000000000000
--- a/www/firefox-esr/files/patch-addon-search
+++ /dev/null
@@ -1,72 +0,0 @@
-https://github.com/mozilla/addons/issues/708
-https://github.com/mozilla/addons-frontend/issues/4610
-
-diff --git browser/app/profile/firefox.js browser/app/profile/firefox.js
-index 75c2c5e435e35..4d8c09c02759b 100644
---- browser/app/profile/firefox.js
-+++ browser/app/profile/firefox.js
-@@ -42,12 +42,12 @@ pref("xpinstall.customConfirmationUI", true);
- // 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://discovery.addons.mozilla.org/%LOCALE%/firefox/discovery/pane/%VERSION%/%OS%/%COMPATIBILITY_MODE%");
--pref("extensions.getAddons.recommended.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/list/recommended/all/%MAX_RESULTS%/%OS%/%VERSION%?src=firefox");
-+pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/guid:%IDS%?src=firefox&appOS=Linux&appVersion=%VERSION%");
-+pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/guid:%IDS%?src=firefox&appOS=Linux&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=Linux&appver=%VERSION%");
-+pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/Linux/%VERSION%/%COMPATIBILITY_MODE%?src=firefox");
-+pref("extensions.webservice.discoverURL", "https://discovery.addons.mozilla.org/%LOCALE%/firefox/discovery/pane/%VERSION%/Linux/%COMPATIBILITY_MODE%");
-+pref("extensions.getAddons.recommended.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/list/recommended/all/%MAX_RESULTS%/Linux/%VERSION%?src=firefox");
- pref("extensions.getAddons.link.url", "https://addons.mozilla.org/%LOCALE%/firefox/");
-
- pref("extensions.update.autoUpdateDefault", true);
-@@ -156,8 +156,8 @@ pref("app.update.service.enabled", true);
- // .. etc ..
- //
- pref("extensions.update.enabled", true);
--pref("extensions.update.url", "https://versioncheck.addons.mozilla.org/update/VersionCheck.php?reqVersion=%REQ_VERSION%&id=%ITEM_ID%&version=%ITEM_VERSION%&maxAppVersion=%ITEM_MAXAPPVERSION%&status=%ITEM_STATUS%&appID=%APP_ID%&appVersion=%APP_VERSION%&appOS=%APP_OS%&appABI=%APP_ABI%&locale=%APP_LOCALE%&currentAppVersion=%CURRENT_APP_VERSION%&updateType=%UPDATE_TYPE%&compatMode=%COMPATIBILITY_MODE%");
--pref("extensions.update.background.url", "https://versioncheck-bg.addons.mozilla.org/update/VersionCheck.php?reqVersion=%REQ_VERSION%&id=%ITEM_ID%&version=%ITEM_VERSION%&maxAppVersion=%ITEM_MAXAPPVERSION%&status=%ITEM_STATUS%&appID=%APP_ID%&appVersion=%APP_VERSION%&appOS=%APP_OS%&appABI=%APP_ABI%&locale=%APP_LOCALE%&currentAppVersion=%CURRENT_APP_VERSION%&updateType=%UPDATE_TYPE%&compatMode=%COMPATIBILITY_MODE%");
-+pref("extensions.update.url", "https://versioncheck.addons.mozilla.org/update/VersionCheck.php?reqVersion=%REQ_VERSION%&id=%ITEM_ID%&version=%ITEM_VERSION%&maxAppVersion=%ITEM_MAXAPPVERSION%&status=%ITEM_STATUS%&appID=%APP_ID%&appVersion=%APP_VERSION%&appOS=Linux&appABI=%APP_ABI%&locale=%APP_LOCALE%&currentAppVersion=%CURRENT_APP_VERSION%&updateType=%UPDATE_TYPE%&compatMode=%COMPATIBILITY_MODE%");
-+pref("extensions.update.background.url", "https://versioncheck-bg.addons.mozilla.org/update/VersionCheck.php?reqVersion=%REQ_VERSION%&id=%ITEM_ID%&version=%ITEM_VERSION%&maxAppVersion=%ITEM_MAXAPPVERSION%&status=%ITEM_STATUS%&appID=%APP_ID%&appVersion=%APP_VERSION%&appOS=Linux&appABI=%APP_ABI%&locale=%APP_LOCALE%&currentAppVersion=%CURRENT_APP_VERSION%&updateType=%UPDATE_TYPE%&compatMode=%COMPATIBILITY_MODE%");
- pref("extensions.update.interval", 86400); // Check for updates to Extensions and
- // Themes every day
- // Non-symmetric (not shared by extensions) extension-specific [update] preferences
-diff --git toolkit/mozapps/extensions/internal/AddonRepository.jsm toolkit/mozapps/extensions/internal/AddonRepository.jsm
-index f70fd8d7e3bd8..81e8cd7764fdf 100644
---- toolkit/mozapps/extensions/internal/AddonRepository.jsm
-+++ toolkit/mozapps/extensions/internal/AddonRepository.jsm
-@@ -1179,7 +1179,7 @@ this.AddonRepository = {
- let nodes = node.getElementsByTagName("os");
- addon.isPlatformCompatible = Array.some(nodes, function(aNode) {
- let text = aNode.textContent.toLowerCase().trim();
-- return text == "all" || text == Services.appinfo.OS.toLowerCase();
-+ return text == "all" || text == "linux" || text == Services.appinfo.OS.toLowerCase();
- });
- break;
- case "install":
-@@ -1187,7 +1187,7 @@ this.AddonRepository = {
- if (node.hasAttribute("os")) {
- let os = node.getAttribute("os").trim().toLowerCase();
- // If the os is not ALL and not the current OS then ignore this xpi
-- if (os != "all" && os != Services.appinfo.OS.toLowerCase())
-+ if (os != "all" && os != "linux" && os != Services.appinfo.OS.toLowerCase())
- break;
- }
-
-diff --git toolkit/mozapps/extensions/internal/XPIProvider.jsm toolkit/mozapps/extensions/internal/XPIProvider.jsm
-index f70fd8d7e3bd8..81e8cd7764fdf 100644
---- toolkit/mozapps/extensions/internal/XPIProvider.jsm
-+++ toolkit/mozapps/extensions/internal/XPIProvider.jsm
-@@ -7186,7 +7186,7 @@ AddonInternal.prototype = {
- // Something is causing errors in here
- try {
- for (let platform of this.targetPlatforms) {
-- if (platform.os == Services.appinfo.OS) {
-+ if (platform.os == "Linux" || platform.os == Services.appinfo.OS) {
- if (platform.abi) {
- needsABI = true;
- if (platform.abi === abi)