www/firefox/files/patch-addon-search

   1 https://github.com/mozilla/addons/issues/708
   2 https://github.com/mozilla/addons-frontend/issues/4610
   3
   4 diff --git browser/app/profile/firefox.js browser/app/profile/firefox.js
   5 index 75c2c5e435e35..4d8c09c02759b 100644
   6 --- browser/app/profile/firefox.js
   7 +++ browser/app/profile/firefox.js
   8 @@ -37,8 +37,8 @@ pref("extensions.webextOptionalPermissionPrompts", tru
   9  // Preferences for AMO integration
  10  pref("extensions.getAddons.cache.enabled", true);
  11  pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/api/v3/addons/search/?guid=%IDS%&lang=%LOCALE%");
  12 -pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/firefox/search?q=%TERMS%&platform=%OS%&appver=%VERSION%");
  13 -pref("extensions.webservice.discoverURL", "https://discovery.addons.mozilla.org/%LOCALE%/firefox/discovery/pane/%VERSION%/%OS%/%COMPATIBILITY_MODE%");
  14 +pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/firefox/search?q=%TERMS%&platform=Linux&appver=%VERSION%");
  15 +pref("extensions.webservice.discoverURL", "https://discovery.addons.mozilla.org/%LOCALE%/firefox/discovery/pane/%VERSION%/Linux/%COMPATIBILITY_MODE%");
  16  pref("extensions.getAddons.link.url", "https://addons.mozilla.org/%LOCALE%/firefox/");
  17  pref("extensions.getAddons.langpacks.url", "https://services.addons.mozilla.org/api/v3/addons/language-tools/?app=firefox&type=language&appversion=%VERSION%");
  18  pref("extensions.getAddons.discovery.api_url", "https://services.addons.mozilla.org/api/v4/discovery/?lang=%LOCALE%&edition=%DISTRIBUTION%");
  19 @@ -169,8 +169,8 @@ pref("app.update.url", "https://aus5.mozilla.org/updat
  20  //  .. etc ..
  21  //
  22  pref("extensions.update.enabled", true);
  23 -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%");
  24 -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%");
  25 +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%");
  26 +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%");
  27  pref("extensions.update.interval", 86400);  // Check for updates to Extensions and
  28                                              // Themes every day
  29
  30 diff --git toolkit/mozapps/extensions/internal/AddonRepository.jsm toolkit/mozapps/extensions/internal/AddonRepository.jsm
  31 index f70fd8d7e3bd8..81e8cd7764fdf 100644
  32 --- toolkit/mozapps/extensions/internal/AddonRepository.jsm
  33 +++ toolkit/mozapps/extensions/internal/AddonRepository.jsm
  34 @@ -602,7 +602,7 @@ var AddonRepository = {
  35        addon.version = String(aEntry.current_version.version);
  36        if (Array.isArray(aEntry.current_version.files)) {
  37          for (let file of aEntry.current_version.files) {
  38 -          if (file.platform == "all" || file.platform == PLATFORM) {
  39 +          if (file.platform == "all" || file.platform == "linux" || file.platform == PLATFORM) {
  40              if (file.url) {
  41                addon.sourceURI = NetUtil.newURI(file.url);
  42              }
  43 diff --git toolkit/mozapps/extensions/internal/XPIDatabase.jsm toolkit/mozapps/extensions/internal/XPIDatabase.jsm
  44 index f70fd8d7e3bd8..81e8cd7764fdf 100644
  45 --- toolkit/mozapps/extensions/internal/XPIDatabase.jsm
  46 +++ toolkit/mozapps/extensions/internal/XPIDatabase.jsm
  47 @@ -355,7 +355,7 @@ class AddonInternal {
  48      // Something is causing errors in here
  49      try {
  50        for (let platform of this.targetPlatforms) {
  51 -        if (platform.os == Services.appinfo.OS) {
  52 +        if (platform.os == "Linux" || platform.os == Services.appinfo.OS) {
  53            if (platform.abi) {
  54              needsABI = true;
  55              if (platform.abi === abi)