updated branding patches for icedove-52.152.1-1

2 files changed, 10 insertions, 19 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 aaa72c5..55f8fd2 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
@@ -20,25 +20,25 @@ index db3b25d..ac240c6 100644
  pref("app.update.url.manual", "http://www.getthunderbird.com");
  // A default value for the "More information about this update" link
  // supplied in the "An update is available" page of the update wizard.
--pref("app.update.url.details", "http://www.mozilla.org/%LOCALE%/%APP%/releases/");
-+pref("app.update.url.details", "http://www.mozilla.org/%LOCALE%/thunderbird/releases/");
- // User-settable override to app.update.url for testing purposes.
- //pref("app.update.url.override", "");
+-pref("app.update.url.details", "https://www.mozilla.org/%LOCALE%/%APP%/releases/");
++pref("app.update.url.details", "https://www.mozilla.org/%LOCALE%/thunderbird/releases/");
+ 
+ // app.update.promptWaitTime is in branding section
  
 @@ -140,14 +140,14 @@ pref("app.update.service.enabled", true);
  #endif
  
  // Release notes URL
--pref("app.releaseNotesURL", "http://live.mozillamessaging.com/%APP%/releasenotes?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%");
-+pref("app.releaseNotesURL", "http://live.mozillamessaging.com/thunderbird/releasenotes?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%");
+-pref("app.releaseNotesURL", "https://live.mozillamessaging.com/%APP%/releasenotes?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%");
++pref("app.releaseNotesURL", "https://live.mozillamessaging.com/thunderbird/releasenotes?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%");
  
  // URL for "Learn More" for Crash Reporter.
  pref("toolkit.crashreporter.infoURL",
-      "http://www.mozilla.org/thunderbird/legal/privacy/#crash-reporter");");
+      "https://www.mozilla.org/thunderbird/legal/privacy/#crash-reporter");");
  
  // Base URL for web-based support pages.
--pref("app.support.baseURL", "http://support.live.mozillamessaging.com/%LOCALE%/%APP%/%APPBUILDID%/");
-+pref("app.support.baseURL", "http://support.live.mozillamessaging.com/%LOCALE%/thunderbird/%APPBUILDID%/");
+-pref("app.support.baseURL", "https://support.live.mozillamessaging.com/%LOCALE%/%APP%/%APPBUILDID%/");
++pref("app.support.baseURL", "https://support.live.mozillamessaging.com/%LOCALE%/thunderbird/%APPBUILDID%/");
  
  // Show error messages in error console.
  pref("javascript.options.showInConsole", true);
@@ -91,15 +91,6 @@ 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:
-@@ -564,7 +565,7 @@ pref("mailnews.database.global.logging.console", true);
- pref("mailnews.database.global.search.msg.limit", 1000);
- 
- // page to load to find good header add-ons
--pref("mailnews.migration.header_addons_url","http://live.mozillamessaging.com/%APP%/addons/search?q=header&locale=%LOCALE%&lver=%VERSION%&hver=%VERSION%&os=%OS%");
-+pref("mailnews.migration.header_addons_url","http://live.mozillamessaging.com/thunderbird/addons/search?q=header&locale=%LOCALE%&lver=%VERSION%&hver=%VERSION%&os=%OS%");
- 
- // Serif fonts look dated.  Switching those language families to sans-serif
- // where we think it makes sense.  Worth investigating for other font families
 @@ -756,7 +757,7 @@ pref("plugins.hide_infobar_for_carbon_failure_plugin", false);
  
  pref("plugins.update.url", "https://www.mozilla.org/%LOCALE%/plugincheck/");
diff --git a/src/patches/icedove/fix-installdir.patch b/src/patches/icedove/fix-installdir.patch
index be2660b..0ad46c6 100644
--- a/src/patches/icedove/fix-installdir.patch
+++ b/src/patches/icedove/fix-installdir.patch
@@ -22,7 +22,7 @@ index 74c164b..1c9ea15 100644
 +	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(installdir)/chrome/icons/default
  endif
  
- ifdef MOZ_WIDGET_GTK
+ ifneq (,$(filter gtk%,$(MOZ_WIDGET_TOOLKIT)))
  libs::
  	$(INSTALL) $(IFLAGS1) $(DIST)/branding/default* $(DIST)/bin/chrome/icons/default
 +