update for v78.5

3 files changed, 12 insertions, 12 deletions

diff --git a/src/patches/icedove/fix-branding-in-migration-wizard-and-the-addon-manag.patch b/src/patches/icedove/fix-branding-in-migration-wizard-and-the-addon-manag.patch
index d9062b7..1cc276f 100644
--- a/src/patches/icedove/fix-branding-in-migration-wizard-and-the-addon-manag.patch
+++ b/src/patches/icedove/fix-branding-in-migration-wizard-and-the-addon-manag.patch
@@ -13,10 +13,9 @@ Closes: #565559
  2 files changed, 18 insertions(+), 17 deletions(-)
 
 diff --git a/comm/mail/app/profile/all-thunderbird.js b/comm/mail/app/profile/all-thunderbird.js
-index db3b25d..ac240c6 100644
 --- a/comm/mail/app/profile/all-thunderbird.js
 +++ b/comm/mail/app/profile/all-thunderbird.js
-@@ -73,7 +73,7 @@ pref("app.update.url", "https://aus.thun
+@@ -67,7 +67,7 @@ pref("app.update.url", "https://aus.thunderbird.net/update/6/%PRODUCT%/%VERSION%
  pref("app.update.url.manual", "https://www.thunderbird.net");
  // A default value for the "More information about this update" link
  // supplied in the "An update is available" page of the update wizard.
@@ -25,16 +24,17 @@ index db3b25d..ac240c6 100644
  
  // app.update.promptWaitTime is in branding section
  
-@@ -93,17 +93,17 @@ pref("app.update.BITS.inTrialGroup", fal
+@@ -82,7 +82,7 @@ pref("app.update.BITS.enabled", false);
  #endif
  
  // Release notes URL
 -pref("app.releaseNotesURL", "https://live.thunderbird.net/%APP%/releasenotes?locale=%LOCALE%&version=%VERSION%&channel=%CHANNEL%&os=%OS%&buildid=%APPBUILDID%");
 +pref("app.releaseNotesURL", "https://live.thunderbird.net/thunderbird/releasenotes?locale=%LOCALE%&version=%VERSION%&channel=%CHANNEL%&os=%OS%&buildid=%APPBUILDID%");
  
- // URL for "Learn More" for Crash Reporter.
- pref("toolkit.crashreporter.infoURL",
-      "https://www.mozilla.org/thunderbird/legal/privacy/#crash-reporter");
+ // URL for "Learn More" for DataCollection
+ pref("toolkit.datacollection.infoURL",
+@@ -104,10 +104,10 @@ pref("datareporting.policy.firstRunURL", "https://www.mozilla.org/thunderbird/le
+ #endif
  
  // Base URL for web-based support pages.
 -pref("app.support.baseURL", "https://support.thunderbird.net/%LOCALE%/%APP%/%APPBUILDID%/");
@@ -46,7 +46,7 @@ index db3b25d..ac240c6 100644
  
  // Show error messages in error console.
  pref("javascript.options.showInConsole", true);
-@@ -152,11 +152,11 @@ pref("extensions.getAddons.cache.enabled
+@@ -158,11 +158,11 @@ pref("extensions.getAddons.cache.enabled", true);
  pref("extensions.getAddons.maxResults", 15);
  pref("extensions.getAddons.get.url", "https://services.addons.thunderbird.net/api/v3/addons/search/?guid=%IDS%&lang=%LOCALE%");
  pref("extensions.getAddons.compatOverides.url", "https://services.addons.thunderbird.net/api/v3/addons/compat-override/?guid=%IDS%&lang=%LOCALE%");
@@ -62,8 +62,8 @@ index db3b25d..ac240c6 100644
 +pref("extensions.webservice.discoverURL", "https://services.addons.thunderbird.net/%LOCALE%/thunderbird/discovery/pane/%VERSION%/%OS%");
  pref("extensions.getAddons.siteRegExp", "^https://.*addons\\.thunderbird\\.net");
  pref("extensions.getAddons.langpacks.url", "https://services.addons.thunderbird.net/api/v3/addons/language-tools/?app=thunderbird&type=language&appversion=%VERSION%");
- 
-@@ -403,7 +403,7 @@ pref("browser.helperApps.deleteTempFileO
+ pref("extensions.getAddons.discovery.api_url", "https://services.addons.thunderbird.net/api/v4/discovery/?lang=%LOCALE%&edition=%DISTRIBUTION%");
+@@ -415,7 +415,7 @@ pref("browser.privatebrowsing.autostart", false);
  
  pref("spellchecker.dictionary", "");
  // Dictionary download preference
@@ -73,10 +73,9 @@ index db3b25d..ac240c6 100644
  // profile.force.migration can be used to bypass the migration wizard, forcing migration from a particular
  // mail application without any user intervention. Possible values are:
 diff --git a/comm/mail/locales/en-US/chrome/messenger/accountCreation.dtd b/comm/mail/locales/en-US/chrome/messenger/accountCreation.dtd
-index 3a9c30c..65e6203 100644
 --- a/comm/mail/locales/en-US/chrome/messenger/accountCreation.dtd
 +++ b/comm/mail/locales/en-US/chrome/messenger/accountCreation.dtd
-@@ -91,7 +91,7 @@
+@@ -100,7 +100,7 @@
  <!ENTITY changeSettings.label            "Change Settings">
  <!ENTITY changeSettings.accesskey        "S">
  
diff --git a/src/patches/iceowl/NOTES b/src/patches/iceowl/NOTES
new file mode 100644
index 0000000..a475614
--- /dev/null
+++ b/src/patches/iceowl/NOTES
@@ -0,0 +1,2 @@
+'Change-extension-s-name-to-Iceowl.patch' seems to have no application in v78+
+it has been removed from the patch series
diff --git a/src/patches/series b/src/patches/series
index 11bb16d..43187fe 100644
--- a/src/patches/series
+++ b/src/patches/series
@@ -1,4 +1,3 @@
 icedove/Icedove-branding.patch
 icedove/fix-branding-in-migration-wizard-and-the-addon-manag.patch
 icedove/fix-installdir.patch
-iceowl/Change-extension-s-name-to-Iceowl.patch