From 62a92d254fa97339c4d26d9fd8fd7d1e2e29e4e2 Mon Sep 17 00:00:00 2001 From: Andreas Grapentin Date: Sat, 9 Mar 2019 20:52:33 +0100 Subject: updated branding patches for icedove-60.5.1 --- ...g-in-migration-wizard-and-the-addon-manag.patch | 101 ++++++++------------- src/patches/icedove/fix-installdir.patch | 17 +--- 2 files changed, 44 insertions(+), 74 deletions(-) (limited to 'src/patches/icedove') 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 55f8fd2..9fa8507 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 @@ -12,99 +12,76 @@ Closes: #565559 .../en-US/chrome/messenger/accountCreation.dtd | 2 +- 2 files changed, 18 insertions(+), 17 deletions(-) -diff --git a/mail/app/profile/all-thunderbird.js b/mail/app/profile/all-thunderbird.js +diff --git a/comm/mail/app/profile/all-thunderbird.js b/comm/mail/app/profile/all-thunderbird.js index db3b25d..ac240c6 100644 ---- a/mail/app/profile/all-thunderbird.js -+++ b/mail/app/profile/all-thunderbird.js -@@ -118,7 +118,7 @@ pref("app.update.url", "https://aus5.mozilla.org/update/6/%PRODUCT%/%VERSION%/%B - pref("app.update.url.manual", "http://www.getthunderbird.com"); +--- a/comm/mail/app/profile/all-thunderbird.js ++++ b/comm/mail/app/profile/all-thunderbird.js +@@ -98,7 +98,7 @@ pref("app.update.url", "https://aus5.moz + 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. --pref("app.update.url.details", "https://www.mozilla.org/%LOCALE%/%APP%/releases/"); -+pref("app.update.url.details", "https://www.mozilla.org/%LOCALE%/thunderbird/releases/"); +-pref("app.update.url.details", "https://www.thunderbird.net/%LOCALE%/%APP%/releases/"); ++pref("app.update.url.details", "https://www.thunderbird.net/%LOCALE%/thunderbird/releases/"); // app.update.promptWaitTime is in branding section -@@ -140,14 +140,14 @@ pref("app.update.service.enabled", true); +@@ -111,14 +111,14 @@ pref("app.update.service.enabled", true) #endif // Release notes URL --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%"); +-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");"); + "https://www.mozilla.org/thunderbird/legal/privacy/#crash-reporter"); // Base URL for web-based support pages. --pref("app.support.baseURL", "https://support.live.mozillamessaging.com/%LOCALE%/%APP%/%APPBUILDID%/"); -+pref("app.support.baseURL", "https://support.live.mozillamessaging.com/%LOCALE%/thunderbird/%APPBUILDID%/"); +-pref("app.support.baseURL", "https://support.thunderbird.net/%LOCALE%/%APP%/%APPBUILDID%/"); ++pref("app.support.baseURL", "https://support.thunderbird.net/%LOCALE%/thunderbird/%APPBUILDID%/"); // Show error messages in error console. pref("javascript.options.showInConsole", true); -@@ -177,20 +177,20 @@ pref("extensions.autoDisableScopes", 15); - // Preferences for AMO integration - pref("extensions.getAddons.cache.enabled", true); +@@ -165,11 +165,11 @@ pref("extensions.getAddons.cache.enabled pref("extensions.getAddons.maxResults", 15); --pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/guid:%IDS%?src=thunderbird&appOS=%OS%&appVersion=%VERSION%"); --pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/guid:%IDS%?src=thunderbird&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%"); --pref("extensions.getAddons.link.url", "https://addons.mozilla.org/%LOCALE%/%APP%/"); --pref("extensions.getAddons.recommended.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/list/recommended/all/%MAX_RESULTS%/%OS%/%VERSION%?src=thunderbird"); --pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/%APP%/search?q=%TERMS%"); --pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%?src=thunderbird"); --pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/%APP%/discovery/pane/%VERSION%/%OS%"); -+pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/thunderbird/api/%API_VERSION%/search/guid:%IDS%?src=thunderbird&appOS=%OS%&appVersion=%VERSION%"); -+pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/thunderbird/api/%API_VERSION%/search/guid:%IDS%?src=thunderbird&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%"); -+pref("extensions.getAddons.link.url", "https://addons.mozilla.org/%LOCALE%/thunderbird/"); -+pref("extensions.getAddons.recommended.url", "https://services.addons.mozilla.org/%LOCALE%/thunderbird/api/%API_VERSION%/list/recommended/all/%MAX_RESULTS%/%OS%/%VERSION%?src=thunderbird"); -+pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/thunderbird/search?q=%TERMS%"); -+pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/thunderbird/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%?src=thunderbird"); -+pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/thunderbird/discovery/pane/%VERSION%/%OS%"); - - // Blocklist preferences - pref("extensions.blocklist.enabled", true); - pref("extensions.blocklist.interval", 86400); - pref("extensions.blocklist.url", "https://blocklist.addons.mozilla.org/blocklist/3/%APP_ID%/%APP_VERSION%/%PRODUCT%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/%PING_COUNT%/%TOTAL_PING_COUNT%/%DAYS_SINCE_LAST_PING%/"); --pref("extensions.blocklist.detailsURL", "https://addons.mozilla.org/%LOCALE%/%APP%/blocked/"); --pref("extensions.blocklist.itemURL", "https://blocklist.addons.mozilla.org/%LOCALE%/%APP%/blocked/%blockID%"); -+pref("extensions.blocklist.detailsURL", "https://addons.mozilla.org/%LOCALE%/thunderbird/blocked/"); -+pref("extensions.blocklist.itemURL", "https://blocklist.addons.mozilla.org/%LOCALE%/thunderbird/blocked/%blockID%"); - - // Enables some extra Extension System Logging (can reduce performance) - pref("extensions.logging.enabled", false); -@@ -210,7 +210,8 @@ pref("extensions.update.background.url", "https://versioncheck-bg.addons.mozilla - pref("extensions.update.interval", 86400); // Check for updates to Extensions and - // Themes every day - --pref("extensions.dss.enabled", false); // Dynamic Skin Switching -+pref("extensions.getMoreThemesURL", "https://addons.mozilla.org/%LOCALE%/thunderbird/themes/"); -+pref("extensions.dss.enabled", false); // Dynamic Skin Switching - pref("extensions.dss.switchPending", false); // Non-dynamic switch pending after next - - pref("extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.name", "chrome://messenger/locale/messenger.properties"); -@@ -429,7 +430,7 @@ pref("browser.helperApps.deleteTempFileOnExit", true); + 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%"); +-pref("extensions.getAddons.link.url", "https://addons.thunderbird.net/%LOCALE%/%APP%/"); +-pref("extensions.getAddons.recommended.url", "https://services.addons.thunderbird.net/%LOCALE%/%APP%/api/%API_VERSION%/list/recommended/all/%MAX_RESULTS%/%OS%/%VERSION%?src=thunderbird"); +-pref("extensions.getAddons.search.browseURL", "https://addons.thunderbird.net/%LOCALE%/%APP%/search/?q=%TERMS%"); +-pref("extensions.getAddons.search.url", "https://services.addons.thunderbird.net/%LOCALE%/%APP%/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%?src=thunderbird"); +-pref("extensions.webservice.discoverURL", "https://services.addons.thunderbird.net/%LOCALE%/%APP%/discovery/pane/%VERSION%/%OS%"); ++pref("extensions.getAddons.link.url", "https://addons.thunderbird.net/%LOCALE%/thunderbird/"); ++pref("extensions.getAddons.recommended.url", "https://services.addons.thunderbird.net/%LOCALE%/thunderbird/api/%API_VERSION%/list/recommended/all/%MAX_RESULTS%/%OS%/%VERSION%?src=thunderbird"); ++pref("extensions.getAddons.search.browseURL", "https://addons.thunderbird.net/%LOCALE%/thunderbird/search/?q=%TERMS%"); ++pref("extensions.getAddons.search.url", "https://services.addons.thunderbird.net/%LOCALE%/thunderbird/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%?src=thunderbird"); ++pref("extensions.webservice.discoverURL", "https://services.addons.thunderbird.net/%LOCALE%/thunderbird/discovery/pane/%VERSION%/%OS%"); + pref("extensions.getAddons.themes.browseURL", "https://addons.thunderbird.net/%LOCALE%/thunderbird/themes/?src=thunderbird"); + pref("extensions.getAddons.siteRegExp", "^https://.*addons\\.thunderbird\\.net"); + +@@ -426,7 +426,7 @@ pref("browser.helperApps.deleteTempFileO pref("spellchecker.dictionary", ""); // Dictionary download preference --pref("spellchecker.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/%APP%/dictionaries/"); -+pref("spellchecker.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/thunderbird/dictionaries/"); +-pref("spellchecker.dictionaries.download.url", "https://addons.thunderbird.net/%LOCALE%/%APP%/dictionaries/"); ++pref("spellchecker.dictionaries.download.url", "https://addons.thunderbird.net/%LOCALE%/thunderbird/dictionaries/"); // 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: -@@ -756,7 +757,7 @@ pref("plugins.hide_infobar_for_carbon_failure_plugin", false); +@@ -747,7 +747,7 @@ pref("plugins.hide_infobar_for_carbon_fa pref("plugins.update.url", "https://www.mozilla.org/%LOCALE%/plugincheck/"); pref("plugins.update.notifyUser", false); --pref("plugins.crash.supportUrl", "https://live.mozillamessaging.com/%APP%/plugin-crashed?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%"); -+pref("plugins.crash.supportUrl", "https://live.mozillamessaging.com/thunderbird/plugin-crashed?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%"); +-pref("plugins.crash.supportUrl", "https://live.thunderbird.net/%APP%/plugin-crashed?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%"); ++pref("plugins.crash.supportUrl", "https://live.thunderbird.net/thunderbird/plugin-crashed?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%"); // Click-to-play has not been ported for TB yet, see bug 814168. // The default plugin state should be changed to "ask to activate" when this -diff --git a/mail/locales/en-US/chrome/messenger/accountCreation.dtd b/mail/locales/en-US/chrome/messenger/accountCreation.dtd +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/mail/locales/en-US/chrome/messenger/accountCreation.dtd -+++ b/mail/locales/en-US/chrome/messenger/accountCreation.dtd -@@ -78,7 +78,7 @@ +--- a/comm/mail/locales/en-US/chrome/messenger/accountCreation.dtd ++++ b/comm/mail/locales/en-US/chrome/messenger/accountCreation.dtd +@@ -80,7 +80,7 @@ diff --git a/src/patches/icedove/fix-installdir.patch b/src/patches/icedove/fix-installdir.patch index 0ad46c6..73654be 100644 --- a/src/patches/icedove/fix-installdir.patch +++ b/src/patches/icedove/fix-installdir.patch @@ -6,13 +6,13 @@ Subject: fix installdir mail/app/Makefile.in | 9 +++++++++ 1 file changed, 9 insertions(+) -diff --git a/mail/app/Makefile.in b/mail/app/Makefile.in +diff --git a/comm/mail/app/Makefile.in b/comm/mail/app/Makefile.in index 74c164b..1c9ea15 100644 ---- a/mail/app/Makefile.in -+++ b/mail/app/Makefile.in -@@ -100,11 +100,20 @@ libs:: $(addprefix icons/$(MOZ_WIDGET_TOOLKIT)/,$(DESKTOP_ICON_FILES)) +--- a/comm/mail/app/Makefile.in ++++ b/comm/mail/app/Makefile.in +@@ -100,6 +100,13 @@ libs:: $(addprefix icons/$(MOZ_WIDGET_TO - libs:: $(addprefix $(DIST)/branding/,$(BRANDED_ICON_FILES)) + libs:: $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/messengerWindow.ico $(INSTALL) $(IFLAGS1) $^ $(DIST)/bin/chrome/icons/default + +install:: $(addprefix icons/$(MOZ_WIDGET_TOOLKIT)/,$(DESKTOP_ICON_FILES)) @@ -20,14 +20,7 @@ index 74c164b..1c9ea15 100644 + +install:: $(addprefix $(DIST)/branding,$(BRANDED_ICON_FILES)) + $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(installdir)/chrome/icons/default - endif - - ifneq (,$(filter gtk%,$(MOZ_WIDGET_TOOLKIT))) - libs:: - $(INSTALL) $(IFLAGS1) $(DIST)/branding/default* $(DIST)/bin/chrome/icons/default + -+install:: -+ $(SYSINSTALL) $(IFLAGS1) $(DIST)/branding/default* $(DESTDIR)$(installdir)/chrome/icons/default endif libs:: $(srcdir)/profile/prefs.js -- cgit v1.2.2